From a14f3d81c90b0bb4721cb340655d72825f7bf4d3 Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Tue, 27 Nov 2018 19:32:53 +0300
Subject: [PATCH 01/23] feat: market crud (#1565)

* administratum: advanced master-worker relations

* feat: change onwable => administratable

* orders crud

* master-worker crud

* deals crud

* change requests crud

* massive market reworking

* feat: migrate func added

* crud for administratum

* fix: cr status bug

* fix: counterpartry bid matching

* fix: migrate order

* rating fields
---
 blockchain/source/contracts/Administratum.sol |  87 ++
 .../source/contracts/AdministratumCrud.sol    |  60 ++
 .../source/contracts/ChangeRequests.sol       | 128 +++
 blockchain/source/contracts/Deals.sol         | 222 ++++++
 blockchain/source/contracts/Market.sol        | 754 ++++++++----------
 blockchain/source/contracts/OracleUSD.sol     |   2 +-
 blockchain/source/contracts/Orders.sol        | 215 +++++
 .../contracts/SimpleGatekeeperWithLimit.sol   |   2 +-
 blockchain/source/scripts/test.sh             |   4 +-
 blockchain/source/test/blacklist.js           |  28 +-
 blockchain/source/test/helpers/common.js      |  14 +-
 blockchain/source/test/market.js              | 358 +++++----
 12 files changed, 1258 insertions(+), 616 deletions(-)
 create mode 100644 blockchain/source/contracts/Administratum.sol
 create mode 100644 blockchain/source/contracts/AdministratumCrud.sol
 create mode 100644 blockchain/source/contracts/ChangeRequests.sol
 create mode 100644 blockchain/source/contracts/Deals.sol
 create mode 100644 blockchain/source/contracts/Orders.sol

diff --git a/blockchain/source/contracts/Administratum.sol b/blockchain/source/contracts/Administratum.sol
new file mode 100644
index 000000000..bf6adb089
--- /dev/null
+++ b/blockchain/source/contracts/Administratum.sol
@@ -0,0 +1,87 @@
+pragma solidity ^0.4.23;
+
+import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "./AdministratumCrud.sol";
+
+contract Administratum is Ownable {
+
+    // events
+    event WorkerAnnounced(address indexed worker, address indexed master);
+    event WorkerConfirmed(address indexed worker, address indexed master, address indexed confirmator);
+    event WorkerRemoved(address indexed worker, address indexed master);
+    event AdminAdded(address indexed admin, address indexed master);
+
+    // storage
+
+    mapping(address => mapping(address => bool)) masterRequest;
+
+    AdministratumCrud crud;
+
+
+    //constructor
+    constructor(address _administratumCrud){
+        owner = msg.sender;
+        crud = AdministratumCrud(_administratumCrud);
+    }
+
+    //funcs
+
+    function RegisterWorker(address _master) public returns (bool) {
+        require(crud.GetMaster(msg.sender) == msg.sender);
+        require(!crud.isMaster(msg.sender));
+        require(crud.GetMaster(_master) == _master);
+        masterRequest[_master][msg.sender] = true;
+        emit WorkerAnnounced(msg.sender, _master);
+        return true;
+    }
+
+    function ConfirmWorker(address _worker) public returns (bool) {
+        require(masterRequest[msg.sender][_worker] == true || IsValid(_worker));
+        crud.SetMaster(_worker, msg.sender);
+        crud.SwitchToMaster(msg.sender);
+        delete masterRequest[msg.sender][_worker];
+        emit WorkerConfirmed(_worker, crud.GetMaster(_worker), msg.sender);
+        return true;
+    }
+
+    function RemoveWorker(address _worker, address _master) public returns (bool) {
+        require(crud.GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));
+        crud.DeleteMaster(_worker);
+        emit WorkerRemoved(_worker, _master);
+        return true;
+    }
+
+    function RegisterAdmin(address _admin) public returns (bool){
+        require(GetMaster(msg.sender) == msg.sender);
+        require(msg.sender != _admin);
+        crud.SetAdmin(_admin, msg.sender);
+        return true;
+    }
+
+    function Migrate (address _newAdministratum) public onlyOwner {
+        crud.transferOwnership(_newAdministratum);
+        suicide(msg.sender);
+    }
+
+
+    //INTERNAL
+    // check if transaction sended by valid admin
+    function IsValid(address _worker) internal view returns(bool){
+        address master = crud.GetAdminMaster(msg.sender);
+        return master != address(0) && masterRequest[master][_worker] == true;
+    }
+
+
+    //GETTERS
+
+    function GetMaster(address _worker) public view returns (address master) {
+        return  crud.GetMaster(_worker);
+    }
+
+
+
+
+    //modifiers
+
+
+}
diff --git a/blockchain/source/contracts/AdministratumCrud.sol b/blockchain/source/contracts/AdministratumCrud.sol
new file mode 100644
index 000000000..5b9ba1efb
--- /dev/null
+++ b/blockchain/source/contracts/AdministratumCrud.sol
@@ -0,0 +1,60 @@
+pragma solidity ^0.4.23;
+
+import "./Administratable.sol";
+
+contract AdministratumCrud is Administratable {
+
+    // events
+    event WorkerAnnounced(address indexed worker, address indexed master);
+    event WorkerConfirmed(address indexed worker, address indexed master);
+    event WorkerRemoved(address indexed worker, address indexed master);
+    event AdminAdded(address indexed admin, address indexed master);
+
+    // storage
+    mapping(address => address) masterOf;
+
+    mapping(address => bool) flagIsMaster;
+
+    mapping(address => mapping(address => bool)) masterRequest;
+
+    //maps admin into its master; alternative method
+    //that's like asym cryptography, but implemented by design
+    mapping(address => address) admins;
+
+    //constructor
+    constructor(){
+        owner = msg.sender;
+        administrator = msg.sender;
+    }
+
+    function SetMaster(address _worker, address _master) public onlyOwner {
+        masterOf[_worker] = _master;
+    }
+
+    function SetAdmin(address _admin, address _master) public onlyOwner {
+        admins[_admin] = _master;
+    }
+
+    function DeleteMaster(address _worker) public onlyOwner {
+        delete masterOf[_worker];
+    }
+
+    function SwitchToMaster(address _target) public onlyOwner {
+        flagIsMaster[_target] = true;
+    }
+
+    function GetMaster(address _worker) public view returns (address) {
+        if (masterOf[_worker] == address(0) || flagIsMaster[_worker] == true){
+            return _worker;
+        }
+        return masterOf[_worker];
+    }
+
+    function GetAdminMaster(address _admin) public view returns (address) {
+        return admins[_admin];
+    }
+
+    function isMaster(address _address) public view returns (bool) {
+        return flagIsMaster[_address];
+    }
+}
diff --git a/blockchain/source/contracts/ChangeRequests.sol b/blockchain/source/contracts/ChangeRequests.sol
new file mode 100644
index 000000000..170a4dd3a
--- /dev/null
+++ b/blockchain/source/contracts/ChangeRequests.sol
@@ -0,0 +1,128 @@
+pragma solidity ^0.4.23;
+
+import "./Administratable.sol";
+import "zeppelin-solidity/contracts/math/SafeMath.sol";
+import "./Orders.sol";
+
+
+contract ChangeRequests is Administratable {
+    using SafeMath for uint256;
+
+    mapping(uint => ChangeRequest) requests;
+
+    mapping(uint => uint[2]) actualRequests;
+
+    uint requestsAmount;
+
+    struct ChangeRequest {
+        uint dealID;
+        Orders.OrderType requestType;
+        uint price;
+        uint duration;
+        RequestStatus status;
+    }
+
+    enum RequestStatus {
+        REQUEST_UNKNOWN,
+        REQUEST_CREATED,
+        REQUEST_CANCELED,
+        REQUEST_REJECTED,
+        REQUEST_ACCEPTED
+    }
+
+
+    constructor() public {
+        owner = msg.sender;
+        administrator = msg.sender;
+    }
+
+    function Write(
+        uint _dealID,
+        Orders.OrderType _requestType,
+        uint _price,
+        uint _duration,
+        RequestStatus _status) public onlyOwner returns(uint){
+
+        requestsAmount = requestsAmount.add(1);
+
+        requests[requestsAmount] = ChangeRequest(_dealID, _requestType, _price, _duration, _status);
+
+        return  requestsAmount;
+    }
+
+    //SETTERS
+
+    function SetChangeRequestDealID(uint _changeRequestID, uint _dealID) public onlyOwner {
+        requests[_changeRequestID].dealID = _dealID;
+    }
+
+    function SetChangeRequestType(uint _changeRequestID, Orders.OrderType _type) public onlyOwner {
+        requests[_changeRequestID].requestType = _type;
+    }
+
+    function SetChangeRequestPrice(uint _changeRequestID, uint _price) public onlyOwner {
+        requests[_changeRequestID].price = _price;
+    }
+
+    function SetChangeRequestDuration(uint _changeRequestID, uint _duration) public onlyOwner {
+        requests[_changeRequestID].duration = _duration;
+    }
+
+    function SetChangeRequestStatus(uint _changeRequestID, RequestStatus _status) public onlyOwner {
+        requests[_changeRequestID].status = _status;
+    }
+
+    function SetActualChangeRequest(uint dealID, uint role, uint _changeRequestID) public onlyOwner {
+        actualRequests[dealID][role] = _changeRequestID;
+    }
+
+    // GETTERS
+
+    function GetChangeRequestDealID(uint _changeRequestID) public view returns(uint) {
+        return requests[_changeRequestID].dealID;
+    }
+
+    function GetChangeRequestType(uint _changeRequestID) public view returns(Orders.OrderType) {
+        return requests[_changeRequestID].requestType;
+    }
+
+    function GetChangeRequestPrice(uint _changeRequestID) public view returns(uint) {
+        return requests[_changeRequestID].price;
+    }
+
+    function GetChangeRequestDuration(uint _changeRequestID) public view returns(uint) {
+        return requests[_changeRequestID].duration;
+    }
+
+    function GetChangeRequestStatus(uint _changeRequestID) public view returns(RequestStatus) {
+        return requests[_changeRequestID].status;
+    }
+
+    function GetActualChangeRequest(uint dealID, uint role)public view returns(uint) {
+        return actualRequests[dealID][role];
+
+    }
+
+    function GetChangeRequestsAmount() public view returns(uint)  {
+        return requestsAmount;
+    }
+
+    function GetChangeRequestInfo(uint changeRequestID) public view
+    returns (
+        uint dealID,
+        Orders.OrderType requestType,
+        uint price,
+        uint duration,
+        RequestStatus status
+    ) {
+        return (
+        requests[changeRequestID].dealID,
+        requests[changeRequestID].requestType,
+        requests[changeRequestID].price,
+        requests[changeRequestID].duration,
+        requests[changeRequestID].status
+        );
+    }
+
+
+}
diff --git a/blockchain/source/contracts/Deals.sol b/blockchain/source/contracts/Deals.sol
new file mode 100644
index 000000000..7c811125a
--- /dev/null
+++ b/blockchain/source/contracts/Deals.sol
@@ -0,0 +1,222 @@
+pragma solidity ^0.4.23;
+
+import "./Administratable.sol";
+
+
+contract Deals is Administratable {
+    //events
+
+    //enums
+    enum DealStatus {
+        STATUS_UNKNOWN,
+        STATUS_ACCEPTED,
+        STATUS_CLOSED
+    }
+    //data
+
+    struct Deal {
+        DealInfo info;
+        DealParams params;
+    }
+
+    struct DealInfo {
+        uint64[] benchmarks;
+        address supplierID;
+        address consumerID;
+        address masterID;
+        uint askID;
+        uint bidID;
+        uint startTime;
+    }
+
+    struct DealParams {
+        uint duration;
+        uint price; //usd * 10^-18
+        uint endTime;
+        DealStatus status;
+        uint blockedBalance;
+        uint totalPayout;
+        uint lastBillTS;
+    }
+
+    mapping(uint => Deal) deals;
+
+    mapping(address => uint[]) dealsID;
+
+    uint dealsAmount = 0;
+
+    //Constructor
+    constructor() public {
+        owner = msg.sender;
+        administrator = msg.sender;
+    }
+
+
+    function SetDealBenchmarks(uint dealID, uint64[] _benchmarks) public onlyOwner {
+        deals[dealID].info.benchmarks = _benchmarks;
+    }
+
+    function SetDealSupplierID(uint dealID, address _supplierID) public onlyOwner {
+        deals[dealID].info.supplierID = _supplierID;
+    }
+
+    function SetDealConsumerID(uint dealID, address _consumerID) public onlyOwner {
+        deals[dealID].info.consumerID = _consumerID;
+    }
+
+    function SetDealMasterID(uint dealID, address _masterID) public onlyOwner {
+        deals[dealID].info.masterID = _masterID;
+    }
+
+    function SetDealAskID(uint dealID, uint _askID) public onlyOwner {
+        deals[dealID].info.askID = _askID;
+    }
+
+    function SetDealBidID(uint dealID, uint _bidID) public onlyOwner {
+        deals[dealID].info.bidID = _bidID;
+    }
+
+    function SetDealStartTime(uint dealID, uint _startTime) public onlyOwner {
+        deals[dealID].info.startTime = _startTime;
+    }
+
+    function SetDealStatus(uint dealID, DealStatus _status) public onlyOwner {
+        deals[dealID].params.status = _status;
+    }
+
+    function SetDealEndTime(uint dealID, uint _endTime) public onlyOwner {
+        deals[dealID].params.endTime = _endTime;
+    }
+
+    function SetDealBlockedBalance(uint dealID, uint _blockedBalance) public onlyOwner {
+        deals[dealID].params.blockedBalance = _blockedBalance;
+    }
+
+    function SetDealLastBillTS(uint dealID, uint _lastBillTS) public onlyOwner {
+        deals[dealID].params.lastBillTS = _lastBillTS;
+    }
+
+    function SetDealTotalPayout(uint dealID, uint _totalPayout) public onlyOwner {
+        deals[dealID].params.totalPayout = _totalPayout;
+    }
+
+    function SetDealPrice(uint dealID, uint _price) public onlyOwner {
+        deals[dealID].params.price = _price;
+    }
+
+    function SetDealDuration(uint dealID, uint _duration) public onlyOwner {
+        deals[dealID].params.duration = _duration;
+    }
+
+    function IncreaseDealsAmount() public onlyOwner {
+        dealsAmount += 1;
+    }
+
+
+    //getters
+
+    function GetDealInfo(uint dealID) public view
+    returns (
+        uint64[] benchmarks,
+        address supplierID,
+        address consumerID,
+        address masterID,
+        uint askID,
+        uint bidID,
+        uint startTime
+    ) {
+        DealInfo memory info = deals[dealID].info;
+        return (
+        info.benchmarks,
+        info.supplierID,
+        info.consumerID,
+        info.masterID,
+        info.askID,
+        info.bidID,
+        info.startTime
+        );
+    }
+
+    function GetDealParams(uint dealID) public view
+    returns (
+        uint duration,
+        uint price,
+        uint endTime,
+        DealStatus status,
+        uint blockedBalance,
+        uint totalPayout,
+        uint lastBillTS
+    ) {
+        DealParams memory params = deals[dealID].params;
+        return (
+        params.duration,
+        params.price,
+        params.endTime,
+        params.status,
+        params.blockedBalance,
+        params.totalPayout,
+        params.lastBillTS
+        );
+    }
+
+    function GetDealBenchmarks(uint dealID) public view returns(uint64[]) {
+        return deals[dealID].info.benchmarks;
+    }
+
+    function GetDealConsumerID(uint dealID) public view returns(address) {
+        return deals[dealID].info.consumerID;
+    }
+
+    function GetDealSupplierID(uint dealID) public view returns(address) {
+        return deals[dealID].info.supplierID;
+    }
+
+    function GetDealMasterID(uint dealID) public view returns(address) {
+        return deals[dealID].info.masterID;
+    }
+
+    function GetDealAskID(uint dealID) public view returns(uint) {
+        return deals[dealID].info.askID;
+    }
+
+    function GetDealBidID(uint dealID) public view returns(uint) {
+        return deals[dealID].info.bidID;
+    }
+
+    function GetDealStartTime(uint dealID) public view returns(uint) {
+        return deals[dealID].info.startTime;
+    }
+
+    function GetDealDuration(uint dealID) public view returns(uint) {
+        return deals[dealID].params.duration;
+    }
+
+    function GetDealPrice(uint dealID) public view returns(uint) {
+        return deals[dealID].params.price;
+    }
+
+    function GetDealEndTime(uint dealID) public view returns(uint) {
+        return deals[dealID].params.endTime;
+    }
+
+    function GetDealStatus(uint dealID) public view returns(DealStatus) {
+        return deals[dealID].params.status;
+    }
+
+    function GetDealBlockedBalance(uint dealID) public view returns(uint) {
+        return deals[dealID].params.blockedBalance;
+    }
+
+    function GetDealTotalPayout(uint dealID) public view returns(uint) {
+        return deals[dealID].params.totalPayout;
+    }
+
+    function GetDealLastBillTS(uint dealID) public view returns(uint) {
+        return deals[dealID].params.lastBillTS;
+    }
+
+    function GetDealsAmount() public view returns(uint) {
+        return dealsAmount;
+    }
+
+}
diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/Market.sol
index 35decf30a..fa7ccddde 100644
--- a/blockchain/source/contracts/Market.sol
+++ b/blockchain/source/contracts/Market.sol
@@ -7,6 +7,10 @@ import "./SNM.sol";
 import "./Blacklist.sol";
 import "./OracleUSD.sol";
 import "./ProfileRegistry.sol";
+import "./Administratum.sol";
+import "./Orders.sol";
+import "./Deals.sol";
+import "./ChangeRequests.sol";
 
 
 contract Market is Ownable, Pausable {
@@ -15,81 +19,14 @@ contract Market is Ownable, Pausable {
 
     // DECLARATIONS
 
-    enum DealStatus{
-        STATUS_UNKNOWN,
-        STATUS_ACCEPTED,
-        STATUS_CLOSED
-    }
-
-    enum OrderType {
-        ORDER_UNKNOWN,
-        ORDER_BID,
-        ORDER_ASK
-    }
-
-    enum OrderStatus {
-        UNKNOWN,
-        ORDER_INACTIVE,
-        ORDER_ACTIVE
-    }
-
-    enum RequestStatus {
-        REQUEST_UNKNOWN,
-        REQUEST_CREATED,
-        REQUEST_CANCELED,
-        REQUEST_REJECTED,
-        REQUEST_ACCEPTED
-    }
-
     enum BlacklistPerson {
         BLACKLIST_NOBODY,
         BLACKLIST_WORKER,
         BLACKLIST_MASTER
     }
 
-    struct Deal {
-        uint64[] benchmarks;
-        address supplierID;
-        address consumerID;
-        address masterID;
-        uint askID;
-        uint bidID;
-        uint duration;
-        uint price; //usd * 10^-18
-        uint startTime;
-        uint endTime;
-        DealStatus status;
-        uint blockedBalance;
-        uint totalPayout;
-        uint lastBillTS;
-    }
-
-    struct Order {
-        OrderType orderType;
-        OrderStatus orderStatus;
-        address author;
-        address counterparty;
-        uint duration;
-        uint256 price;
-        bool[] netflags;
-        ProfileRegistry.IdentityLevel identityLevel;
-        address blacklist;
-        bytes32 tag;
-        uint64[] benchmarks;
-        uint frozenSum;
-        uint dealID;
-    }
-
-    struct ChangeRequest {
-        uint dealID;
-        OrderType requestType;
-        uint price;
-        uint duration;
-        RequestStatus status;
-    }
 
     // EVENTS
-
     event OrderPlaced(uint indexed orderID);
     event OrderUpdated(uint indexed orderID);
 
@@ -118,11 +55,15 @@ contract Market is Ownable, Pausable {
 
     OracleUSD oracle;
 
-    ProfileRegistry pr;
+    ProfileRegistry profiles;
 
-    uint ordersAmount = 0;
+    Orders ordersCrud;
 
-    uint dealAmount = 0;
+    Administratum administratum;
+
+    Deals dealsCrud;
+
+    ChangeRequests changeRequestsCrud;
 
     uint requestsAmount = 0;
 
@@ -132,29 +73,27 @@ contract Market is Ownable, Pausable {
     // current length of netflags
     uint netflagsQuantity;
 
-    mapping(uint => Order) public orders;
-
-    mapping(uint => Deal) public deals;
-
-    mapping(address => uint[]) dealsID;
-
-    mapping(uint => ChangeRequest) requests;
-
-    mapping(uint => uint[2]) actualRequests;
-
-    mapping(address => address) masterOf;
-
-    mapping(address => bool) isMaster;
-
-    mapping(address => mapping(address => bool)) masterRequest;
-
     // INIT
 
-    constructor(address _token, address _blacklist, address _oracle, address _profileRegistry, uint _benchmarksQuantity, uint _netflagsQuantity) public {
+    constructor(address _token,
+        address _blacklist,
+        address _oracle,
+        address _profileRegistry,
+        address _administratum,
+        address _orders,
+        address _deals,
+        address _changeRequests,
+        uint _benchmarksQuantity,
+        uint _netflagsQuantity
+        ) public {
         token = SNM(_token);
         bl = Blacklist(_blacklist);
         oracle = OracleUSD(_oracle);
-        pr = ProfileRegistry(_profileRegistry);
+        profiles = ProfileRegistry(_profileRegistry);
+        administratum = Administratum(_administratum);
+        ordersCrud = Orders(_orders);
+        dealsCrud = Deals(_deals);
+        changeRequestsCrud = ChangeRequests(_changeRequests);
         benchmarksQuantity = _benchmarksQuantity;
         netflagsQuantity = _netflagsQuantity;
     }
@@ -164,8 +103,8 @@ contract Market is Ownable, Pausable {
     // Order functions
 
     function PlaceOrder(
-        OrderType _orderType,
-        address _id_counterparty,
+        Orders.OrderType _orderType,
+        address _counterpartyID,
         uint _duration,
         uint _price,
         bool[] _netflags,
@@ -173,7 +112,7 @@ contract Market is Ownable, Pausable {
         address _blacklist,
         bytes32 _tag,
         uint64[] _benchmarks
-    ) whenNotPaused public returns (uint){
+    ) whenNotPaused public returns (uint) {
 
         require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);
         require(_netflags.length <= netflagsQuantity);
@@ -185,7 +124,7 @@ contract Market is Ownable, Pausable {
 
         uint lockedSum = 0;
 
-        if (_orderType == OrderType.ORDER_BID) {
+        if (_orderType == Orders.OrderType.ORDER_BID) {
             if (_duration == 0) {
                 lockedSum = CalculatePayment(_price, 1 hours);
             } else if (_duration < 1 days) {
@@ -193,18 +132,15 @@ contract Market is Ownable, Pausable {
             } else {
                 lockedSum = CalculatePayment(_price, 1 days);
             }
-            // this line contains err.
-            require(token.transferFrom(msg.sender, this, lockedSum));
+            require(token.transferFrom(msg.sender, address(this), lockedSum));
         }
 
-        ordersAmount = ordersAmount.add(1);
-        uint256 orderId = ordersAmount;
 
-        orders[orderId] = Order(
+        ordersCrud.Write(
             _orderType,
-            OrderStatus.ORDER_ACTIVE,
+            Orders.OrderStatus.ORDER_ACTIVE,
             msg.sender,
-            _id_counterparty,
+            _counterpartyID,
             _duration,
             _price,
             _netflags,
@@ -216,126 +152,164 @@ contract Market is Ownable, Pausable {
             0
         );
 
-        emit OrderPlaced(orderId);
-        return orderId;
+        emit OrderPlaced(ordersCrud.GetOrdersAmount());
+
+        return ordersCrud.GetOrdersAmount();
     }
 
-    function CancelOrder(uint orderID) public returns (bool){
-        require(orderID <= ordersAmount);
-        require(orders[orderID].orderStatus == OrderStatus.ORDER_ACTIVE);
-        require(orders[orderID].author == msg.sender);
+    function CancelOrder(uint orderID) public returns (bool) {
+        require(orderID <= ordersCrud.GetOrdersAmount());
+
+        address author = ordersCrud.GetOrderAuthor(orderID);
 
-        require(token.transfer(msg.sender, orders[orderID].frozenSum));
-        orders[orderID].orderStatus = OrderStatus.ORDER_INACTIVE;
+        uint frozenSum = ordersCrud.GetOrderFrozenSum(orderID);
+
+        Orders.OrderStatus orderStatus = ordersCrud.GetOrderStatus(orderID);
+
+
+        require(orderStatus == Orders.OrderStatus.ORDER_ACTIVE);
+        require(author == msg.sender || administratum.GetMaster(author) == msg.sender);
+
+        require(token.transfer(msg.sender, frozenSum));
+
+        ordersCrud.SetOrderStatus(orderID, Orders.OrderStatus.ORDER_INACTIVE);
 
         emit OrderUpdated(orderID);
+
         return true;
     }
 
     function QuickBuy(uint askID, uint buyoutDuration) public whenNotPaused {
-        Order memory ask = orders[askID];
-        require(ask.orderType == OrderType.ORDER_ASK);
-        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE);
 
-        require(ask.duration >= buyoutDuration);
-        require(pr.GetProfileLevel(msg.sender) >= ask.identityLevel);
-        require(bl.Check(msg.sender, GetMaster(ask.author)) == false && bl.Check(ask.author, msg.sender) == false);
-        require(bl.Check(ask.blacklist, msg.sender) == false);
+        require(ordersCrud.GetOrderType(askID) == Orders.OrderType.ORDER_ASK);
+        require(ordersCrud.GetOrderStatus(askID) == Orders.OrderStatus.ORDER_ACTIVE);
+
+        require(ordersCrud.GetOrderDuration(askID) >= buyoutDuration);
+        require(profiles.GetProfileLevel(msg.sender) >= ordersCrud.GetOrderIdentityLevel(askID));
+        require(bl.Check(ordersCrud.GetOrderBlacklist(askID), msg.sender) == false);
+        require(
+            bl.Check(msg.sender, administratum.GetMaster(ordersCrud.GetOrderAuthor(askID))) == false
+            && bl.Check(ordersCrud.GetOrderAuthor(askID), msg.sender) == false);
 
         PlaceOrder(
-            OrderType.ORDER_BID,
-            GetMaster(ask.author),
+            Orders.OrderType.ORDER_BID,
+            administratum.GetMaster(ordersCrud.GetOrderAuthor(askID)),
             buyoutDuration,
-            ask.price,
-            ask.netflags,
+            ordersCrud.GetOrderPrice(askID),
+            ordersCrud.GetOrderNetflags(askID),
             ProfileRegistry.IdentityLevel.ANONYMOUS,
             address(0),
             bytes32(0),
-            ask.benchmarks);
+            ordersCrud.GetOrderBenchmarks(askID));
 
-        OpenDeal(askID, GetOrdersAmount());
+        OpenDeal(askID, ordersCrud.GetOrdersAmount());
     }
 
     // Deal functions
 
     function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {
-        Order memory ask = orders[_askID];
-        Order memory bid = orders[_bidID];
-
-        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);
-        require((ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author)) && (bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author)));
-        require(ask.orderType == OrderType.ORDER_ASK);
-        require(bid.orderType == OrderType.ORDER_BID);
         require(
-            bl.Check(bid.blacklist, GetMaster(ask.author)) == false
-            && bl.Check(bid.blacklist, ask.author) == false
-            && bl.Check(bid.author, GetMaster(ask.author)) == false
-            && bl.Check(bid.author, ask.author) == false
-            && bl.Check(ask.blacklist, bid.author) == false
-            && bl.Check(GetMaster(ask.author), bid.author) == false
-            && bl.Check(ask.author, bid.author) == false);
-        require(ask.price <= bid.price);
-        require(ask.duration >= bid.duration);
+            ordersCrud.GetOrderStatus(_askID) == Orders.OrderStatus.ORDER_ACTIVE
+            && ordersCrud.GetOrderStatus(_bidID) == Orders.OrderStatus.ORDER_ACTIVE);
+        require(ordersCrud.GetOrderCounterparty(_askID) == 0x0 || ordersCrud.GetOrderCounterparty(_askID) == ordersCrud.GetOrderAuthor(_bidID));
+        require(
+            ordersCrud.GetOrderCounterparty(_bidID) == 0x0
+            || ordersCrud.GetOrderCounterparty(_bidID) == administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))
+            || ordersCrud.GetOrderCounterparty(_bidID) == ordersCrud.GetOrderAuthor(_askID));
+        require(ordersCrud.GetOrderType(_askID) == Orders.OrderType.ORDER_ASK);
+        require(ordersCrud.GetOrderType(_bidID) == Orders.OrderType.ORDER_BID);
+        require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))));
+        require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), ordersCrud.GetOrderAuthor(_askID)));
+        require(!bl.Check(ordersCrud.GetOrderAuthor(_bidID), administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))));
+        require(!bl.Check(ordersCrud.GetOrderAuthor(_bidID), ordersCrud.GetOrderAuthor(_askID)));
+        require(!bl.Check(ordersCrud.GetOrderBlacklist(_askID), ordersCrud.GetOrderAuthor(_bidID)));
+        require(!bl.Check(administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID)), ordersCrud.GetOrderAuthor(_bidID)));
+        require(!bl.Check(ordersCrud.GetOrderAuthor(_askID), ordersCrud.GetOrderAuthor(_bidID)));
+        require(ordersCrud.GetOrderPrice(_askID) <= ordersCrud.GetOrderPrice(_bidID));
+        require(ordersCrud.GetOrderDuration(_askID) >= ordersCrud.GetOrderDuration(_bidID));
         // profile level check
-        require(pr.GetProfileLevel(bid.author) >= ask.identityLevel);
-        require(pr.GetProfileLevel(ask.author) >= bid.identityLevel);
+        require(profiles.GetProfileLevel(ordersCrud.GetOrderAuthor(_bidID)) >= ordersCrud.GetOrderIdentityLevel(_askID));
+        require(profiles.GetProfileLevel(administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))) >= ordersCrud.GetOrderIdentityLevel(_bidID)); //bug
 
-        if (ask.netflags.length < netflagsQuantity) {
-            ask.netflags = ResizeNetflags(ask.netflags);
+        bool[] memory askNetflags = ordersCrud.GetOrderNetflags(_askID);
+        if (askNetflags.length < netflagsQuantity) {
+            askNetflags = ResizeNetflags(askNetflags);
         }
 
-        if (bid.netflags.length < netflagsQuantity) {
-            bid.netflags = ResizeNetflags(ask.netflags);
+        bool[] memory bidNetflags = ordersCrud.GetOrderNetflags(_bidID);
+        if (bidNetflags.length < netflagsQuantity) {
+            bidNetflags = ResizeNetflags(bidNetflags);
         }
 
-        for (uint i = 0; i < ask.netflags.length; i++) {
+        for (uint i = 0; i < netflagsQuantity; i++) {
             // implementation: when bid contains requirement, ask necessary needs to have this
             // if ask have this one - pass
-            require(!bid.netflags[i] || ask.netflags[i]);
+            require(!bidNetflags[i] || askNetflags[i]);
         }
 
-        if (ask.benchmarks.length < benchmarksQuantity) {
-            ask.benchmarks = ResizeBenchmarks(ask.benchmarks);
+        uint64[] memory askBenchmarks = ordersCrud.GetOrderBenchmarks(_askID);
+        if (askBenchmarks.length < benchmarksQuantity) {
+            askBenchmarks = ResizeBenchmarks(askBenchmarks);
         }
 
-        if (bid.benchmarks.length < benchmarksQuantity) {
-            bid.benchmarks = ResizeBenchmarks(bid.benchmarks);
+        uint64[] memory bidBenchmarks = ordersCrud.GetOrderBenchmarks(_bidID);
+        if (bidBenchmarks.length < benchmarksQuantity) {
+            bidBenchmarks = ResizeBenchmarks(bidBenchmarks);
         }
 
-        for (i = 0; i < ask.benchmarks.length; i++) {
-            require(ask.benchmarks[i] >= bid.benchmarks[i]);
+        for (i = 0; i < benchmarksQuantity; i++) {
+            require(askBenchmarks[i] >= bidBenchmarks[i]);
         }
 
-        dealAmount = dealAmount.add(1);
-        address master = GetMaster(ask.author);
-        orders[_askID].orderStatus = OrderStatus.ORDER_INACTIVE;
-        orders[_bidID].orderStatus = OrderStatus.ORDER_INACTIVE;
-        orders[_askID].dealID = dealAmount;
-        orders[_bidID].dealID = dealAmount;
+        ordersCrud.SetOrderStatus(_askID, Orders.OrderStatus.ORDER_INACTIVE);
+        ordersCrud.SetOrderStatus(_bidID, Orders.OrderStatus.ORDER_INACTIVE);
 
         emit OrderUpdated(_askID);
         emit OrderUpdated(_bidID);
 
-        uint startTime = block.timestamp;
-        uint endTime = 0;
-        // `0` - for spot deal
 
         // if deal is normal
-        if (ask.duration != 0) {
-            endTime = startTime.add(bid.duration);
+        if (ordersCrud.GetOrderDuration(_askID) != 0) {
+            uint endTime = block.timestamp.add(ordersCrud.GetOrderDuration(_bidID));
+        } else {
+            endTime = 0;
+            // `0` - for spot deal
         }
-        uint blockedBalance = bid.frozenSum;
-        deals[dealAmount] = Deal(ask.benchmarks, ask.author, bid.author, master, _askID, _bidID, bid.duration, ask.price, startTime, endTime, DealStatus.STATUS_ACCEPTED, blockedBalance, 0, block.timestamp);
-        emit DealOpened(dealAmount);
+
+        dealsCrud.IncreaseDealsAmount();
+
+        uint dealID = dealsCrud.GetDealsAmount();
+
+        dealsCrud.SetDealBenchmarks(dealID, askBenchmarks);
+        dealsCrud.SetDealConsumerID(dealID, ordersCrud.GetOrderAuthor(_bidID));
+        dealsCrud.SetDealSupplierID(dealID, ordersCrud.GetOrderAuthor(_askID));
+        dealsCrud.SetDealMasterID(dealID, administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID)));
+        dealsCrud.SetDealAskID(dealID, _askID);
+        dealsCrud.SetDealBidID(dealID, _bidID);
+        dealsCrud.SetDealDuration(dealID, ordersCrud.GetOrderDuration(_bidID));
+        dealsCrud.SetDealPrice(dealID, ordersCrud.GetOrderPrice(_askID));
+        dealsCrud.SetDealStartTime(dealID, block.timestamp);
+        dealsCrud.SetDealEndTime(dealID, endTime);
+        dealsCrud.SetDealStatus(dealID, Deals.DealStatus.STATUS_ACCEPTED);
+        dealsCrud.SetDealBlockedBalance(dealID, ordersCrud.GetOrderFrozenSum(_bidID));
+        dealsCrud.SetDealTotalPayout(dealID, 0);
+        dealsCrud.SetDealLastBillTS(dealID, block.timestamp);
+
+
+
+        emit DealOpened(dealsCrud.GetDealsAmount());
+
+        ordersCrud.SetOrderDealID(_askID, dealID);
+        ordersCrud.SetOrderDealID(_bidID, dealID);
     }
 
     function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){
-        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));
-        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);
+        require((dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED));
+        require(msg.sender == dealsCrud.GetDealSupplierID(dealID) || msg.sender == dealsCrud.GetDealConsumerID(dealID) || msg.sender == dealsCrud.GetDealMasterID(dealID));
 
-        if (block.timestamp <= deals[dealID].startTime.add(deals[dealID].duration)) {
+        if (block.timestamp <= dealsCrud.GetDealStartTime(dealID).add(dealsCrud.GetDealDuration(dealID))) {
             // after endTime
-            require(deals[dealID].consumerID == msg.sender);
+            require(dealsCrud.GetDealConsumerID(dealID) == msg.sender);
         }
         AddToBlacklist(dealID, blacklisted);
         InternalBill(dealID);
@@ -351,266 +325,134 @@ contract Market is Ownable, Pausable {
     }
 
     function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {
-        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID || msg.sender == deals[dealID].supplierID);
-        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);
 
-        if (IsSpot(dealID)) {
+        require(
+            msg.sender == dealsCrud.GetDealConsumerID(dealID)
+            || msg.sender ==  dealsCrud.GetDealMasterID(dealID)
+            || msg.sender == dealsCrud.GetDealSupplierID(dealID));
+        require(dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED);
+
+        if (dealsCrud.GetDealDuration(dealID) == 0) {
             require(newDuration == 0);
         }
 
-        requestsAmount = requestsAmount.add(1);
 
-        OrderType requestType;
+        Orders.OrderType requestType;
 
-        if (msg.sender == deals[dealID].consumerID) {
-            requestType = OrderType.ORDER_BID;
+        if (msg.sender == dealsCrud.GetDealConsumerID(dealID)) {
+            requestType = Orders.OrderType.ORDER_BID;
         } else {
-            requestType = OrderType.ORDER_ASK;
+            requestType = Orders.OrderType.ORDER_ASK;
         }
 
-        requests[requestsAmount] = ChangeRequest(dealID, requestType, newPrice, newDuration, RequestStatus.REQUEST_CREATED);
-        emit DealChangeRequestSet(requestsAmount);
-
-        if (requestType == OrderType.ORDER_BID) {
-            emit DealChangeRequestUpdated(actualRequests[dealID][1]);
-            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;
-            actualRequests[dealID][1] = requestsAmount;
-            ChangeRequest memory matchingRequest = requests[actualRequests[dealID][0]];
-
-            if (newDuration == deals[dealID].duration && newPrice > deals[dealID].price) {
-                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+        uint currentID = changeRequestsCrud.Write(dealID, requestType, newPrice, newDuration, ChangeRequests.RequestStatus.REQUEST_CREATED);
+        emit DealChangeRequestSet(currentID);
+
+        if (requestType == Orders.OrderType.ORDER_BID) {
+            uint oldID = changeRequestsCrud.GetActualChangeRequest(dealID, 1);
+            uint matchingID = changeRequestsCrud.GetActualChangeRequest(dealID, 0);
+            emit DealChangeRequestUpdated(oldID);
+            changeRequestsCrud.SetChangeRequestStatus(oldID, ChangeRequests.RequestStatus.REQUEST_CANCELED);
+            changeRequestsCrud.SetActualChangeRequest(dealID, 1, currentID);
+
+            if (newDuration == dealsCrud.GetDealDuration(dealID) && newPrice > dealsCrud.GetDealPrice(dealID)) {
+                if (changeRequestsCrud.GetChangeRequestPrice(matchingID) <= newPrice) {
+                    changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                }
+                changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
                 Bill(dealID);
-                deals[dealID].price = newPrice;
-                actualRequests[dealID][1] = 0;
+                dealsCrud.SetDealPrice(dealID, newPrice);
+                changeRequestsCrud.SetActualChangeRequest(dealID, 1, 0);
                 emit DealChangeRequestUpdated(requestsAmount);
-            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration >= newDuration && matchingRequest.price <= newPrice) {
-                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
-                requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_ACCEPTED;
-                emit DealChangeRequestUpdated(actualRequests[dealID][0]);
-                actualRequests[dealID][0] = 0;
-                actualRequests[dealID][1] = 0;
+            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED
+                    && changeRequestsCrud.GetChangeRequestDuration(matchingID) >= newDuration
+                    && changeRequestsCrud.GetChangeRequestPrice(matchingID) <= newPrice) {
+
+                changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                emit DealChangeRequestUpdated(changeRequestsCrud.GetActualChangeRequest(dealID, 0));
+                changeRequestsCrud.SetActualChangeRequest(dealID, 0, 0);
+                changeRequestsCrud.SetActualChangeRequest(dealID, 1, 0);
                 Bill(dealID);
-                deals[dealID].price = matchingRequest.price;
-                deals[dealID].duration = newDuration;
+                dealsCrud.SetDealPrice(dealID, changeRequestsCrud.GetChangeRequestPrice(matchingID));
+                dealsCrud.SetDealDuration(dealID, newDuration);
                 emit DealChangeRequestUpdated(requestsAmount);
             } else {
-                return requestsAmount;
+                return currentID;
             }
-
-            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;
-            emit DealChangeRequestUpdated(actualRequests[dealID][1]);
-            actualRequests[dealID][1] = requestsAmount;
+            changeRequestsCrud.SetChangeRequestStatus(changeRequestsCrud.GetActualChangeRequest(dealID, 1), ChangeRequests.RequestStatus.REQUEST_CANCELED);
+            emit DealChangeRequestUpdated(changeRequestsCrud.GetActualChangeRequest(dealID, 1));
+            changeRequestsCrud.SetActualChangeRequest(dealID, 1, changeRequestsCrud.GetChangeRequestsAmount());
         }
 
-        if (requestType == OrderType.ORDER_ASK) {
-            emit DealChangeRequestUpdated(actualRequests[dealID][0]);
-            requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_CANCELED;
-            actualRequests[dealID][0] = requestsAmount;
-            matchingRequest = requests[actualRequests[dealID][1]];
+        if (requestType == Orders.OrderType.ORDER_ASK) {
+            matchingID = changeRequestsCrud.GetActualChangeRequest(dealID, 1);
+            oldID = changeRequestsCrud.GetActualChangeRequest(dealID, 0);
+            emit DealChangeRequestUpdated(oldID);
+            changeRequestsCrud.SetChangeRequestStatus(oldID, ChangeRequests.RequestStatus.REQUEST_CANCELED);
+            changeRequestsCrud.SetActualChangeRequest(dealID, 0, currentID);
+
 
-            if (newDuration == deals[dealID].duration && newPrice < deals[dealID].price) {
-                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+            if (newDuration == dealsCrud.GetDealDuration(dealID) && newPrice < dealsCrud.GetDealPrice(dealID)) {
+                if (changeRequestsCrud.GetChangeRequestPrice(matchingID) >= newPrice) {
+                    changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                }
+                changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
                 Bill(dealID);
-                deals[dealID].price = newPrice;
-                actualRequests[dealID][0] = 0;
-                emit DealChangeRequestUpdated(requestsAmount);
-            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration <= newDuration && matchingRequest.price >= newPrice) {
-                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
-                emit DealChangeRequestUpdated(actualRequests[dealID][1]);
-                actualRequests[dealID][0] = 0;
-                actualRequests[dealID][1] = 0;
+                dealsCrud.SetDealPrice(dealID, newPrice);
+                changeRequestsCrud.SetActualChangeRequest(dealID, 0, 0);
+                emit DealChangeRequestUpdated(currentID);
+            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED
+                && changeRequestsCrud.GetChangeRequestDuration(matchingID) <= newDuration
+                && changeRequestsCrud.GetChangeRequestPrice(matchingID) >= newPrice) {
+
+                changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
+                emit DealChangeRequestUpdated(matchingID); //bug
+                changeRequestsCrud.SetActualChangeRequest(dealID, 0, 0);
+                changeRequestsCrud.SetActualChangeRequest(dealID, 1, 0);
                 Bill(dealID);
-                deals[dealID].price = newPrice;
-                deals[dealID].duration = matchingRequest.duration;
-                emit DealChangeRequestUpdated(requestsAmount);
+                dealsCrud.SetDealPrice(dealID, newPrice);
+                dealsCrud.SetDealDuration(dealID, changeRequestsCrud.GetChangeRequestDuration(matchingID));
+                emit DealChangeRequestUpdated(currentID);
             } else {
-                return requestsAmount;
+                return currentID;
             }
         }
 
-        deals[dealID].endTime = deals[dealID].startTime.add(deals[dealID].duration);
-        return requestsAmount;
+        dealsCrud.SetDealEndTime(dealID, dealsCrud.GetDealStartTime(dealID).add(dealsCrud.GetDealEndTime(dealID)));
+        return currentID;
     }
 
     function CancelChangeRequest(uint changeRequestID) public returns (bool) {
-        ChangeRequest memory request = requests[changeRequestID];
-        require(msg.sender == deals[request.dealID].supplierID || msg.sender == deals[request.dealID].masterID || msg.sender == deals[request.dealID].consumerID);
-        require(request.status != RequestStatus.REQUEST_ACCEPTED);
+        uint dealID = changeRequestsCrud.GetChangeRequestDealID(changeRequestID);
+        require(msg.sender == dealsCrud.GetDealSupplierID(dealID) || msg.sender == dealsCrud.GetDealMasterID(dealID) || msg.sender == dealsCrud.GetDealConsumerID(dealID));
+        require(changeRequestsCrud.GetChangeRequestStatus(changeRequestID) != ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
 
-        if (request.requestType == OrderType.ORDER_ASK) {
-            if (msg.sender == deals[request.dealID].consumerID) {
-                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;
+        if (changeRequestsCrud.GetChangeRequestType(changeRequestID) == Orders.OrderType.ORDER_ASK) {
+            if (msg.sender == dealsCrud.GetDealConsumerID(dealID)) {
+                changeRequestsCrud.SetChangeRequestStatus(changeRequestID, ChangeRequests.RequestStatus.REQUEST_REJECTED);
             } else {
-                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;
+                changeRequestsCrud.SetChangeRequestStatus(changeRequestID, ChangeRequests.RequestStatus.REQUEST_CANCELED);
             }
-            actualRequests[request.dealID][0] = 0;
+            changeRequestsCrud.SetActualChangeRequest(dealID, 0, 0);
             emit DealChangeRequestUpdated(changeRequestID);
         }
 
-        if (request.requestType == OrderType.ORDER_BID) {
-            if (msg.sender == deals[request.dealID].consumerID) {
-                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;
+        if (changeRequestsCrud.GetChangeRequestType(changeRequestID) == Orders.OrderType.ORDER_BID) {
+            if (msg.sender == dealsCrud.GetDealConsumerID(dealID)) {
+                changeRequestsCrud.SetChangeRequestStatus(changeRequestID, ChangeRequests.RequestStatus.REQUEST_CANCELED);
             } else {
-                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;
+                changeRequestsCrud.SetChangeRequestStatus(changeRequestID, ChangeRequests.RequestStatus.REQUEST_REJECTED);
             }
-            actualRequests[request.dealID][1] = 0;
+            changeRequestsCrud.SetActualChangeRequest(dealID, 1, 0);
             emit DealChangeRequestUpdated(changeRequestID);
         }
         return true;
     }
 
-    // Master-worker functions
-
-    function RegisterWorker(address _master) public whenNotPaused returns (bool) {
-        require(GetMaster(msg.sender) == msg.sender);
-        require(isMaster[msg.sender] == false);
-        require(GetMaster(_master) == _master);
-        masterRequest[_master][msg.sender] = true;
-        emit WorkerAnnounced(msg.sender, _master);
-        return true;
-    }
-
-    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {
-        require(masterRequest[msg.sender][_worker] == true);
-        masterOf[_worker] = msg.sender;
-        isMaster[msg.sender] = true;
-        delete masterRequest[msg.sender][_worker];
-        emit WorkerConfirmed(_worker, msg.sender);
-        return true;
-    }
-
-    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {
-        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));
-        delete masterOf[_worker];
-        emit WorkerRemoved(_worker, _master);
-        return true;
-    }
-
     // GETTERS
 
-    function GetOrderInfo(uint orderID) view public
-    returns (
-        OrderType orderType,
-        address author,
-        address counterparty,
-        uint duration,
-        uint price,
-        bool[] netflags,
-        ProfileRegistry.IdentityLevel identityLevel,
-        address blacklist,
-        bytes32 tag,
-        uint64[] benchmarks,
-        uint frozenSum
-    ){
-        Order memory order = orders[orderID];
-        return (
-        order.orderType,
-        order.author,
-        order.counterparty,
-        order.duration,
-        order.price,
-        order.netflags,
-        order.identityLevel,
-        order.blacklist,
-        order.tag,
-        order.benchmarks,
-        order.frozenSum
-        );
-    }
-
-
-    function GetOrderParams(uint orderID) view public
-    returns (
-        OrderStatus orderStatus,
-        uint dealID
-    ){
-        Order memory order = orders[orderID];
-        return (
-        order.orderStatus,
-        order.dealID
-        );
-    }
-
-    function GetDealInfo(uint dealID) view public
-    returns (
-        uint64[] benchmarks,
-        address supplierID,
-        address consumerID,
-        address masterID,
-        uint askID,
-        uint bidID,
-        uint startTime
-    ){
-        return (
-        deals[dealID].benchmarks,
-        deals[dealID].supplierID,
-        deals[dealID].consumerID,
-        deals[dealID].masterID,
-        deals[dealID].askID,
-        deals[dealID].bidID,
-        deals[dealID].startTime
-
-        );
-    }
-
-    function GetDealParams(uint dealID) view public
-    returns (
-        uint duration,
-        uint price,
-        uint endTime,
-        DealStatus status,
-        uint blockedBalance,
-        uint totalPayout,
-        uint lastBillTS
-    ){
-        return (
-        deals[dealID].duration,
-        deals[dealID].price,
-        deals[dealID].endTime,
-        deals[dealID].status,
-        deals[dealID].blockedBalance,
-        deals[dealID].totalPayout,
-        deals[dealID].lastBillTS
-        );
-    }
-
-    function GetMaster(address _worker) view public returns (address master) {
-        if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {
-            master = _worker;
-        } else {
-            master = masterOf[_worker];
-        }
-    }
-
-    function GetChangeRequestInfo(uint changeRequestID) view public
-    returns (
-        uint dealID,
-        OrderType requestType,
-        uint price,
-        uint duration,
-        RequestStatus status
-    ){
-        return (
-        requests[changeRequestID].dealID,
-        requests[changeRequestID].requestType,
-        requests[changeRequestID].price,
-        requests[changeRequestID].duration,
-        requests[changeRequestID].status
-        );
-    }
-
-    function GetDealsAmount() public view returns (uint){
-        return dealAmount;
-    }
-
-    function GetOrdersAmount() public view returns (uint){
-        return ordersAmount;
-    }
-
-    function GetChangeRequestsAmount() public view returns (uint){
-        return requestsAmount;
-    }
-
     function GetBenchmarksQuantity() public view returns (uint) {
         return benchmarksQuantity;
     }
@@ -623,72 +465,79 @@ contract Market is Ownable, Pausable {
     // INTERNAL
 
     function InternalBill(uint dealID) internal returns (bool){
-        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);
-        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);
-        Deal memory deal = deals[dealID];
 
+        require(dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED);
+        require(
+            msg.sender == dealsCrud.GetDealSupplierID(dealID) ||
+            msg.sender == dealsCrud.GetDealConsumerID(dealID) ||
+            msg.sender == dealsCrud.GetDealMasterID(dealID));
         uint paidAmount;
 
-        if (!IsSpot(dealID) && deal.lastBillTS >= deal.endTime) {
+        if (dealsCrud.GetDealDuration(dealID) != 0 && dealsCrud.GetDealLastBillTS(dealID) >= dealsCrud.GetDealEndTime(dealID)) {
             // means we already billed deal after endTime
             return true;
-        } else if (!IsSpot(dealID) && block.timestamp > deal.endTime && deal.lastBillTS < deal.endTime) {
-            paidAmount = CalculatePayment(deal.price, deal.endTime.sub(deal.lastBillTS));
+        } else if (dealsCrud.GetDealDuration(dealID) != 0
+            && block.timestamp > dealsCrud.GetDealEndTime(dealID)
+            && dealsCrud.GetDealLastBillTS(dealID) < dealsCrud.GetDealEndTime(dealID)) {
+            paidAmount = CalculatePayment(dealsCrud.GetDealPrice(dealID), dealsCrud.GetDealEndTime(dealID).sub(dealsCrud.GetDealLastBillTS(dealID)));
         } else {
-            paidAmount = CalculatePayment(deal.price, block.timestamp.sub(deal.lastBillTS));
+            paidAmount = CalculatePayment(dealsCrud.GetDealPrice(dealID), block.timestamp.sub(dealsCrud.GetDealLastBillTS(dealID)));
         }
 
-        if (paidAmount > deal.blockedBalance) {
-            if (token.balanceOf(deal.consumerID) >= paidAmount.sub(deal.blockedBalance)) {
-                require(token.transferFrom(deal.consumerID, this, paidAmount.sub(deal.blockedBalance)));
-                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(paidAmount.sub(deal.blockedBalance));
+        if (paidAmount > dealsCrud.GetDealBlockedBalance(dealID)) {
+            if (token.balanceOf(dealsCrud.GetDealConsumerID(dealID)) >= paidAmount.sub(dealsCrud.GetDealBlockedBalance(dealID))) {
+                require(token.transferFrom(dealsCrud.GetDealConsumerID(dealID), this, paidAmount.sub(dealsCrud.GetDealBlockedBalance(dealID))));
+                dealsCrud.SetDealBlockedBalance(dealID, dealsCrud.GetDealBlockedBalance(dealID).add(paidAmount.sub(dealsCrud.GetDealBlockedBalance(dealID))));
             } else {
-                emit Billed(dealID, deals[dealID].blockedBalance);
+                emit Billed(dealID, dealsCrud.GetDealBlockedBalance(dealID));
                 InternalCloseDeal(dealID);
-                require(token.transfer(deal.masterID, deal.blockedBalance));
-                deals[dealID].lastBillTS = block.timestamp;
-                deals[dealID].totalPayout = deals[dealID].totalPayout.add(deal.blockedBalance);
-                deals[dealID].blockedBalance = 0;
+                require(token.transfer(dealsCrud.GetDealMasterID(dealID), dealsCrud.GetDealBlockedBalance(dealID)));
+                dealsCrud.SetDealTotalPayout(dealID, dealsCrud.GetDealTotalPayout(dealID).add(dealsCrud.GetDealBlockedBalance(dealID)));
+                dealsCrud.SetDealBlockedBalance(dealID, 0);
+                dealsCrud.SetDealEndTime(dealID, block.timestamp);
                 return true;
             }
         }
-        require(token.transfer(deal.masterID, paidAmount));
-        deals[dealID].blockedBalance = deals[dealID].blockedBalance.sub(paidAmount);
-        deals[dealID].totalPayout = deals[dealID].totalPayout.add(paidAmount);
-        deals[dealID].lastBillTS = block.timestamp;
+
+        require(token.transfer(dealsCrud.GetDealMasterID(dealID), paidAmount));
+        dealsCrud.SetDealBlockedBalance(dealID, dealsCrud.GetDealBlockedBalance(dealID).sub(paidAmount));
+        dealsCrud.SetDealTotalPayout(dealID, dealsCrud.GetDealTotalPayout(dealID).add(paidAmount));
+        dealsCrud.SetDealLastBillTS(dealID, block.timestamp);
         emit Billed(dealID, paidAmount);
         return true;
     }
 
     function ReserveNextPeriodFunds(uint dealID) internal returns (bool) {
         uint nextPeriod;
-        Deal memory deal = deals[dealID];
+        address consumerID = dealsCrud.GetDealConsumerID(dealID);
 
-        if (IsSpot(dealID)) {
-            if (deal.status == DealStatus.STATUS_CLOSED) {
+        (uint duration, uint price, uint endTime, Deals.DealStatus status, uint blockedBalance, , ) = dealsCrud.GetDealParams(dealID);
+
+        if (duration == 0) {
+            if (status == Deals.DealStatus.STATUS_CLOSED) {
                 return true;
             }
             nextPeriod = 1 hours;
         } else {
-            if (block.timestamp > deal.endTime) {
+            if (block.timestamp > endTime) {
                 // we don't reserve funds for next period
                 return true;
             }
-            if (deal.endTime.sub(block.timestamp) < 1 days) {
-                nextPeriod = deal.endTime.sub(block.timestamp);
+            if (endTime.sub(block.timestamp) < 1 days) {
+                nextPeriod = endTime.sub(block.timestamp);
             } else {
                 nextPeriod = 1 days;
             }
         }
 
-        if (CalculatePayment(deal.price, nextPeriod) > deals[dealID].blockedBalance) {
-            uint nextPeriodSum = CalculatePayment(deal.price, nextPeriod).sub(deals[dealID].blockedBalance);
+        if (CalculatePayment(price, nextPeriod) > blockedBalance) {
+            uint nextPeriodSum = CalculatePayment(price, nextPeriod).sub(blockedBalance);
 
-            if (token.balanceOf(deal.consumerID) >= nextPeriodSum) {
-                require(token.transferFrom(deal.consumerID, this, nextPeriodSum));
-                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(nextPeriodSum);
+            if (token.balanceOf(consumerID) >= nextPeriodSum) {
+                require(token.transferFrom(consumerID, this, nextPeriodSum));
+                dealsCrud.SetDealBlockedBalance(dealID, blockedBalance.add(nextPeriodSum));
             } else {
-                emit Billed(dealID, deals[dealID].blockedBalance);
+                emit Billed(dealID, blockedBalance);
                 InternalCloseDeal(dealID);
                 RefundRemainingFunds(dealID);
                 return true;
@@ -697,17 +546,19 @@ contract Market is Ownable, Pausable {
         return true;
     }
 
-    function RefundRemainingFunds(uint dealID) internal returns (bool){
-        if (deals[dealID].blockedBalance != 0) {
-            token.transfer(deals[dealID].consumerID, deals[dealID].blockedBalance);
-            deals[dealID].blockedBalance = 0;
+    function RefundRemainingFunds(uint dealID) internal returns (bool) {
+        address consumerID = dealsCrud.GetDealConsumerID(dealID);
+
+        uint blockedBalance = dealsCrud.GetDealBlockedBalance(dealID);
+
+        if (blockedBalance != 0) {
+            token.transfer(consumerID, blockedBalance);
+            dealsCrud.SetDealBlockedBalance(dealID, 0);
         }
         return true;
     }
 
-    function IsSpot(uint dealID) internal view returns (bool){
-        return deals[dealID].duration == 0;
-    }
+
 
     function CalculatePayment(uint _price, uint _period) internal view returns (uint) {
         uint rate = oracle.getCurrentPrice();
@@ -715,23 +566,29 @@ contract Market is Ownable, Pausable {
     }
 
     function AddToBlacklist(uint dealID, BlacklistPerson role) internal {
+        (, address supplierID, address consumerID, address masterID, , , ) = dealsCrud.GetDealInfo(dealID);
+
         // only consumer can blacklist
-        require(msg.sender == deals[dealID].consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);
+        require(msg.sender == consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);
         if (role == BlacklistPerson.BLACKLIST_WORKER) {
-            bl.Add(deals[dealID].consumerID, deals[dealID].supplierID);
+            bl.Add(consumerID, supplierID);
         } else if (role == BlacklistPerson.BLACKLIST_MASTER) {
-            bl.Add(deals[dealID].consumerID, deals[dealID].masterID);
+            bl.Add(consumerID, masterID);
         }
     }
 
     function InternalCloseDeal(uint dealID) internal {
-        if (deals[dealID].status == DealStatus.STATUS_CLOSED) {
+        ( , address supplierID, address consumerID, address masterID, , , ) = dealsCrud.GetDealInfo(dealID);
+
+        Deals.DealStatus status = dealsCrud.GetDealStatus(dealID);
+
+        if (status == Deals.DealStatus.STATUS_CLOSED) {
             return;
         }
-        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));
-        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].masterID);
-        deals[dealID].status = DealStatus.STATUS_CLOSED;
-        deals[dealID].endTime = block.timestamp;
+        require((status == Deals.DealStatus.STATUS_ACCEPTED));
+        require(msg.sender == consumerID || msg.sender == supplierID || msg.sender == masterID);
+        dealsCrud.SetDealStatus(dealID, Deals.DealStatus.STATUS_CLOSED);
+        dealsCrud.SetDealEndTime(dealID, block.timestamp);
         emit DealUpdated(dealID);
     }
 
@@ -753,30 +610,40 @@ contract Market is Ownable, Pausable {
 
     // SETTERS
 
-    function SetProfileRegistryAddress(address _newPR) onlyOwner public returns (bool) {
-        pr = ProfileRegistry(_newPR);
+    function SetProfileRegistryAddress(address _newPR) public onlyOwner returns (bool) {
+        profiles = ProfileRegistry(_newPR);
         return true;
     }
 
-    function SetBlacklistAddress(address _newBL) onlyOwner public returns (bool) {
+    function SetBlacklistAddress(address _newBL) public onlyOwner returns (bool) {
         bl = Blacklist(_newBL);
         return true;
     }
 
-    function SetOracleAddress(address _newOracle) onlyOwner public returns (bool) {
+    function SetOracleAddress(address _newOracle) public onlyOwner returns (bool) {
         require(OracleUSD(_newOracle).getCurrentPrice() != 0);
         oracle = OracleUSD(_newOracle);
         return true;
     }
 
-    function SetBenchmarksQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+    function SetDealsAddress(address _newDeals) public onlyOwner returns (bool) {
+        dealsCrud = Deals(_newDeals);
+        return true;
+    }
+
+    function SetOrdersAddress(address _newOrders) public onlyOwner returns (bool) {
+        ordersCrud = Orders(_newOrders);
+        return  true;
+    }
+
+    function SetBenchmarksQuantity(uint _newQuantity) public onlyOwner returns (bool) {
         require(_newQuantity > benchmarksQuantity);
         emit NumBenchmarksUpdated(_newQuantity);
         benchmarksQuantity = _newQuantity;
         return true;
     }
 
-    function SetNetflagsQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+    function SetNetflagsQuantity(uint _newQuantity) public onlyOwner returns (bool) {
         require(_newQuantity > netflagsQuantity);
         emit NumNetflagsUpdated(_newQuantity);
         netflagsQuantity = _newQuantity;
@@ -787,4 +654,13 @@ contract Market is Ownable, Pausable {
         token.transfer(owner, token.balanceOf(address(this)));
         selfdestruct(owner);
     }
+
+    function Migrate(address _newMarket) public onlyOwner returns (bool) {
+        token.transfer(_newMarket, token.balanceOf(address(this)));
+        ordersCrud.transferOwnership(_newMarket);
+        dealsCrud.transferOwnership(_newMarket);
+        changeRequestsCrud.transferOwnership(_newMarket);
+        pause();
+
+    }
 }
diff --git a/blockchain/source/contracts/OracleUSD.sol b/blockchain/source/contracts/OracleUSD.sol
index b1c3f7001..f7e8fb5e5 100644
--- a/blockchain/source/contracts/OracleUSD.sol
+++ b/blockchain/source/contracts/OracleUSD.sol
@@ -20,7 +20,7 @@ contract OracleUSD is Ownable {
         emit PriceChanged(_price);
     }
 
-    function getCurrentPrice() public view returns (uint){
+    function getCurrentPrice() public view returns (uint) {
         return currentPrice;
     }
 }
diff --git a/blockchain/source/contracts/Orders.sol b/blockchain/source/contracts/Orders.sol
new file mode 100644
index 000000000..330c5eb3f
--- /dev/null
+++ b/blockchain/source/contracts/Orders.sol
@@ -0,0 +1,215 @@
+pragma solidity ^0.4.23;
+
+import "./Administratable.sol";
+import "./ProfileRegistry.sol";
+
+contract Orders is Administratable {
+    //events
+
+    //enums
+
+    enum OrderStatus {
+        UNKNOWN,
+        ORDER_INACTIVE,
+        ORDER_ACTIVE
+    }
+
+    enum OrderType {
+        ORDER_UNKNOWN,
+        ORDER_BID,
+        ORDER_ASK
+    }
+
+    //DATA
+    struct Order {
+        OrderInfo info;
+        OrderParams params;
+    }
+
+    struct OrderInfo {
+        OrderType orderType;
+        address author;
+        address counterparty;
+        uint duration;
+        uint price;
+        bool[] netflags;
+        ProfileRegistry.IdentityLevel identityLevel;
+        address blacklist;
+        bytes32 tag;
+        uint64[] benchmarks;
+        uint frozenSum;
+        uint requiredRating;
+    }
+
+    struct OrderParams {
+        OrderStatus orderStatus;
+        uint dealID;
+    }
+
+    mapping(uint => Order) public orders;
+
+    uint ordersAmount = 0;
+
+    //Constructor
+
+    constructor() public {
+        owner = msg.sender;
+        administrator = msg.sender;
+    }
+
+    function Write(
+        OrderType _orderType,
+        OrderStatus _orderStatus,
+        address _author,
+        address _counterparty,
+        uint _duration,
+        uint256 _price,
+        bool[] _netflags,
+        ProfileRegistry.IdentityLevel _identityLevel,
+        address _blacklist,
+        bytes32 _tag,
+        uint64[] _benchmarks,
+        uint _frozenSum,
+        uint _dealID) public onlyOwner  returns(uint) {
+
+        ordersAmount += 1;
+
+        orders[ordersAmount].info.orderType = _orderType;
+        orders[ordersAmount].info.author = _author;
+        orders[ordersAmount].info.counterparty = _counterparty;
+        orders[ordersAmount].info.duration = _duration;
+        orders[ordersAmount].info.price = _price;
+        orders[ordersAmount].info.netflags = _netflags;
+        orders[ordersAmount].info.identityLevel = _identityLevel;
+        orders[ordersAmount].info.blacklist = _blacklist;
+        orders[ordersAmount].info.tag = _tag;
+        orders[ordersAmount].info.benchmarks = _benchmarks;
+        orders[ordersAmount].info.frozenSum = _frozenSum;
+        orders[ordersAmount].params.orderStatus = _orderStatus;
+        orders[ordersAmount].params.dealID = _dealID;
+
+        return ordersAmount;
+    }
+
+    function SetOrderStatus(uint orderID, OrderStatus _status) public onlyOwner {
+        orders[orderID].params.orderStatus = _status;
+    }
+
+    function SetOrderDealID(uint orderID, uint _dealID) public onlyOwner {
+        orders[orderID].params.dealID = _dealID;
+    }
+
+    function SetOrderBenchmarks(uint orderID, uint64[] _benchmarks) public onlyOwner {
+        orders[orderID].info.benchmarks = _benchmarks;
+    }
+
+    function SetOrderNetflags(uint orderID, bool[] _netflags) public onlyOwner {
+        orders[orderID].info.netflags = _netflags;
+    }
+
+    function SetOrderRequiredRating(uint orderID, uint _requiredRating) public onlyOwner {
+        orders[orderID].info.requiredRating = _requiredRating;
+    }
+
+    function GetOrderInfo(uint orderID) public view
+    returns (
+        OrderType orderType,
+        address author,
+        address counterparty,
+        uint duration,
+        uint price,
+        bool[] netflags,
+        ProfileRegistry.IdentityLevel identityLevel,
+        address blacklist,
+        bytes32 tag,
+        uint64[] benchmarks,
+        uint frozenSum,
+        uint requiredRating
+    ){
+        OrderInfo memory info = orders[orderID].info;
+        return (
+        info.orderType,
+        info.author,
+        info.counterparty,
+        info.duration,
+        info.price,
+        info.netflags,
+        info.identityLevel,
+        info.blacklist,
+        info.tag,
+        info.benchmarks,
+        info.frozenSum,
+        info.requiredRating
+        );
+    }
+    function GetOrderType(uint orderID) public view returns (OrderType) {
+        return orders[orderID].info.orderType;
+    }
+
+    function GetOrderAuthor(uint orderID) public view returns (address) {
+        return orders[orderID].info.author;
+    }
+
+    function GetOrderCounterparty(uint orderID) public view returns (address) {
+        return orders[orderID].info.counterparty;
+    }
+
+    function GetOrderDuration(uint orderID) public view returns (uint) {
+        return orders[orderID].info.duration;
+    }
+
+    function GetOrderPrice(uint orderID) public view returns (uint) {
+        return orders[orderID].info.price;
+    }
+
+    function GetOrderNetflags(uint orderID) public view returns (bool[]) {
+        return orders[orderID].info.netflags;
+    }
+
+    function GetOrderIdentityLevel(uint orderID) public view returns (ProfileRegistry.IdentityLevel) {
+        return orders[orderID].info.identityLevel;
+    }
+
+    function GetOrderBlacklist(uint orderID) public view returns (address) {
+        return orders[orderID].info.blacklist;
+    }
+
+    function GetOrderTag(uint orderID) public view returns (bytes32) {
+        return orders[orderID].info.tag;
+    }
+
+    function GetOrderBenchmarks(uint orderID) public view returns (uint64[]) {
+        return orders[orderID].info.benchmarks;
+    }
+    function GetOrderFrozenSum(uint orderID) public view returns (uint) {
+        return orders[orderID].info.frozenSum;
+    }
+
+    function GetOrderRequiredRating(uint orderID) public view returns (uint) {
+        return orders[orderID].info.requiredRating;
+    }
+
+    function GetOrdersAmount() public view returns (uint) {
+        return ordersAmount;
+    }
+
+    function GetOrderParams(uint orderID) public view
+    returns (
+        OrderStatus orderStatus,
+        uint dealID
+    ){
+        OrderParams memory params = orders[orderID].params;
+        return (
+        params.orderStatus,
+        params.dealID
+        );
+    }
+
+    function GetOrderStatus(uint orderID) public view returns (OrderStatus) {
+        return orders[orderID].params.orderStatus;
+    }
+
+    function GetOrderDealID(uint orderID) public view returns (uint) {
+        return orders[orderID].params.dealID;
+    }
+}
diff --git a/blockchain/source/contracts/SimpleGatekeeperWithLimit.sol b/blockchain/source/contracts/SimpleGatekeeperWithLimit.sol
index 95ad1a469..cad6ea383 100644
--- a/blockchain/source/contracts/SimpleGatekeeperWithLimit.sol
+++ b/blockchain/source/contracts/SimpleGatekeeperWithLimit.sol
@@ -123,7 +123,7 @@ contract SimpleGatekeeperWithLimit is Ownable {
         CommissionChanged(commission);
     }
 
-    function GetCommission() public view returns (uint256){
+    function GetCommission() public view returns (uint256) {
         return commission;
     }
 
diff --git a/blockchain/source/scripts/test.sh b/blockchain/source/scripts/test.sh
index 2da036a27..769a28685 100755
--- a/blockchain/source/scripts/test.sh
+++ b/blockchain/source/scripts/test.sh
@@ -40,9 +40,9 @@ start_testrpc() {
   )
 
   if [ "$SOLIDITY_COVERAGE" = true ]; then
-    node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --port "$testrpc_port" "${accounts[@]}" > /dev/null &
+    node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --allowUnlimitedContractSize --port "$testrpc_port" "${accounts[@]}" > /dev/null &
   else
-    node_modules/.bin/ganache-cli --gasLimit 0xfffffffffff --port "$testrpc_port" "${accounts[@]}" > /dev/null &
+    node_modules/.bin/ganache-cli --gasLimit 0xfffffffffff --allowUnlimitedContractSize --port "$testrpc_port" "${accounts[@]}" > /dev/null &
   fi
 
   testrpc_pid=$!
diff --git a/blockchain/source/test/blacklist.js b/blockchain/source/test/blacklist.js
index fa2bdf46f..52eb37001 100644
--- a/blockchain/source/test/blacklist.js
+++ b/blockchain/source/test/blacklist.js
@@ -5,6 +5,11 @@ const Blacklist = artifacts.require('./Blacklist.sol');
 const SNM = artifacts.require('./SNM.sol');
 const OracleUSD = artifacts.require('./OracleUSD.sol');
 const ProfileRegistry = artifacts.require('./ProfileRegistry.sol');
+const Orders = artifacts.require('./Orders.sol');
+const Deals = artifacts.require('./Deals.sol');
+const ChangeRequests = artifacts.require('./ChangeRequests.sol');
+const AdministratumCrud = artifacts.require('./AdministratumCrud.sol');
+const Administratum = artifacts.require('./Administratum.sol');
 
 contract('Blacklist', async function (accounts) {
     let market;
@@ -12,6 +17,11 @@ contract('Blacklist', async function (accounts) {
     let token;
     let oracle;
     let pr;
+    let administratumCrud;
+    let administratum;
+    let orders;
+    let deals;
+    let changeRequests;
 
     const owner = accounts[0];
     const creeper = accounts[1];
@@ -26,7 +36,23 @@ contract('Blacklist', async function (accounts) {
         oracle = await OracleUSD.new();
         pr = await ProfileRegistry.new();
         await blacklist.AddMaster(master, { from: owner });
-        market = await Market.new(token.address, blacklist.address, oracle.address, pr.address, 12, 3);
+        administratumCrud = await AdministratumCrud.new();
+        administratum = await Administratum.new(administratumCrud.address);
+        orders = await Orders.new();
+        deals = await Deals.new();
+        changeRequests = await ChangeRequests.new();
+
+        market = await Market.new(token.address,
+            blacklist.address,
+            oracle.address,
+            pr.address,
+            administratum.address,
+            orders.address,
+            deals.address,
+            changeRequests.address,
+            12,
+            3,
+            { gasLimit: 30000000 });
     });
 
     it('test ACL', async function () {
diff --git a/blockchain/source/test/helpers/common.js b/blockchain/source/test/helpers/common.js
index 29f4059dc..3e89b693d 100644
--- a/blockchain/source/test/helpers/common.js
+++ b/blockchain/source/test/helpers/common.js
@@ -3,17 +3,17 @@ export async function checkBenchmarks (info, benchmarks) {
     assert.equal(JSON.stringify(benchmarks), JSON.stringify(b), 'Incorrect benchmarks');
 }
 
-export async function checkOrderStatus (market, key, orderId, status) {
-    let res = await market.GetOrderParams(orderId, { from: key });
+export async function checkOrderStatus (orders, key, orderId, status) {
+    let res = await orders.GetOrderParams(orderId, { from: key });
     assert.equal(status, res[0], 'Incorrect order status');
 }
 
-export async function getDealIdFromOrder (market, key, orderId) {
-    let orderParams = await market.GetOrderParams(orderId, { from: key });
+export async function getDealIdFromOrder (orders, key, orderId) {
+    let orderParams = await orders.GetOrderParams(orderId, { from: key });
     return orderParams[1].toNumber(10);
 }
 
-export async function getDealInfoFromOrder (market, key, orderId) {
-    let dealId = await getDealIdFromOrder(market, key, orderId);
-    return market.GetDealInfo(dealId, { from: key });
+export async function getDealInfoFromOrder (deals, orders, key, orderId) {
+    let dealId = await getDealIdFromOrder(orders, key, orderId);
+    return deals.GetDealInfo(dealId, { from: key });
 }
diff --git a/blockchain/source/test/market.js b/blockchain/source/test/market.js
index 66853503e..207d36f3b 100644
--- a/blockchain/source/test/market.js
+++ b/blockchain/source/test/market.js
@@ -31,6 +31,11 @@ const Market = artifacts.require('./Market.sol');
 const OracleUSD = artifacts.require('./OracleUSD.sol');
 const Blacklist = artifacts.require('./Blacklist.sol');
 const ProfileRegistry = artifacts.require('./ProfileRegistry.sol');
+const Orders = artifacts.require('./Orders.sol');
+const Deals = artifacts.require('./Deals.sol');
+const ChangeRequests = artifacts.require('./ChangeRequests.sol');
+const AdministratumCrud = artifacts.require('./AdministratumCrud.sol');
+const Administratum = artifacts.require('./Administratum.sol');
 
 const ONE_MILLION_TOKEN = 1e6 * 1e18;
 
@@ -40,6 +45,11 @@ contract('Market', async (accounts) => {
     let oracle;
     let blacklist;
     let profileRegistry;
+    let administratumCrud;
+    let administratum;
+    let orders;
+    let deals;
+    let changeRequests;
     let supplier = accounts[1];
     let consumer = accounts[2];
     let master = accounts[3];
@@ -57,14 +67,31 @@ contract('Market', async (accounts) => {
         await oracle.setCurrentPrice(oraclePrice);
         blacklist = await Blacklist.new();
         profileRegistry = await ProfileRegistry.new();
+        administratumCrud = await AdministratumCrud.new();
+        administratum = await Administratum.new(administratumCrud.address);
+        orders = await Orders.new();
+        deals = await Deals.new();
+        changeRequests = await ChangeRequests.new();
         market = await Market.new(
             token.address,
             blacklist.address,
             oracle.address,
             profileRegistry.address,
+            administratum.address,
+            orders.address,
+            deals.address,
+            changeRequests.address,
             benchmarkQuantity,
             netflagsQuantity,
+            { gasLimit: 30000000 }
         );
+
+        await administratumCrud.transferOwnership(administratum.address);
+        await administratum.transferOwnership(market.address);
+        await orders.transferOwnership(market.address);
+        await deals.transferOwnership(market.address);
+        await changeRequests.transferOwnership(market.address);
+
         await blacklist.SetMarketAddress(market.address);
 
         await token.transfer(consumer, oraclePrice / 1e7, { from: accounts[0] });
@@ -88,7 +115,7 @@ contract('Market', async (accounts) => {
             // TODO: test above normal deal
             let oid = await Ask({ market, supplier });
 
-            let info = await market.GetOrderInfo(oid, { from: supplier });
+            let info = await orders.GetOrderInfo(oid, { from: supplier });
             assert.equal(OrderType.ASK, info[orderInfo.type]);
             assert.equal(supplier, info[orderInfo.author]);
             assert.equal('0x0000000000000000000000000000000000000000', info[orderInfo.counterparty]);
@@ -110,7 +137,7 @@ contract('Market', async (accounts) => {
         it('CreateOrder forward bid', async () => {
             let balanceBefore = await token.balanceOf(consumer);
             let oid = await Bid({ market, consumer });
-            let info = await market.GetOrderInfo(oid, { from: consumer });
+            let info = await orders.GetOrderInfo(oid, { from: consumer });
             assert.equal(OrderType.BID, info[orderInfo.type]);
             assert.equal(consumer, info[orderInfo.author]);
             assert.equal('0x0000000000000000000000000000000000000000', info[orderInfo.counterparty]);
@@ -146,7 +173,7 @@ contract('Market', async (accounts) => {
             let marketBalanceAfter = await token.balanceOf(market.address);
             let marketDifference = marketBalanceAfter.toNumber() - marketBalanceBefore.toNumber();
 
-            let info = await market.GetOrderInfo(oid, { from: consumer });
+            let info = await orders.GetOrderInfo(oid, { from: consumer });
             let frozenSum = info[orderInfo.frozenSum];
 
             assert.equal(balanceBefore.toNumber() - frozenSum, balanceAfter.toNumber());
@@ -155,7 +182,7 @@ contract('Market', async (accounts) => {
 
         it('CreateOrder spot ask', async () => {
             let oid = await Ask({ market, supplier, duration: 0 });
-            let info = await market.GetOrderInfo(oid, { from: supplier });
+            let info = await orders.GetOrderInfo(oid, { from: supplier });
             assert.equal(0, info[orderInfo.duration]);
         });
 
@@ -177,7 +204,7 @@ contract('Market', async (accounts) => {
             let balanceAfter = await token.balanceOf(supplier);
             assert.equal(balanceBefore.toNumber(), balanceAfter.toNumber());
 
-            let res = await market.GetOrderParams(oid, { from: supplier });
+            let res = await orders.GetOrderParams(oid, { from: supplier });
             assert.equal(OrderStatus.INACTIVE, res[OrderParams.status]);
             assert.equal(0, res[OrderParams.dealId]);
         });
@@ -191,7 +218,7 @@ contract('Market', async (accounts) => {
             let balanceAfter = await token.balanceOf(consumer);
             assert.equal(balanceBefore.toNumber(), balanceAfter.toNumber());
 
-            let res = await market.GetOrderParams(oid, { from: consumer });
+            let res = await orders.GetOrderParams(oid, { from: consumer });
             assert.equal(OrderStatus.INACTIVE, res[OrderParams.status]);
             assert.equal(0, res[OrderParams.dealId]);
         });
@@ -212,17 +239,18 @@ contract('Market', async (accounts) => {
         it('OpenDeal forward', async () => {
             let askId = await Ask({ market, supplier });
             let bidId = await Bid({ market, consumer });
-            let dealsAmountBefore = await market.GetDealsAmount({ from: consumer });
+            let dealsAmountBefore = await deals.GetDealsAmount({ from: consumer });
             await market.OpenDeal(askId, bidId, { from: consumer });
 
-            let askParams = await market.GetOrderParams(askId, { from: supplier });
-            let bidParams = await market.GetOrderParams(bidId, { from: consumer });
+            let askParams = await orders.GetOrderParams(askId, { from: supplier });
+            let bidParams = await orders.GetOrderParams(bidId, { from: consumer });
             assert.equal(OrderStatus.INACTIVE, askParams[OrderParams.status]);
             assert.equal(OrderStatus.INACTIVE, bidParams[OrderParams.status]);
             let dealId = bidParams[1];
-            let dealsAmountAfter = await market.GetDealsAmount({ from: consumer });
-            let dealInfo = await market.GetDealInfo(dealId, { from: consumer });
-            let dealParams = await market.GetDealParams(dealId, { from: consumer });
+            let dealsAmountAfter = await deals.GetDealsAmount({ from: consumer });
+            let dealInfo = await deals.GetDealInfo(dealId, { from: consumer });
+            let dealParams = await deals.GetDealParams(dealId, { from: consumer });
+
             assert.equal(dealsAmountBefore.toNumber() + 1, dealsAmountAfter.toNumber());
             assert.equal(DealStatus.ACCEPTED, dealParams[DealParams.status]);
             assert.ok(dealInfo[DealInfo.startTime].toNumber() === dealParams[DealParams.lastBillTs].toNumber(),
@@ -247,14 +275,14 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer, duration: 0 });
             await market.OpenDeal(askId, bidId, { from: consumer });
 
-            let askParams = await market.GetOrderParams(askId, { from: supplier });
-            let bidParams = await market.GetOrderParams(bidId, { from: consumer });
+            let askParams = await orders.GetOrderParams(askId, { from: supplier });
+            let bidParams = await orders.GetOrderParams(bidId, { from: consumer });
             assert.equal(OrderStatus.INACTIVE, askParams[OrderParams.status]);
             assert.equal(OrderStatus.INACTIVE, bidParams[OrderParams.status]);
 
             let dealId = bidParams[OrderParams.dealId];
-            let dealInfo = await market.GetDealInfo(dealId, { from: consumer });
-            let dealParams = await market.GetDealParams(dealId, { from: consumer });
+            let dealInfo = await deals.GetDealInfo(dealId, { from: consumer });
+            let dealParams = await deals.GetDealParams(dealId, { from: consumer });
             assert.equal(DealStatus.ACCEPTED, dealParams[DealParams.status]);
             assert.ok(dealInfo[DealInfo.startTime].toNumber() === dealParams[DealParams.lastBillTs].toNumber(),
                 'lastBillTs not equal to startTime');
@@ -278,43 +306,43 @@ contract('Market', async (accounts) => {
             await market.OpenDeal(askId, bidId, { from: consumer });
             await increaseTime(duration + 1);
 
-            let bidParams = await market.GetOrderParams(bidId, { from: consumer });
+            let bidParams = await orders.GetOrderParams(bidId, { from: consumer });
             let dealId = bidParams[OrderParams.dealId];
 
             await market.CloseDeal(dealId, BlackListPerson.NOBODY, { from: consumer });
-            let dealParams = await market.GetDealParams(dealId, { from: consumer });
+            let dealParams = await deals.GetDealParams(dealId, { from: consumer });
             assert.equal(DealStatus.CLOSED, dealParams[DealParams.status]);
         });
     });
 
     describe('Workers:', () => {
         it('Register worker', async () => {
-            let tx = await market.RegisterWorker(master, { from: supplier });
+            let tx = await administratum.RegisterWorker(master, { from: supplier });
             await eventInTransaction(tx, 'WorkerAnnounced');
         });
 
         it('Confirm worker', async () => {
-            let masterBefore = await market.GetMaster(supplier);
-            let tx = await market.ConfirmWorker(supplier, { from: master });
-            let masterAfter = await market.GetMaster(supplier);
+            let masterBefore = await administratum.GetMaster(supplier);
+            let tx = await administratum.ConfirmWorker(supplier, { from: master });
+            let masterAfter = await administratum.GetMaster(supplier);
             assert.ok(masterBefore !== masterAfter && masterAfter === master);
             await eventInTransaction(tx, 'WorkerConfirmed');
         });
 
         it('Remove worker from master', async () => {
-            let tx = await market.RemoveWorker(supplier, master, { from: master });
-            let masterAfter = await market.GetMaster(supplier);
+            let tx = await administratum.RemoveWorker(supplier, master, { from: master });
+            let masterAfter = await administratum.GetMaster(supplier);
             assert.equal(masterAfter, supplier);
             await eventInTransaction(tx, 'WorkerRemoved');
         });
 
         it('Register/confirm worker, remove master from worker', async () => {
-            await market.RegisterWorker(master, { from: supplier });
-            await market.ConfirmWorker(supplier, { from: master });
+            await administratum.RegisterWorker(master, { from: supplier });
+            await administratum.ConfirmWorker(supplier, { from: master });
 
-            let txRemove = await market.RemoveWorker(supplier, master, { from: supplier });
+            let txRemove = await administratum.RemoveWorker(supplier, master, { from: supplier });
             await eventInTransaction(txRemove, 'WorkerRemoved');
-            let masterAfter = await market.GetMaster(supplier);
+            let masterAfter = await administratum.GetMaster(supplier);
             assert.equal(masterAfter, supplier);
         });
     });
@@ -332,24 +360,24 @@ contract('Market', async (accounts) => {
             let askId = await Ask({ market, supplier });
             let bidId = await Bid({ market, consumer });
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let bidParams = await market.GetOrderParams(bidId, { from: consumer });
+            let bidParams = await orders.GetOrderParams(bidId, { from: consumer });
             presetFwdDealId = bidParams[OrderParams.dealId];
-            presetFwdDealParams = await market.GetDealParams(presetFwdDealId, { from: consumer });
+            presetFwdDealParams = await deals.GetDealParams(presetFwdDealId, { from: consumer });
 
-            await market.RegisterWorker(master, { from: supplierWithMaster });
-            await market.ConfirmWorker(supplierWithMaster, { from: master });
+            await administratum.RegisterWorker(master, { from: supplierWithMaster });
+            await administratum.ConfirmWorker(supplierWithMaster, { from: master });
             let maskId = await Ask({ market, supplier: supplierWithMaster });
             let mbidId = await Bid({ market, consumer });
             await market.OpenDeal(maskId, mbidId, { from: consumer });
-            let mbidParams = await market.GetOrderParams(mbidId, { from: consumer });
+            let mbidParams = await orders.GetOrderParams(mbidId, { from: consumer });
             presetMasterFwdDealId = mbidParams[OrderParams.dealId];
 
             let saskId = await Ask({ market, supplier, duration: 0 });
             let sbidId = await Bid({ market, consumer, duration: 0 });
             await market.OpenDeal(saskId, sbidId, { from: consumer });
-            let sbidParams = await market.GetOrderParams(sbidId, { from: consumer });
+            let sbidParams = await orders.GetOrderParams(sbidId, { from: consumer });
             presetSpotDealId = sbidParams[OrderParams.dealId];
-            presetSpotDealParams = await market.GetDealParams(presetSpotDealId, { from: consumer });
+            presetSpotDealParams = await deals.GetDealParams(presetSpotDealId, { from: consumer });
 
             await increaseTime(secInHour / 2);
         });
@@ -375,7 +403,7 @@ contract('Market', async (accounts) => {
             let supplierBalanceAfter = await token.balanceOf(supplier);
             let marketBalanceAfter = await token.balanceOf(market.address);
 
-            let dealParamsAfter = await market.GetDealParams(presetSpotDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetSpotDealId);
 
             let lastBillTSAfter = dealParamsAfter[DealParams.lastBillTs];
 
@@ -394,7 +422,7 @@ contract('Market', async (accounts) => {
         });
 
         it('Billing forward deal', async () => {
-            let deal = await market.GetDealParams(presetFwdDealId);
+            let deal = await deals.GetDealParams(presetFwdDealId);
             let consumerBalanceBefore = await token.balanceOf(consumer);
             let supplierBalanceBefore = await token.balanceOf(supplier);
             let marketBalanceBefore = await token.balanceOf(market.address);
@@ -407,7 +435,7 @@ contract('Market', async (accounts) => {
             let supplierBalanceAfter = await token.balanceOf(supplier);
             let marketBalanceAfter = await token.balanceOf(market.address);
 
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
 
             let lastBillTSAfter = dealParamsAfter[DealParams.lastBillTs];
 
@@ -426,7 +454,7 @@ contract('Market', async (accounts) => {
         });
 
         it('Billing forward deal, with master', async () => {
-            let deal = await market.GetDealParams(presetMasterFwdDealId);
+            let deal = await deals.GetDealParams(presetMasterFwdDealId);
             let consumerBalanceBefore = await token.balanceOf(consumer);
             let masterBalanceBefore = await token.balanceOf(master);
             let marketBalanceBefore = await token.balanceOf(market.address);
@@ -438,7 +466,7 @@ contract('Market', async (accounts) => {
             let consumerBalanceAfter = await token.balanceOf(consumer);
             let masterBalanceAfter = await token.balanceOf(master);
             let marketBalanceAfter = await token.balanceOf(market.address);
-            let dealParamsAfter = await market.GetDealParams(presetMasterFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetMasterFwdDealId);
 
             let lastBillTSAfter = dealParamsAfter[DealParams.lastBillTs];
 
@@ -455,7 +483,7 @@ contract('Market', async (accounts) => {
                 masterBalanceBefore.toNumber() + event.paidAmount.toNumber());
             assert.equal(marketBalanceAfter.toNumber() - marketBalanceBefore.toNumber(), 0);
 
-            await market.RemoveWorker(supplierWithMaster, master, { from: master });
+            await administratum.RemoveWorker(supplierWithMaster, master, { from: master });
         });
 
         it('Billing forward deal: not billed if deal.lastBillTS >= deal.endTime', async () => {
@@ -477,18 +505,18 @@ contract('Market', async (accounts) => {
             let askId = await Ask({ market, supplier, price: testPrice });
             let bidId = await Bid({ market, consumer, price: testPrice });
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let bidParams = await market.GetOrderParams(bidId, { from: consumer });
+            let bidParams = await orders.GetOrderParams(bidId, { from: consumer });
             presetFwdDealId = bidParams[OrderParams.dealId];
 
             let saskId = await Ask({ market, supplier, price: testPrice, duration: 0 });
             let sbidId = await Bid({ market, consumer, price: testPrice, duration: 0 });
             await market.OpenDeal(saskId, sbidId, { from: consumer });
-            let sbidParams = await market.GetOrderParams(sbidId, { from: consumer });
+            let sbidParams = await orders.GetOrderParams(sbidId, { from: consumer });
             presetSpotDealId = sbidParams[OrderParams.dealId];
         });
 
         it('Create change request as supplier and close', async () => {
-            let chReqsBefore = await market.GetChangeRequestsAmount();
+            let chReqsBefore = await changeRequests.GetChangeRequestsAmount();
 
             // raising price
             let newPrice = 1e6;
@@ -499,26 +527,26 @@ contract('Market', async (accounts) => {
                 { from: supplier });
 
             // price not changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(testPrice, priceAfter);
 
-            let chReqsAfter = await market.GetChangeRequestsAmount();
+            let chReqsAfter = await changeRequests.GetChangeRequestsAmount();
             let currentChReq = chReqsBefore.toNumber() + 1;
             assert.equal(currentChReq, chReqsAfter.toNumber());
 
-            let chReqInfoBefore = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoBefore = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CREATED, chReqInfoBefore[ChangeRequestInfo.status]);
 
             await market.CancelChangeRequest(currentChReq, { from: supplier });
 
-            let chReqInfoAfter = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoAfter = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CANCELED,
                 chReqInfoAfter[ChangeRequestInfo.status]);
         });
 
         it('Create change request as consumer and close', async () => {
-            let chReqsBefore = await market.GetChangeRequestsAmount();
+            let chReqsBefore = await changeRequests.GetChangeRequestsAmount();
 
             // lowering price
             let newPrice = 1e2;
@@ -529,26 +557,26 @@ contract('Market', async (accounts) => {
                 { from: consumer });
 
             // price not changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(testPrice, priceAfter);
 
-            let chReqsAfter = await market.GetChangeRequestsAmount();
+            let chReqsAfter = await changeRequests.GetChangeRequestsAmount();
             let currentChReq = chReqsBefore.toNumber() + 1;
             assert.equal(currentChReq, chReqsAfter.toNumber());
 
-            let chReqInfoBefore = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoBefore = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CREATED, chReqInfoBefore[ChangeRequestInfo.status]);
 
             await market.CancelChangeRequest(currentChReq, { from: consumer });
 
-            let chReqInfoAfter = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoAfter = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CANCELED,
                 chReqInfoAfter[ChangeRequestInfo.status]);
         });
 
         it('Create change request as consumer and reject as supplier', async () => {
-            let chReqsBefore = await market.GetChangeRequestsAmount();
+            let chReqsBefore = await changeRequests.GetChangeRequestsAmount();
 
             // lowering price
             let newPrice = 1e2;
@@ -559,27 +587,27 @@ contract('Market', async (accounts) => {
                 { from: consumer });
 
             // price not changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(testPrice, priceAfter);
 
-            let chReqsAfter = await market.GetChangeRequestsAmount();
+            let chReqsAfter = await changeRequests.GetChangeRequestsAmount();
             let currentChReq = chReqsBefore.toNumber() + 1;
             assert.equal(currentChReq, chReqsAfter.toNumber());
 
-            let chReqInfoBefore = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoBefore = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CREATED, chReqInfoBefore[ChangeRequestInfo.status]);
 
             // rejecting
             await market.CancelChangeRequest(currentChReq, { from: supplier });
 
-            let chReqInfoAfter = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoAfter = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_REJECTED,
                 chReqInfoAfter[ChangeRequestInfo.status]);
         });
 
         it('Create change request as supplier and reject as consumer', async () => {
-            let chReqsBefore = await market.GetChangeRequestsAmount();
+            let chReqsBefore = await changeRequests.GetChangeRequestsAmount();
 
             // raising price
             let newPrice = 1e6;
@@ -590,21 +618,21 @@ contract('Market', async (accounts) => {
                 { from: supplier });
 
             // price not changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(testPrice, priceAfter);
 
-            let chReqsAfter = await market.GetChangeRequestsAmount();
+            let chReqsAfter = await changeRequests.GetChangeRequestsAmount();
             let currentChReq = chReqsBefore.toNumber() + 1;
             assert.equal(currentChReq, chReqsAfter.toNumber());
 
-            let chReqInfoBefore = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoBefore = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_CREATED, chReqInfoBefore[ChangeRequestInfo.status]);
 
             // rejecting
             await market.CancelChangeRequest(currentChReq, { from: consumer });
 
-            let chReqInfoAfter = await market.GetChangeRequestInfo(currentChReq);
+            let chReqInfoAfter = await changeRequests.GetChangeRequestInfo(currentChReq);
             assert.equal(RequestStatus.REQUEST_REJECTED,
                 chReqInfoAfter[ChangeRequestInfo.status]);
         });
@@ -625,7 +653,7 @@ contract('Market', async (accounts) => {
                 testDuration,
                 { from: supplier });
 
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId, { from: consumer });
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId, { from: consumer });
 
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(newPrice, priceAfter);
@@ -646,7 +674,7 @@ contract('Market', async (accounts) => {
                 newDuration,
                 { from: supplier });
 
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let durationAfter = dealParamsAfter[DealParams.duration].toNumber();
             assert.equal(newDuration, durationAfter);
         });
@@ -667,7 +695,7 @@ contract('Market', async (accounts) => {
                 0,
                 { from: supplier });
 
-            let dealParamsAfter = await market.GetDealParams(presetSpotDealId, { from: consumer });
+            let dealParamsAfter = await deals.GetDealParams(presetSpotDealId, { from: consumer });
 
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(newPrice, priceAfter);
@@ -692,7 +720,7 @@ contract('Market', async (accounts) => {
                 { from: consumer });
 
             // price changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(newPrice, priceAfter);
         });
@@ -706,7 +734,7 @@ contract('Market', async (accounts) => {
                 { from: supplier });
 
             // price changed
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(newPrice, priceAfter);
         });
@@ -727,7 +755,7 @@ contract('Market', async (accounts) => {
                 newDuration,
                 { from: consumer });
 
-            let dealParamsAfter = await market.GetDealParams(presetFwdDealId);
+            let dealParamsAfter = await deals.GetDealParams(presetFwdDealId);
             let durationAfter = dealParamsAfter[DealParams.duration].toNumber();
             let priceAfter = dealParamsAfter[DealParams.price].toNumber();
             assert.equal(newDuration, durationAfter);
@@ -748,8 +776,8 @@ contract('Market', async (accounts) => {
             assert.equal(balConsBefore.toNumber() - balConsInterm.toNumber(), 3600, 'incorrect consumer balance');
 
             await market.OpenDeal(askId, bidId, { from: specialConsumer2 });
-            let dealId = await getDealIdFromOrder(market, specialConsumer2, askId);
-            let paramsBeforeBill = await market.GetDealParams(dealId);
+            let dealId = await getDealIdFromOrder(orders, specialConsumer2, askId);
+            let paramsBeforeBill = await deals.GetDealParams(dealId);
             await increaseTime(secInHour - 3);
 
             assert.equal(paramsBeforeBill[DealParams.status].toNumber(),
@@ -761,8 +789,8 @@ contract('Market', async (accounts) => {
             let balMarketAfter = await token.balanceOf(market.address);
             let balSuppAfter = await token.balanceOf(specialSupplier);
             let balConsAfter = await token.balanceOf(specialConsumer2);
-            let pAfterBill = await market.GetDealParams(dealId);
-            let iAfterBill = await market.GetDealInfo(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
+            let iAfterBill = await deals.GetDealInfo(dealId);
             let dealTime = pAfterBill[DealParams.endTime].toNumber() - iAfterBill[DealInfo.startTime].toNumber();
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(), dealTime, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
@@ -782,7 +810,7 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer: specialConsumer, price: 1e6, duration: 0 });
 
             await market.OpenDeal(askId, bidId, { from: specialConsumer });
-            let dealId = await getDealIdFromOrder(market, supplier, askId);
+            let dealId = await getDealIdFromOrder(orders, supplier, askId);
 
             await increaseTime(secInHour - 3);
 
@@ -792,7 +820,7 @@ contract('Market', async (accounts) => {
             let balMarketAfter = await token.balanceOf(market.address);
             let balSuppAfter = await token.balanceOf(supplier);
             let balConsAfter = await token.balanceOf(specialConsumer);
-            let pAfterBill = await market.GetDealParams(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(), 3600, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
                 pAfterBill[DealParams.totalPayout].toNumber(),
@@ -815,7 +843,7 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer, price: 1e6, duration: 0 });
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
             await increaseTime(secInHour - 3);
 
             await oracle.setCurrentPrice(priceAfter);
@@ -824,8 +852,8 @@ contract('Market', async (accounts) => {
             let balSuppAfter = await token.balanceOf(supplier);
             let balConsAfter = await token.balanceOf(consumer);
             let balMarketAfter = await token.balanceOf(market.address);
-            let pAfterBill = await market.GetDealParams(dealId);
-            let iAfterBill = await market.GetDealInfo(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
+            let iAfterBill = await deals.GetDealInfo(dealId);
             let dealTime = pAfterBill[DealParams.lastBillTs].toNumber() - iAfterBill[DealInfo.startTime].toNumber();
 
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(),
@@ -854,7 +882,7 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer, price: 1e6, duration: 0 });
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
             await increaseTime(secInHour - 3);
 
             await oracle.setCurrentPrice(priceAfter);
@@ -863,8 +891,8 @@ contract('Market', async (accounts) => {
             let balSuppAfter = await token.balanceOf(supplier);
             let balConsAfter = await token.balanceOf(consumer);
             let balMarketAfter = await token.balanceOf(market.address);
-            let pAfterBill = await market.GetDealParams(dealId);
-            let iAfterBill = await market.GetDealInfo(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
+            let iAfterBill = await deals.GetDealInfo(dealId);
             let dealTime = pAfterBill[DealParams.endTime].toNumber() - iAfterBill[DealInfo.startTime].toNumber();
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(),
                 priceAfter / priceBefore * dealTime,
@@ -891,8 +919,8 @@ contract('Market', async (accounts) => {
             assert.equal(balConsBefore.toNumber() - balConsInterm.toNumber(), 3600, 'incorrect consumer balance');
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
-            let paramsBeforeBill = await market.GetDealParams(dealId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
+            let paramsBeforeBill = await deals.GetDealParams(dealId);
             await increaseTime(secInHour + 3);
 
             assert.equal(paramsBeforeBill[DealParams.status].toNumber(), DealStatus.ACCEPTED, 'deal must be ACCEPTED');
@@ -902,7 +930,7 @@ contract('Market', async (accounts) => {
             let balMarketAfter = await token.balanceOf(market.address);
             let balSuppAfter = await token.balanceOf(supplier);
             let balConsAfter = await token.balanceOf(consumer);
-            let pAfterBill = await market.GetDealParams(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(), 3600, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
                 pAfterBill[DealParams.totalPayout].toNumber(),
@@ -926,8 +954,8 @@ contract('Market', async (accounts) => {
             assert.equal(balConsBefore.toNumber() - balConsInterm.toNumber(), 3600, 'incorrect consumer balance');
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
-            let paramsBeforeBill = await market.GetDealParams(dealId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
+            let paramsBeforeBill = await deals.GetDealParams(dealId);
             await increaseTime(secInHour / 2);
 
             assert.equal(paramsBeforeBill[DealParams.status].toNumber(), DealStatus.ACCEPTED,
@@ -938,8 +966,8 @@ contract('Market', async (accounts) => {
             let balMarketAfter = await token.balanceOf(market.address);
             let balSuppAfter = await token.balanceOf(supplier);
             let balConsAfter = await token.balanceOf(consumer);
-            let pAfterBill = await market.GetDealParams(dealId);
-            let iAfterBill = await market.GetDealInfo(dealId);
+            let pAfterBill = await deals.GetDealParams(dealId);
+            let iAfterBill = await deals.GetDealInfo(dealId);
             let dealTime = pAfterBill[DealParams.endTime].toNumber() - iAfterBill[DealInfo.startTime].toNumber();
             assert.equal(pAfterBill[DealParams.totalPayout].toNumber(), dealTime, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
@@ -957,7 +985,7 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer: consumer, price: 1e6, duration: 3600 });
             let askId = await Ask({ market, supplier: supplier, price: 1e6, duration: 3600 });
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
             await increaseTime(secInHour / 2);
             await assertRevert(market.CloseDeal(dealId, 0, { from: supplier }));
         });
@@ -965,12 +993,12 @@ contract('Market', async (accounts) => {
 
     describe('Blacklist', async () => {
         it('Prepare workers', async () => {
-            await market.RegisterWorker(blacklistMaster, { from: blacklistWorker1 });
-            await market.RegisterWorker(blacklistMaster, { from: blacklistWorker2 });
-            await market.ConfirmWorker(blacklistWorker1, { from: blacklistMaster });
-            await market.ConfirmWorker(blacklistWorker2, { from: blacklistMaster });
-            let master1 = await market.GetMaster(blacklistWorker1);
-            let master2 = await market.GetMaster(blacklistWorker2);
+            await administratum.RegisterWorker(blacklistMaster, { from: blacklistWorker1 });
+            await administratum.RegisterWorker(blacklistMaster, { from: blacklistWorker2 });
+            await administratum.ConfirmWorker(blacklistWorker1, { from: blacklistMaster });
+            await administratum.ConfirmWorker(blacklistWorker2, { from: blacklistMaster });
+            let master1 = await administratum.GetMaster(blacklistWorker1);
+            let master2 = await administratum.GetMaster(blacklistWorker2);
 
             assert.equal(master1, blacklistMaster, 'Worker not confirmed');
             assert.equal(master2, blacklistMaster, 'Worker not confirmed');
@@ -986,15 +1014,15 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer, price: 1e6, duration: 0 });
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
             await increaseTime(secInHour - 3);
             // close deal with blacklist worker blacklistWorker1
             await market.CloseDeal(dealId, 1, { from: consumer });
             let balSuppAfter = await token.balanceOf(blacklistMaster);
             let balConsAfter = await token.balanceOf(consumer);
             let balMarketAfter = await token.balanceOf(market.address);
-            let pAfterClose = await market.GetDealParams(dealId);
-            let iAfterClose = await market.GetDealInfo(dealId);
+            let pAfterClose = await deals.GetDealParams(dealId);
+            let iAfterClose = await deals.GetDealInfo(dealId);
             let dealTime = pAfterClose[DealParams.lastBillTs].toNumber() - iAfterClose[DealInfo.startTime].toNumber();
             assert.equal(pAfterClose[DealParams.totalPayout].toNumber(), dealTime, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
@@ -1029,15 +1057,15 @@ contract('Market', async (accounts) => {
             let bidId = await Bid({ market, consumer, price: 1e6, duration: 0 });
 
             await market.OpenDeal(askId, bidId, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
             await increaseTime(secInHour - 3);
             // close deal with blacklist master
             await market.CloseDeal(dealId, 2, { from: consumer });
             let balSuppAfter = await token.balanceOf(blacklistMaster);
             let balConsAfter = await token.balanceOf(consumer);
             let balMarketAfter = await token.balanceOf(market.address);
-            let pAfterClose = await market.GetDealParams(dealId);
-            let iAfterClose = await market.GetDealInfo(dealId);
+            let pAfterClose = await deals.GetDealParams(dealId);
+            let iAfterClose = await deals.GetDealInfo(dealId);
             let dealTime = pAfterClose[DealParams.lastBillTs].toNumber() - iAfterClose[DealInfo.startTime].toNumber();
             assert.equal(pAfterClose[DealParams.totalPayout].toNumber(), dealTime, 'incorrect total payout');
             assert.equal(balSuppAfter.toNumber() - balSuppBefore.toNumber(),
@@ -1072,9 +1100,9 @@ contract('Market', async (accounts) => {
             await oracle.setCurrentPrice(1e12);
             let askId = await Ask({ market, supplier, price: 1e6, duration: 3600 });
             await market.QuickBuy(askId, 1800, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
-            let dealInfo = await market.GetDealInfo(dealId, { from: consumer });
-            let dealParams = await market.GetDealParams(dealId, { from: consumer });
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
+            let dealInfo = await deals.GetDealInfo(dealId, { from: consumer });
+            let dealParams = await deals.GetDealParams(dealId, { from: consumer });
             assert.equal(DealStatus.ACCEPTED, dealParams[DealParams.status]);
             assert.ok(dealInfo[DealInfo.startTime].toNumber() === dealParams[DealParams.lastBillTs].toNumber(),
                 'lastBillTs not equal to startTime');
@@ -1093,13 +1121,13 @@ contract('Market', async (accounts) => {
         });
 
         it('QuickBuy forward with master', async () => {
-            await market.RegisterWorker(master, { from: supplier });
-            await market.ConfirmWorker(supplier, { from: master });
+            await administratum.RegisterWorker(master, { from: supplier });
+            await administratum.ConfirmWorker(supplier, { from: master });
             let askId = await Ask({ market, supplier, price: 1e6, duration: 3600 });
             await market.QuickBuy(askId, 10, { from: consumer });
-            let dealId = await getDealIdFromOrder(market, consumer, askId);
-            let dealInfo = await market.GetDealInfo(dealId, { from: consumer });
-            let dealParams = await market.GetDealParams(dealId, { from: consumer });
+            let dealId = await getDealIdFromOrder(orders, consumer, askId);
+            let dealInfo = await deals.GetDealInfo(dealId, { from: consumer });
+            let dealParams = await deals.GetDealParams(dealId, { from: consumer });
             assert.equal(DealStatus.ACCEPTED, dealParams[DealParams.status]);
             assert.ok(dealInfo[DealInfo.startTime].toNumber() === dealParams[DealParams.lastBillTs].toNumber(),
                 'lastBillTs not equal to startTime');
@@ -1131,22 +1159,22 @@ contract('Market', async (accounts) => {
             let bidNew = await Bid({ market, consumer, netFlags: [0, 0], benchmarks: newBenchmarksWZero });
             let askNew = await Ask({ market, supplier, netFlags: [0, 0], benchmarks: newBenchmarks });
 
-            let bidInfo = await market.GetOrderInfo(bidNew, { from: consumer });
+            let bidInfo = await orders.GetOrderInfo(bidNew, { from: consumer });
             checkBenchmarks(bidInfo[orderInfo.benchmarks], newBenchmarksWZero);
-            let askInfo = await market.GetOrderInfo(askNew, { from: consumer });
+            let askInfo = await orders.GetOrderInfo(askNew, { from: consumer });
             checkBenchmarks(askInfo[orderInfo.benchmarks], newBenchmarks);
 
             await market.OpenDeal(askOld, bidNew, { from: consumer });
             await market.OpenDeal(askNew, bidOld, { from: consumer });
 
-            await checkOrderStatus(market, supplier, askOld, OrderStatus.INACTIVE);
-            await checkOrderStatus(market, supplier, bidOld, OrderStatus.INACTIVE);
-            await checkOrderStatus(market, supplier, bidNew, OrderStatus.INACTIVE);
-            await checkOrderStatus(market, supplier, askNew, OrderStatus.INACTIVE);
+            await checkOrderStatus(orders, supplier, askOld, OrderStatus.INACTIVE);
+            await checkOrderStatus(orders, supplier, bidOld, OrderStatus.INACTIVE);
+            await checkOrderStatus(orders, supplier, bidNew, OrderStatus.INACTIVE);
+            await checkOrderStatus(orders, supplier, askNew, OrderStatus.INACTIVE);
 
-            let dealInfo1 = await getDealInfoFromOrder(market, consumer, bidNew);
+            let dealInfo1 = await getDealInfoFromOrder(deals, orders, consumer, bidNew);
             checkBenchmarks(dealInfo1[DealInfo.benchmarks], newBenchmarksWZero);
-            let dealInfo2 = await getDealInfoFromOrder(market, consumer, askNew);
+            let dealInfo2 = await getDealInfoFromOrder(deals, orders, consumer, askNew);
             checkBenchmarks(dealInfo2[DealInfo.benchmarks], newBenchmarks);
         });
 
@@ -1154,7 +1182,7 @@ contract('Market', async (accounts) => {
             let bid = await Bid({ market, consumer, benchmarks: newBenchmarksWZero });
             let ask = await Ask({ market, supplier, benchmarks: newBenchmarks });
             await market.OpenDeal(ask, bid, { from: consumer });
-            let dealInfo = await getDealInfoFromOrder(market, consumer, bid);
+            let dealInfo = await getDealInfoFromOrder(deals, orders, consumer, bid);
             checkBenchmarks(dealInfo[DealInfo.benchmarks], newBenchmarks);
         });
 
@@ -1262,53 +1290,53 @@ contract('Market', async (accounts) => {
             });
         });
 
-        describe('RegisterWorker', () => {
-            before(async () => {
-                await market.pause();
-            });
-
-            it('should revert', async () => {
-                await assertRevert(market.RegisterWorker(master, { from: supplier }));
-            });
-
-            after(async () => {
-                await market.unpause();
-            });
-        });
-
-        describe('ConfirmWorker', () => {
-            before(async () => {
-                await market.RegisterWorker(master, { from: accounts[0] });
-                await market.pause();
-            });
-
-            it('should revert', async () => {
-                await assertRevert(market.ConfirmWorker(supplier, { from: master }));
-            });
-
-            after(async () => {
-                await market.unpause();
-                await market.ConfirmWorker(accounts[0], { from: master });
-                await market.RemoveWorker(accounts[0], master, { from: master });
-            });
-        });
-
-        describe('RemoveWorker', () => {
-            before(async () => {
-                await market.RegisterWorker(master, { from: accounts[0] });
-                await market.ConfirmWorker(accounts[0], { from: master });
-                await market.pause();
-            });
-
-            it('should revert', async () => {
-                await assertRevert(market.RemoveWorker(accounts[0], master, { from: master }));
-            });
-
-            after(async () => {
-                await market.unpause();
-                await market.RemoveWorker(accounts[0], master, { from: master });
-            });
-        });
+        // describe('RegisterWorker', () => {
+        //     before(async () => {
+        //         await market.pause();
+        //     });
+        //
+        //     it('should revert', async () => {
+        //         await assertRevert(administratum.RegisterWorker(master, { from: supplier }));
+        //     });
+        //
+        //     after(async () => {
+        //         await market.unpause();
+        //     });
+        // });
+        //
+        // describe('ConfirmWorker', () => {
+        //     before(async () => {
+        //         await administratum.RegisterWorker(master, { from: accounts[0] });
+        //         await market.pause();
+        //     });
+        //
+        //     it('should revert', async () => {
+        //         await assertRevert(administratum.ConfirmWorker(supplier, { from: master }));
+        //     });
+        //
+        //     after(async () => {
+        //         await market.unpause();
+        //         await administratum.ConfirmWorker(accounts[0], { from: master });
+        //         await administratum.RemoveWorker(accounts[0], master, { from: master });
+        //     });
+        // });
+        //
+        // describe('RemoveWorker', () => {
+        //     before(async () => {
+        //         await administratum.RegisterWorker(master, { from: accounts[0] });
+        //         await administratum.ConfirmWorker(accounts[0], { from: master });
+        //         await market.pause();
+        //     });
+        //
+        //     it('should revert', async () => {
+        //         await assertRevert(administratum.RemoveWorker(accounts[0], master, { from: master }));
+        //     });
+        //
+        //     after(async () => {
+        //         await market.unpause();
+        //         await administratum.RemoveWorker(accounts[0], master, { from: master });
+        //     });
+        // });
     });
 
     describe('kill market', () => {

From 0a6d63c67a58d9cd735e027da1464c3a492e6ca3 Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Mon, 24 Dec 2018 19:33:57 +0300
Subject: [PATCH 02/23] base of stage one market: old api

---
 blockchain/source/contracts/Administratum.sol |  49 +++++--
 .../source/contracts/AdministratumCrud.sol    |   5 -
 blockchain/source/contracts/Market.sol        | 130 ++++++++++++++++++
 3 files changed, 169 insertions(+), 15 deletions(-)

diff --git a/blockchain/source/contracts/Administratum.sol b/blockchain/source/contracts/Administratum.sol
index bf6adb089..784f0f219 100644
--- a/blockchain/source/contracts/Administratum.sol
+++ b/blockchain/source/contracts/Administratum.sol
@@ -7,7 +7,7 @@ contract Administratum is Ownable {
 
     // events
     event WorkerAnnounced(address indexed worker, address indexed master);
-    event WorkerConfirmed(address indexed worker, address indexed master, address indexed confirmator);
+    event WorkerConfirmed(address indexed worker, address indexed master);
     event WorkerRemoved(address indexed worker, address indexed master);
     event AdminAdded(address indexed admin, address indexed master);
 
@@ -17,6 +17,9 @@ contract Administratum is Ownable {
 
     AdministratumCrud crud;
 
+    // exclusivly for old api
+    address market;
+
 
     //constructor
     constructor(address _administratumCrud){
@@ -40,7 +43,7 @@ contract Administratum is Ownable {
         crud.SetMaster(_worker, msg.sender);
         crud.SwitchToMaster(msg.sender);
         delete masterRequest[msg.sender][_worker];
-        emit WorkerConfirmed(_worker, crud.GetMaster(_worker), msg.sender);
+        emit WorkerConfirmed(_worker, crud.GetMaster(_worker));
         return true;
     }
 
@@ -51,19 +54,11 @@ contract Administratum is Ownable {
         return true;
     }
 
-    function RegisterAdmin(address _admin) public returns (bool){
-        require(GetMaster(msg.sender) == msg.sender);
-        require(msg.sender != _admin);
-        crud.SetAdmin(_admin, msg.sender);
-        return true;
-    }
-
     function Migrate (address _newAdministratum) public onlyOwner {
         crud.transferOwnership(_newAdministratum);
         suicide(msg.sender);
     }
 
-
     //INTERNAL
     // check if transaction sended by valid admin
     function IsValid(address _worker) internal view returns(bool){
@@ -78,8 +73,42 @@ contract Administratum is Ownable {
         return  crud.GetMaster(_worker);
     }
 
+    // EXTERNAL/OLD API
+
+    modifier OnlyMarket() {
+        require(msg.sender == market);
+        _;
+    }
+
+    function SetMarketAddress(address _market) public onlyOwner {
+        market = _market;
+    }
+
 
+    function ExternalRegisterWorker(address _master, address _worker) external OnlyMarket returns (bool) {
+        require(crud.GetMaster(_worker) == msg.sender);
+        require(!crud.isMaster(_worker));
+        require(crud.GetMaster(_master) == _master);
+        masterRequest[_master][_worker] = true;
+        emit WorkerAnnounced(_worker, _master);
+        return true;
+    }
+
+    function ExternalConfirmWorker(address _worker, address _master)  public OnlyMarket returns (bool) {
+        require(masterRequest[_master][_worker] == true || IsValid(_worker));
+        crud.SetMaster(_worker, _master);
+        crud.SwitchToMaster(_master);
+        delete masterRequest[_master][_worker];
+        emit WorkerConfirmed(_worker, _master);
+        return true;
+    }
 
+    function ExternalRemoveWorker(address _worker, address _master, address _sender) public  OnlyMarket returns (bool) {
+        require(crud.GetMaster(_worker) == _master && (_sender == _worker || _sender == _master));
+        crud.DeleteMaster(_worker);
+        emit WorkerRemoved(_worker, _master);
+        return true;
+    }
 
     //modifiers
 
diff --git a/blockchain/source/contracts/AdministratumCrud.sol b/blockchain/source/contracts/AdministratumCrud.sol
index 5b9ba1efb..6ca1d7b56 100644
--- a/blockchain/source/contracts/AdministratumCrud.sol
+++ b/blockchain/source/contracts/AdministratumCrud.sol
@@ -4,11 +4,6 @@ import "./Administratable.sol";
 
 contract AdministratumCrud is Administratable {
 
-    // events
-    event WorkerAnnounced(address indexed worker, address indexed master);
-    event WorkerConfirmed(address indexed worker, address indexed master);
-    event WorkerRemoved(address indexed worker, address indexed master);
-    event AdminAdded(address indexed admin, address indexed master);
 
     // storage
     mapping(address => address) masterOf;
diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/Market.sol
index fa7ccddde..0740569c0 100644
--- a/blockchain/source/contracts/Market.sol
+++ b/blockchain/source/contracts/Market.sol
@@ -663,4 +663,134 @@ contract Market is Ownable, Pausable {
         pause();
 
     }
+
+    // OLD API
+
+    function RegisterWorker(address _master) public whenNotPaused returns (bool) {
+        administratum.ExternalRegisterWorker(_master, msg.sender);
+        emit WorkerAnnounced(msg.sender, _master);
+        return true;
+    }
+
+    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {
+        administratum.ExternalConfirmWorker(_worker, msg.sender);
+        emit WorkerConfirmed(_worker, msg.sender);
+        return true;
+    }
+
+    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {
+        administratum.ExternalRemoveWorker(_worker, _master, msg.sender);
+        emit WorkerRemoved(_worker, _master);
+        return true;
+    }
+
+    function GetDealsAmount() public view returns (uint){
+        return dealsCrud.GetDealsAmount();
+    }
+
+    function GetOrdersAmount() public view returns (uint){
+        return ordersCrud.GetOrdersAmount();
+    }
+
+    function GetChangeRequestsAmount() public view returns (uint){
+        return changeRequestsCrud.GetChangeRequestsAmount();
+    }
+
+    function GetMaster(address _worker) view public returns (address master) {
+        return administratum.GetMaster(_worker);
+    }
+
+
+    function GetChangeRequestInfo(uint changeRequestID) view public
+    returns (
+        uint dealID,
+        Orders.OrderType requestType,
+        uint price,
+        uint duration,
+        ChangeRequests.RequestStatus status
+    ){
+        return (
+        changeRequestsCrud.GetChangeRequestDealID(changeRequestID),
+        changeRequestsCrud.GetChangeRequestType(changeRequestID),
+        changeRequestsCrud.GetChangeRequestPrice(changeRequestID),
+        changeRequestsCrud.GetChangeRequestDuration(changeRequestID),
+        changeRequestsCrud.GetChangeRequestStatus(changeRequestID)
+        );
+    }
+
+    function GetOrderInfo(uint orderID) view public
+    returns (
+        Orders.OrderType orderType,
+        address author,
+        address counterparty,
+        uint duration,
+        uint price,
+        bool[] netflags,
+        ProfileRegistry.IdentityLevel identityLevel,
+        address blacklist,
+        bytes32 tag,
+        uint64[] benchmarks,
+        uint frozenSum
+    ){
+        orderType = ordersCrud.GetOrderType(orderID);
+        author = ordersCrud.GetOrderAuthor(orderID);
+        counterparty = ordersCrud.GetOrderCounterparty(orderID);
+        duration =  ordersCrud.GetOrderDuration(orderID);
+        price = ordersCrud.GetOrderPrice(orderID);
+        netflags = ordersCrud.GetOrderNetflags(orderID);
+        identityLevel = ordersCrud.GetOrderIdentityLevel(orderID);
+        blacklist = ordersCrud.GetOrderBlacklist(orderID);
+        tag = ordersCrud.GetOrderTag(orderID);
+        benchmarks = ordersCrud.GetOrderBenchmarks(orderID);
+        frozenSum = ordersCrud.GetOrderFrozenSum(orderID);
+    }
+
+
+    function GetOrderParams(uint orderID) view public
+    returns (
+        Orders.OrderStatus orderStatus,
+        uint dealID
+    ){
+        orderStatus = ordersCrud.GetOrderStatus(orderID);
+        dealID = ordersCrud.GetOrderDealID(orderID);
+    }
+
+    function GetDealInfo(uint dealID) view public
+    returns (
+        uint64[] benchmarks,
+        address supplierID,
+        address consumerID,
+        address masterID,
+        uint askID,
+        uint bidID,
+        uint startTime
+    ){
+        benchmarks = dealsCrud.GetDealBenchmarks(dealID);
+        supplierID = dealsCrud.GetDealSupplierID(dealID);
+        consumerID = dealsCrud.GetDealConsumerID(dealID);
+        masterID = dealsCrud.GetDealMasterID(dealID);
+        askID = dealsCrud.GetDealAskID(dealID);
+        bidID = dealsCrud.GetDealBidID(dealID);
+        startTime = dealsCrud.GetDealStartTime(dealID);
+    }
+
+    function GetDealParams(uint dealID) view public
+    returns (
+        uint duration,
+        uint price,
+        uint endTime,
+        Deals.DealStatus status,
+        uint blockedBalance,
+        uint totalPayout,
+        uint lastBillTS
+    ){
+        duration = dealsCrud.GetDealDuration(dealID);
+        price = dealsCrud.GetDealPrice(dealID);
+        endTime = dealsCrud.GetDealEndTime(dealID);
+        status = dealsCrud.GetDealStatus(dealID);
+        blockedBalance = dealsCrud.GetDealBlockedBalance(dealID);
+        totalPayout = dealsCrud.GetDealTotalPayout(dealID);
+        lastBillTS = dealsCrud.GetDealLastBillTS(dealID);
+    }
+
 }

From bcebd190a34db5caa11c17006af82cbe9f96bf9b Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Tue, 25 Dec 2018 16:33:17 +0300
Subject: [PATCH 03/23] new migrations

---
 .../4_deploy_new_market_with_old_api.js       | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 blockchain/source/migrations/4_deploy_new_market_with_old_api.js

diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
new file mode 100644
index 000000000..494c0e0f9
--- /dev/null
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -0,0 +1,109 @@
+const AddressHashMap = artifacts.require('./AddressHashMap.sol');
+const Multisig = artifacts.require('./MultiSigWallet.sol');
+const SNM = artifacts.require('./SNM.sol');
+const Blacklist = artifacts.require('./Blacklist.sol');
+const ProfileRegistry = artifacts.require('./ProfileRegistry');
+const Oracle = artifacts.require('./OracleUSD.sol');
+
+let Orders = artifacts.require('./Orders.sol');
+let Deals = artifacts.require('./Deals.sol');
+let AdministratumCrud = artifacts.require('./AdministratumCrud.sol');
+let Administratum = artifacts.require('Administratum.sol');
+let ChangeRequests = artifacts.require('./ChangeRequests.sol');
+let Market = artifacts.require('./Market.sol');
+
+const TruffleConfig = require('../truffle');
+const ContractRegistry = require('../migration_utils/address_hashmap');
+
+const benchmarksNum = 13;
+const netflagsNum = 3;
+
+async function deploySidechain (deployer, network, accounts) {
+    let registry = new ContractRegistry(AddressHashMap, network, Multisig);
+    console.log('registry created');
+    await registry.init();
+    console.log('registry initialized');
+
+    let pr = await registry.resolve(ProfileRegistry, 'profileRegistryAddress');
+    console.log('profile registry initialized');
+
+    let bl = await registry.resolve(Blacklist, 'blacklistAddress');
+    console.log('blacklist initialized')
+
+    let snm = await registry.resolve(SNM, 'sidechainSNMAddress');
+    console.log('snm initialized');
+
+    let oracle = await registry.resolve(Oracle, 'oracleAddress');
+    console.log('oracle initialized');
+
+    // deploy crud
+    await deployer.deploy(Orders, { gasPrice:  0 });
+    let orders = await Orders.deployed();
+    console.log('orders crud deployed');
+
+    await deployer.deploy(Deals, { gasPrice: 0 });
+    console.log('deals crud deployed');
+    let deals = await Deals.deployed();
+    console.log('deployed object fetched');
+
+    await deployer.deploy(AdministratumCrud, { gasPrice: 0 });
+    console.log('administratum crud deployed');
+    let ac = await AdministratumCrud.deployed();
+    console.log('deployed object fetched');
+
+    await deployer.deploy(Administratum, ac.address, { gasPrice: 0 });
+    console.log('administratum deployed');
+    let adm = await Administratum.deployed();
+    console.log('deployed object fetched');
+
+    await deployer.deploy(ChangeRequests, { gasPrice: 0 });
+    console.log('change requests crud deployed');
+    let cr = await ChangeRequests.deployed();
+    console.log('deployed object fetched');
+
+    // deploy market
+    await deployer.deploy(Market, snm.address, bl.address, oracle.address, pr.address, adm.address, orders.address, deals.address, cr.address, benchmarksNum, netflagsNum )
+    console.log('market deployed');
+    let market = await Market.deployed();
+    console.log('deployed object fetched');
+
+    // link market to administratum
+    await adm.SetMarketAddress(market.address, { gasPrice:0 });
+    let ms = await registry.resolve(Multisig, 'migrationMultSigAddress');
+    console.log('ms resolved');
+
+    // link administratum crud to its contract
+    await ac.tranferOwnership(adm.address, { gasPrice: 0 });
+
+    //transfer crud ownerships
+    await orders.tranferOwnership(market.address, { gasPrice: 0 });
+    await deals.tranferOwnership(market.address, { gasPrice: 0 });
+    await cr.tranferOwnership(market.address, { gasPrice: 0 });
+    await orders.transferAdministratorship(market.address, { gasPrice: 0 });
+    await deals.transferAdministratorship(market.address, { gasPrice: 0 });
+    await cr.transferAdministratorship(market.address, { gasPrice: 0 });
+
+    // transfer main contracts ownership
+    await adm.transferOwnership(ms.address, { gasPrice: 0 });
+    await market.transferOwnership(ms.address, { gasPrice: 0 });
+    console.log('ownerships transferred');
+
+
+    console.log('and submitted all theese addresses to registry');
+
+    await registry.write('migrationMultiSigAddress', ms.address);
+    await registry.write('administratumAddress', adm.address);
+    await registry.write('ordersCrudAddress', orders.address);
+    await registry.write('dealsCrudAddress', deals.address);
+    await registry.write('administratumCrudAddress', ac.address);
+    await registry.write('administratumAddress', adm.address);
+    await registry.write('marketAddress', market.address);
+}
+
+module.exports = function (deployer, network, accounts) {
+    deployer.then(async () => { // eslint-disable-line promise/catch-or-return
+        if (TruffleConfig.isSidechain(network)) {
+            await deploySidechain(deployer, network, accounts);
+        }
+    });
+};

From f871b497522e34e6ff0a5fe80a1ce26806f939e2 Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Tue, 25 Dec 2018 20:00:02 +0300
Subject: [PATCH 04/23] rename due migrations contract

---
 blockchain/source/contracts/{Market.sol => MarketV2.sol}        | 2 +-
 .../source/migrations/4_deploy_new_market_with_old_api.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename blockchain/source/contracts/{Market.sol => MarketV2.sol} (99%)

diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/MarketV2.sol
similarity index 99%
rename from blockchain/source/contracts/Market.sol
rename to blockchain/source/contracts/MarketV2.sol
index 0740569c0..718eae828 100644
--- a/blockchain/source/contracts/Market.sol
+++ b/blockchain/source/contracts/MarketV2.sol
@@ -13,7 +13,7 @@ import "./Deals.sol";
 import "./ChangeRequests.sol";
 
 
-contract Market is Ownable, Pausable {
+contract MarketV2 is Ownable, Pausable {
 
     using SafeMath for uint256;
 
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index 494c0e0f9..c19fbd039 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -10,7 +10,7 @@ let Deals = artifacts.require('./Deals.sol');
 let AdministratumCrud = artifacts.require('./AdministratumCrud.sol');
 let Administratum = artifacts.require('Administratum.sol');
 let ChangeRequests = artifacts.require('./ChangeRequests.sol');
-let Market = artifacts.require('./Market.sol');
+let Market = artifacts.require('./MarketV2.sol');
 
 const TruffleConfig = require('../truffle');
 const ContractRegistry = require('../migration_utils/address_hashmap');

From 3bb90c1553238ac3f0a3c65d370d280504f11453 Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Tue, 25 Dec 2018 20:00:36 +0300
Subject: [PATCH 05/23] update test env

---
 blockchain/source/test/blacklist.js |  5 +-
 blockchain/source/test/market.js    | 99 ++++++++++++++---------------
 blockchain/source/truffle.js        |  2 +
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/blockchain/source/test/blacklist.js b/blockchain/source/test/blacklist.js
index 52eb37001..7f61bde23 100644
--- a/blockchain/source/test/blacklist.js
+++ b/blockchain/source/test/blacklist.js
@@ -1,6 +1,6 @@
 import assertRevert from './helpers/assertRevert';
 
-const Market = artifacts.require('./Market.sol');
+const Market = artifacts.require('./MarketV2.sol');
 const Blacklist = artifacts.require('./Blacklist.sol');
 const SNM = artifacts.require('./SNM.sol');
 const OracleUSD = artifacts.require('./OracleUSD.sol');
@@ -51,8 +51,7 @@ contract('Blacklist', async function (accounts) {
             deals.address,
             changeRequests.address,
             12,
-            3,
-            { gasLimit: 30000000 });
+            3);
     });
 
     it('test ACL', async function () {
diff --git a/blockchain/source/test/market.js b/blockchain/source/test/market.js
index 207d36f3b..32cb1f612 100644
--- a/blockchain/source/test/market.js
+++ b/blockchain/source/test/market.js
@@ -27,7 +27,7 @@ import { Bid } from './helpers/bid';
 import { checkBenchmarks, checkOrderStatus, getDealIdFromOrder, getDealInfoFromOrder } from './helpers/common';
 
 const SNM = artifacts.require('./SNM.sol');
-const Market = artifacts.require('./Market.sol');
+const Market = artifacts.require('./MarketV2.sol');
 const OracleUSD = artifacts.require('./OracleUSD.sol');
 const Blacklist = artifacts.require('./Blacklist.sol');
 const ProfileRegistry = artifacts.require('./ProfileRegistry.sol');
@@ -83,11 +83,10 @@ contract('Market', async (accounts) => {
             changeRequests.address,
             benchmarkQuantity,
             netflagsQuantity,
-            { gasLimit: 30000000 }
         );
 
         await administratumCrud.transferOwnership(administratum.address);
-        await administratum.transferOwnership(market.address);
+        await administratum.SetMarketAddress(market.address);
         await orders.transferOwnership(market.address);
         await deals.transferOwnership(market.address);
         await changeRequests.transferOwnership(market.address);
@@ -1290,53 +1289,53 @@ contract('Market', async (accounts) => {
             });
         });
 
-        // describe('RegisterWorker', () => {
-        //     before(async () => {
-        //         await market.pause();
-        //     });
-        //
-        //     it('should revert', async () => {
-        //         await assertRevert(administratum.RegisterWorker(master, { from: supplier }));
-        //     });
-        //
-        //     after(async () => {
-        //         await market.unpause();
-        //     });
-        // });
-        //
-        // describe('ConfirmWorker', () => {
-        //     before(async () => {
-        //         await administratum.RegisterWorker(master, { from: accounts[0] });
-        //         await market.pause();
-        //     });
-        //
-        //     it('should revert', async () => {
-        //         await assertRevert(administratum.ConfirmWorker(supplier, { from: master }));
-        //     });
-        //
-        //     after(async () => {
-        //         await market.unpause();
-        //         await administratum.ConfirmWorker(accounts[0], { from: master });
-        //         await administratum.RemoveWorker(accounts[0], master, { from: master });
-        //     });
-        // });
-        //
-        // describe('RemoveWorker', () => {
-        //     before(async () => {
-        //         await administratum.RegisterWorker(master, { from: accounts[0] });
-        //         await administratum.ConfirmWorker(accounts[0], { from: master });
-        //         await market.pause();
-        //     });
-        //
-        //     it('should revert', async () => {
-        //         await assertRevert(administratum.RemoveWorker(accounts[0], master, { from: master }));
-        //     });
-        //
-        //     after(async () => {
-        //         await market.unpause();
-        //         await administratum.RemoveWorker(accounts[0], master, { from: master });
-        //     });
-        // });
+        describe('RegisterWorker', () => {
+            before(async () => {
+                await market.pause();
+            });
+
+            it('should revert', async () => {
+                await assertRevert(market.RegisterWorker(master, { from: supplier }));
+            });
+
+            after(async () => {
+                await market.unpause();
+            });
+        });
+
+        describe('ConfirmWorker', () => {
+            before(async () => {
+                await market.RegisterWorker(master, { from: accounts[0] });
+                await market.pause();
+            });
+
+            it('should revert', async () => {
+                await assertRevert(market.ConfirmWorker(supplier, { from: master }));
+            });
+
+            after(async () => {
+                await market.unpause();
+                await market.ConfirmWorker(accounts[0], { from: master });
+                await market.RemoveWorker(accounts[0], master, { from: master });
+            });
+        });
+
+        describe('RemoveWorker', () => {
+            before(async () => {
+                await market.RegisterWorker(master, { from: accounts[0] });
+                await market.ConfirmWorker(accounts[0], { from: master });
+                await market.pause();
+            });
+
+            it('should revert', async () => {
+                await assertRevert(market.RemoveWorker(accounts[0], master, { from: master }));
+            });
+
+            after(async () => {
+                await market.unpause();
+                await market.RemoveWorker(accounts[0], master, { from: master });
+            });
+        });
     });
 
     describe('kill market', () => {
diff --git a/blockchain/source/truffle.js b/blockchain/source/truffle.js
index c06c12564..c8ef6b50a 100644
--- a/blockchain/source/truffle.js
+++ b/blockchain/source/truffle.js
@@ -48,6 +48,8 @@ let urls = {
 let networks = {
     development: {
         network_id: '*',
+        gas: 0xfffffffffff,
+        gasPrice: 1,
     },
     dev_side: {
         network_id: '8525',

From 1c26e9a8a15e53bfadddd3d8890574782ea8af79 Mon Sep 17 00:00:00 2001
From: quasisamurai <quazisamurai@gmail.com>
Date: Tue, 25 Dec 2018 20:01:07 +0300
Subject: [PATCH 06/23] adm: fixed bug

---
 blockchain/source/contracts/Administratum.sol             | 8 ++++----
 .../source/migrations/4_deploy_new_market_with_old_api.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blockchain/source/contracts/Administratum.sol b/blockchain/source/contracts/Administratum.sol
index 784f0f219..d435f031a 100644
--- a/blockchain/source/contracts/Administratum.sol
+++ b/blockchain/source/contracts/Administratum.sol
@@ -86,7 +86,7 @@ contract Administratum is Ownable {
 
 
     function ExternalRegisterWorker(address _master, address _worker) external OnlyMarket returns (bool) {
-        require(crud.GetMaster(_worker) == msg.sender);
+        require(crud.GetMaster(_worker) == _worker);
         require(!crud.isMaster(_worker));
         require(crud.GetMaster(_master) == _master);
         masterRequest[_master][_worker] = true;
@@ -94,8 +94,8 @@ contract Administratum is Ownable {
         return true;
     }
 
-    function ExternalConfirmWorker(address _worker, address _master)  public OnlyMarket returns (bool) {
-        require(masterRequest[_master][_worker] == true || IsValid(_worker));
+    function ExternalConfirmWorker(address _worker, address _master)  external OnlyMarket returns (bool) {
+        require(masterRequest[_master][_worker] == true);
         crud.SetMaster(_worker, _master);
         crud.SwitchToMaster(_master);
         delete masterRequest[_master][_worker];
@@ -103,7 +103,7 @@ contract Administratum is Ownable {
         return true;
     }
 
-    function ExternalRemoveWorker(address _worker, address _master, address _sender) public  OnlyMarket returns (bool) {
+    function ExternalRemoveWorker(address _worker, address _master, address _sender) external  OnlyMarket returns (bool) {
         require(crud.GetMaster(_worker) == _master && (_sender == _worker || _sender == _master));
         crud.DeleteMaster(_worker);
         emit WorkerRemoved(_worker, _master);
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index c19fbd039..9e68e943c 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -8,7 +8,7 @@ const Oracle = artifacts.require('./OracleUSD.sol');
 let Orders = artifacts.require('./Orders.sol');
 let Deals = artifacts.require('./Deals.sol');
 let AdministratumCrud = artifacts.require('./AdministratumCrud.sol');
-let Administratum = artifacts.require('Administratum.sol');
+let Administratum = artifacts.require('./Administratum.sol');
 let ChangeRequests = artifacts.require('./ChangeRequests.sol');
 let Market = artifacts.require('./MarketV2.sol');
 

From 38ac72f5ea83dedd5a8691ac9b7b9a905e47a280 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Tue, 25 Dec 2018 20:07:13 +0300
Subject: [PATCH 07/23] fix: restore old market

---
 blockchain/source/contracts/Market.sol | 790 +++++++++++++++++++++++++
 1 file changed, 790 insertions(+)
 create mode 100644 blockchain/source/contracts/Market.sol

diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/Market.sol
new file mode 100644
index 000000000..35decf30a
--- /dev/null
+++ b/blockchain/source/contracts/Market.sol
@@ -0,0 +1,790 @@
+pragma solidity ^0.4.23;
+
+
+import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "zeppelin-solidity/contracts/lifecycle/Pausable.sol";
+import "./SNM.sol";
+import "./Blacklist.sol";
+import "./OracleUSD.sol";
+import "./ProfileRegistry.sol";
+
+
+contract Market is Ownable, Pausable {
+
+    using SafeMath for uint256;
+
+    // DECLARATIONS
+
+    enum DealStatus{
+        STATUS_UNKNOWN,
+        STATUS_ACCEPTED,
+        STATUS_CLOSED
+    }
+
+    enum OrderType {
+        ORDER_UNKNOWN,
+        ORDER_BID,
+        ORDER_ASK
+    }
+
+    enum OrderStatus {
+        UNKNOWN,
+        ORDER_INACTIVE,
+        ORDER_ACTIVE
+    }
+
+    enum RequestStatus {
+        REQUEST_UNKNOWN,
+        REQUEST_CREATED,
+        REQUEST_CANCELED,
+        REQUEST_REJECTED,
+        REQUEST_ACCEPTED
+    }
+
+    enum BlacklistPerson {
+        BLACKLIST_NOBODY,
+        BLACKLIST_WORKER,
+        BLACKLIST_MASTER
+    }
+
+    struct Deal {
+        uint64[] benchmarks;
+        address supplierID;
+        address consumerID;
+        address masterID;
+        uint askID;
+        uint bidID;
+        uint duration;
+        uint price; //usd * 10^-18
+        uint startTime;
+        uint endTime;
+        DealStatus status;
+        uint blockedBalance;
+        uint totalPayout;
+        uint lastBillTS;
+    }
+
+    struct Order {
+        OrderType orderType;
+        OrderStatus orderStatus;
+        address author;
+        address counterparty;
+        uint duration;
+        uint256 price;
+        bool[] netflags;
+        ProfileRegistry.IdentityLevel identityLevel;
+        address blacklist;
+        bytes32 tag;
+        uint64[] benchmarks;
+        uint frozenSum;
+        uint dealID;
+    }
+
+    struct ChangeRequest {
+        uint dealID;
+        OrderType requestType;
+        uint price;
+        uint duration;
+        RequestStatus status;
+    }
+
+    // EVENTS
+
+    event OrderPlaced(uint indexed orderID);
+    event OrderUpdated(uint indexed orderID);
+
+    event DealOpened(uint indexed dealID);
+    event DealUpdated(uint indexed dealID);
+
+    event Billed(uint indexed dealID, uint indexed paidAmount);
+
+    event DealChangeRequestSet(uint indexed changeRequestID);
+    event DealChangeRequestUpdated(uint indexed changeRequestID);
+
+    event WorkerAnnounced(address indexed worker, address indexed master);
+    event WorkerConfirmed(address indexed worker, address indexed master);
+    event WorkerRemoved(address indexed worker, address indexed master);
+
+    event NumBenchmarksUpdated(uint indexed newNum);
+    event NumNetflagsUpdated(uint indexed newNum);
+
+    // VARS
+
+    uint constant MAX_BENCHMARKS_VALUE = 2 ** 63;
+
+    SNM token;
+
+    Blacklist bl;
+
+    OracleUSD oracle;
+
+    ProfileRegistry pr;
+
+    uint ordersAmount = 0;
+
+    uint dealAmount = 0;
+
+    uint requestsAmount = 0;
+
+    // current length of benchmarks
+    uint benchmarksQuantity;
+
+    // current length of netflags
+    uint netflagsQuantity;
+
+    mapping(uint => Order) public orders;
+
+    mapping(uint => Deal) public deals;
+
+    mapping(address => uint[]) dealsID;
+
+    mapping(uint => ChangeRequest) requests;
+
+    mapping(uint => uint[2]) actualRequests;
+
+    mapping(address => address) masterOf;
+
+    mapping(address => bool) isMaster;
+
+    mapping(address => mapping(address => bool)) masterRequest;
+
+    // INIT
+
+    constructor(address _token, address _blacklist, address _oracle, address _profileRegistry, uint _benchmarksQuantity, uint _netflagsQuantity) public {
+        token = SNM(_token);
+        bl = Blacklist(_blacklist);
+        oracle = OracleUSD(_oracle);
+        pr = ProfileRegistry(_profileRegistry);
+        benchmarksQuantity = _benchmarksQuantity;
+        netflagsQuantity = _netflagsQuantity;
+    }
+
+    // EXTERNAL
+
+    // Order functions
+
+    function PlaceOrder(
+        OrderType _orderType,
+        address _id_counterparty,
+        uint _duration,
+        uint _price,
+        bool[] _netflags,
+        ProfileRegistry.IdentityLevel _identityLevel,
+        address _blacklist,
+        bytes32 _tag,
+        uint64[] _benchmarks
+    ) whenNotPaused public returns (uint){
+
+        require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);
+        require(_netflags.length <= netflagsQuantity);
+        require(_benchmarks.length <= benchmarksQuantity);
+
+        for (uint i = 0; i < _benchmarks.length; i++) {
+            require(_benchmarks[i] < MAX_BENCHMARKS_VALUE);
+        }
+
+        uint lockedSum = 0;
+
+        if (_orderType == OrderType.ORDER_BID) {
+            if (_duration == 0) {
+                lockedSum = CalculatePayment(_price, 1 hours);
+            } else if (_duration < 1 days) {
+                lockedSum = CalculatePayment(_price, _duration);
+            } else {
+                lockedSum = CalculatePayment(_price, 1 days);
+            }
+            // this line contains err.
+            require(token.transferFrom(msg.sender, this, lockedSum));
+        }
+
+        ordersAmount = ordersAmount.add(1);
+        uint256 orderId = ordersAmount;
+
+        orders[orderId] = Order(
+            _orderType,
+            OrderStatus.ORDER_ACTIVE,
+            msg.sender,
+            _id_counterparty,
+            _duration,
+            _price,
+            _netflags,
+            _identityLevel,
+            _blacklist,
+            _tag,
+            _benchmarks,
+            lockedSum,
+            0
+        );
+
+        emit OrderPlaced(orderId);
+        return orderId;
+    }
+
+    function CancelOrder(uint orderID) public returns (bool){
+        require(orderID <= ordersAmount);
+        require(orders[orderID].orderStatus == OrderStatus.ORDER_ACTIVE);
+        require(orders[orderID].author == msg.sender);
+
+        require(token.transfer(msg.sender, orders[orderID].frozenSum));
+        orders[orderID].orderStatus = OrderStatus.ORDER_INACTIVE;
+
+        emit OrderUpdated(orderID);
+        return true;
+    }
+
+    function QuickBuy(uint askID, uint buyoutDuration) public whenNotPaused {
+        Order memory ask = orders[askID];
+        require(ask.orderType == OrderType.ORDER_ASK);
+        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE);
+
+        require(ask.duration >= buyoutDuration);
+        require(pr.GetProfileLevel(msg.sender) >= ask.identityLevel);
+        require(bl.Check(msg.sender, GetMaster(ask.author)) == false && bl.Check(ask.author, msg.sender) == false);
+        require(bl.Check(ask.blacklist, msg.sender) == false);
+
+        PlaceOrder(
+            OrderType.ORDER_BID,
+            GetMaster(ask.author),
+            buyoutDuration,
+            ask.price,
+            ask.netflags,
+            ProfileRegistry.IdentityLevel.ANONYMOUS,
+            address(0),
+            bytes32(0),
+            ask.benchmarks);
+
+        OpenDeal(askID, GetOrdersAmount());
+    }
+
+    // Deal functions
+
+    function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {
+        Order memory ask = orders[_askID];
+        Order memory bid = orders[_bidID];
+
+        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);
+        require((ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author)) && (bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author)));
+        require(ask.orderType == OrderType.ORDER_ASK);
+        require(bid.orderType == OrderType.ORDER_BID);
+        require(
+            bl.Check(bid.blacklist, GetMaster(ask.author)) == false
+            && bl.Check(bid.blacklist, ask.author) == false
+            && bl.Check(bid.author, GetMaster(ask.author)) == false
+            && bl.Check(bid.author, ask.author) == false
+            && bl.Check(ask.blacklist, bid.author) == false
+            && bl.Check(GetMaster(ask.author), bid.author) == false
+            && bl.Check(ask.author, bid.author) == false);
+        require(ask.price <= bid.price);
+        require(ask.duration >= bid.duration);
+        // profile level check
+        require(pr.GetProfileLevel(bid.author) >= ask.identityLevel);
+        require(pr.GetProfileLevel(ask.author) >= bid.identityLevel);
+
+        if (ask.netflags.length < netflagsQuantity) {
+            ask.netflags = ResizeNetflags(ask.netflags);
+        }
+
+        if (bid.netflags.length < netflagsQuantity) {
+            bid.netflags = ResizeNetflags(ask.netflags);
+        }
+
+        for (uint i = 0; i < ask.netflags.length; i++) {
+            // implementation: when bid contains requirement, ask necessary needs to have this
+            // if ask have this one - pass
+            require(!bid.netflags[i] || ask.netflags[i]);
+        }
+
+        if (ask.benchmarks.length < benchmarksQuantity) {
+            ask.benchmarks = ResizeBenchmarks(ask.benchmarks);
+        }
+
+        if (bid.benchmarks.length < benchmarksQuantity) {
+            bid.benchmarks = ResizeBenchmarks(bid.benchmarks);
+        }
+
+        for (i = 0; i < ask.benchmarks.length; i++) {
+            require(ask.benchmarks[i] >= bid.benchmarks[i]);
+        }
+
+        dealAmount = dealAmount.add(1);
+        address master = GetMaster(ask.author);
+        orders[_askID].orderStatus = OrderStatus.ORDER_INACTIVE;
+        orders[_bidID].orderStatus = OrderStatus.ORDER_INACTIVE;
+        orders[_askID].dealID = dealAmount;
+        orders[_bidID].dealID = dealAmount;
+
+        emit OrderUpdated(_askID);
+        emit OrderUpdated(_bidID);
+
+        uint startTime = block.timestamp;
+        uint endTime = 0;
+        // `0` - for spot deal
+
+        // if deal is normal
+        if (ask.duration != 0) {
+            endTime = startTime.add(bid.duration);
+        }
+        uint blockedBalance = bid.frozenSum;
+        deals[dealAmount] = Deal(ask.benchmarks, ask.author, bid.author, master, _askID, _bidID, bid.duration, ask.price, startTime, endTime, DealStatus.STATUS_ACCEPTED, blockedBalance, 0, block.timestamp);
+        emit DealOpened(dealAmount);
+    }
+
+    function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){
+        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));
+        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);
+
+        if (block.timestamp <= deals[dealID].startTime.add(deals[dealID].duration)) {
+            // after endTime
+            require(deals[dealID].consumerID == msg.sender);
+        }
+        AddToBlacklist(dealID, blacklisted);
+        InternalBill(dealID);
+        InternalCloseDeal(dealID);
+        RefundRemainingFunds(dealID);
+        return true;
+    }
+
+    function Bill(uint dealID) public returns (bool){
+        InternalBill(dealID);
+        ReserveNextPeriodFunds(dealID);
+        return true;
+    }
+
+    function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {
+        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID || msg.sender == deals[dealID].supplierID);
+        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);
+
+        if (IsSpot(dealID)) {
+            require(newDuration == 0);
+        }
+
+        requestsAmount = requestsAmount.add(1);
+
+        OrderType requestType;
+
+        if (msg.sender == deals[dealID].consumerID) {
+            requestType = OrderType.ORDER_BID;
+        } else {
+            requestType = OrderType.ORDER_ASK;
+        }
+
+        requests[requestsAmount] = ChangeRequest(dealID, requestType, newPrice, newDuration, RequestStatus.REQUEST_CREATED);
+        emit DealChangeRequestSet(requestsAmount);
+
+        if (requestType == OrderType.ORDER_BID) {
+            emit DealChangeRequestUpdated(actualRequests[dealID][1]);
+            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;
+            actualRequests[dealID][1] = requestsAmount;
+            ChangeRequest memory matchingRequest = requests[actualRequests[dealID][0]];
+
+            if (newDuration == deals[dealID].duration && newPrice > deals[dealID].price) {
+                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+                Bill(dealID);
+                deals[dealID].price = newPrice;
+                actualRequests[dealID][1] = 0;
+                emit DealChangeRequestUpdated(requestsAmount);
+            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration >= newDuration && matchingRequest.price <= newPrice) {
+                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+                requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_ACCEPTED;
+                emit DealChangeRequestUpdated(actualRequests[dealID][0]);
+                actualRequests[dealID][0] = 0;
+                actualRequests[dealID][1] = 0;
+                Bill(dealID);
+                deals[dealID].price = matchingRequest.price;
+                deals[dealID].duration = newDuration;
+                emit DealChangeRequestUpdated(requestsAmount);
+            } else {
+                return requestsAmount;
+            }
+
+            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;
+            emit DealChangeRequestUpdated(actualRequests[dealID][1]);
+            actualRequests[dealID][1] = requestsAmount;
+        }
+
+        if (requestType == OrderType.ORDER_ASK) {
+            emit DealChangeRequestUpdated(actualRequests[dealID][0]);
+            requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_CANCELED;
+            actualRequests[dealID][0] = requestsAmount;
+            matchingRequest = requests[actualRequests[dealID][1]];
+
+            if (newDuration == deals[dealID].duration && newPrice < deals[dealID].price) {
+                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+                Bill(dealID);
+                deals[dealID].price = newPrice;
+                actualRequests[dealID][0] = 0;
+                emit DealChangeRequestUpdated(requestsAmount);
+            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration <= newDuration && matchingRequest.price >= newPrice) {
+                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;
+                emit DealChangeRequestUpdated(actualRequests[dealID][1]);
+                actualRequests[dealID][0] = 0;
+                actualRequests[dealID][1] = 0;
+                Bill(dealID);
+                deals[dealID].price = newPrice;
+                deals[dealID].duration = matchingRequest.duration;
+                emit DealChangeRequestUpdated(requestsAmount);
+            } else {
+                return requestsAmount;
+            }
+        }
+
+        deals[dealID].endTime = deals[dealID].startTime.add(deals[dealID].duration);
+        return requestsAmount;
+    }
+
+    function CancelChangeRequest(uint changeRequestID) public returns (bool) {
+        ChangeRequest memory request = requests[changeRequestID];
+        require(msg.sender == deals[request.dealID].supplierID || msg.sender == deals[request.dealID].masterID || msg.sender == deals[request.dealID].consumerID);
+        require(request.status != RequestStatus.REQUEST_ACCEPTED);
+
+        if (request.requestType == OrderType.ORDER_ASK) {
+            if (msg.sender == deals[request.dealID].consumerID) {
+                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;
+            } else {
+                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;
+            }
+            actualRequests[request.dealID][0] = 0;
+            emit DealChangeRequestUpdated(changeRequestID);
+        }
+
+        if (request.requestType == OrderType.ORDER_BID) {
+            if (msg.sender == deals[request.dealID].consumerID) {
+                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;
+            } else {
+                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;
+            }
+            actualRequests[request.dealID][1] = 0;
+            emit DealChangeRequestUpdated(changeRequestID);
+        }
+        return true;
+    }
+
+    // Master-worker functions
+
+    function RegisterWorker(address _master) public whenNotPaused returns (bool) {
+        require(GetMaster(msg.sender) == msg.sender);
+        require(isMaster[msg.sender] == false);
+        require(GetMaster(_master) == _master);
+        masterRequest[_master][msg.sender] = true;
+        emit WorkerAnnounced(msg.sender, _master);
+        return true;
+    }
+
+    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {
+        require(masterRequest[msg.sender][_worker] == true);
+        masterOf[_worker] = msg.sender;
+        isMaster[msg.sender] = true;
+        delete masterRequest[msg.sender][_worker];
+        emit WorkerConfirmed(_worker, msg.sender);
+        return true;
+    }
+
+    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {
+        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));
+        delete masterOf[_worker];
+        emit WorkerRemoved(_worker, _master);
+        return true;
+    }
+
+    // GETTERS
+
+    function GetOrderInfo(uint orderID) view public
+    returns (
+        OrderType orderType,
+        address author,
+        address counterparty,
+        uint duration,
+        uint price,
+        bool[] netflags,
+        ProfileRegistry.IdentityLevel identityLevel,
+        address blacklist,
+        bytes32 tag,
+        uint64[] benchmarks,
+        uint frozenSum
+    ){
+        Order memory order = orders[orderID];
+        return (
+        order.orderType,
+        order.author,
+        order.counterparty,
+        order.duration,
+        order.price,
+        order.netflags,
+        order.identityLevel,
+        order.blacklist,
+        order.tag,
+        order.benchmarks,
+        order.frozenSum
+        );
+    }
+
+
+    function GetOrderParams(uint orderID) view public
+    returns (
+        OrderStatus orderStatus,
+        uint dealID
+    ){
+        Order memory order = orders[orderID];
+        return (
+        order.orderStatus,
+        order.dealID
+        );
+    }
+
+    function GetDealInfo(uint dealID) view public
+    returns (
+        uint64[] benchmarks,
+        address supplierID,
+        address consumerID,
+        address masterID,
+        uint askID,
+        uint bidID,
+        uint startTime
+    ){
+        return (
+        deals[dealID].benchmarks,
+        deals[dealID].supplierID,
+        deals[dealID].consumerID,
+        deals[dealID].masterID,
+        deals[dealID].askID,
+        deals[dealID].bidID,
+        deals[dealID].startTime
+
+        );
+    }
+
+    function GetDealParams(uint dealID) view public
+    returns (
+        uint duration,
+        uint price,
+        uint endTime,
+        DealStatus status,
+        uint blockedBalance,
+        uint totalPayout,
+        uint lastBillTS
+    ){
+        return (
+        deals[dealID].duration,
+        deals[dealID].price,
+        deals[dealID].endTime,
+        deals[dealID].status,
+        deals[dealID].blockedBalance,
+        deals[dealID].totalPayout,
+        deals[dealID].lastBillTS
+        );
+    }
+
+    function GetMaster(address _worker) view public returns (address master) {
+        if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {
+            master = _worker;
+        } else {
+            master = masterOf[_worker];
+        }
+    }
+
+    function GetChangeRequestInfo(uint changeRequestID) view public
+    returns (
+        uint dealID,
+        OrderType requestType,
+        uint price,
+        uint duration,
+        RequestStatus status
+    ){
+        return (
+        requests[changeRequestID].dealID,
+        requests[changeRequestID].requestType,
+        requests[changeRequestID].price,
+        requests[changeRequestID].duration,
+        requests[changeRequestID].status
+        );
+    }
+
+    function GetDealsAmount() public view returns (uint){
+        return dealAmount;
+    }
+
+    function GetOrdersAmount() public view returns (uint){
+        return ordersAmount;
+    }
+
+    function GetChangeRequestsAmount() public view returns (uint){
+        return requestsAmount;
+    }
+
+    function GetBenchmarksQuantity() public view returns (uint) {
+        return benchmarksQuantity;
+    }
+
+    function GetNetflagsQuantity() public view returns (uint) {
+        return netflagsQuantity;
+    }
+
+
+    // INTERNAL
+
+    function InternalBill(uint dealID) internal returns (bool){
+        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);
+        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);
+        Deal memory deal = deals[dealID];
+
+        uint paidAmount;
+
+        if (!IsSpot(dealID) && deal.lastBillTS >= deal.endTime) {
+            // means we already billed deal after endTime
+            return true;
+        } else if (!IsSpot(dealID) && block.timestamp > deal.endTime && deal.lastBillTS < deal.endTime) {
+            paidAmount = CalculatePayment(deal.price, deal.endTime.sub(deal.lastBillTS));
+        } else {
+            paidAmount = CalculatePayment(deal.price, block.timestamp.sub(deal.lastBillTS));
+        }
+
+        if (paidAmount > deal.blockedBalance) {
+            if (token.balanceOf(deal.consumerID) >= paidAmount.sub(deal.blockedBalance)) {
+                require(token.transferFrom(deal.consumerID, this, paidAmount.sub(deal.blockedBalance)));
+                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(paidAmount.sub(deal.blockedBalance));
+            } else {
+                emit Billed(dealID, deals[dealID].blockedBalance);
+                InternalCloseDeal(dealID);
+                require(token.transfer(deal.masterID, deal.blockedBalance));
+                deals[dealID].lastBillTS = block.timestamp;
+                deals[dealID].totalPayout = deals[dealID].totalPayout.add(deal.blockedBalance);
+                deals[dealID].blockedBalance = 0;
+                return true;
+            }
+        }
+        require(token.transfer(deal.masterID, paidAmount));
+        deals[dealID].blockedBalance = deals[dealID].blockedBalance.sub(paidAmount);
+        deals[dealID].totalPayout = deals[dealID].totalPayout.add(paidAmount);
+        deals[dealID].lastBillTS = block.timestamp;
+        emit Billed(dealID, paidAmount);
+        return true;
+    }
+
+    function ReserveNextPeriodFunds(uint dealID) internal returns (bool) {
+        uint nextPeriod;
+        Deal memory deal = deals[dealID];
+
+        if (IsSpot(dealID)) {
+            if (deal.status == DealStatus.STATUS_CLOSED) {
+                return true;
+            }
+            nextPeriod = 1 hours;
+        } else {
+            if (block.timestamp > deal.endTime) {
+                // we don't reserve funds for next period
+                return true;
+            }
+            if (deal.endTime.sub(block.timestamp) < 1 days) {
+                nextPeriod = deal.endTime.sub(block.timestamp);
+            } else {
+                nextPeriod = 1 days;
+            }
+        }
+
+        if (CalculatePayment(deal.price, nextPeriod) > deals[dealID].blockedBalance) {
+            uint nextPeriodSum = CalculatePayment(deal.price, nextPeriod).sub(deals[dealID].blockedBalance);
+
+            if (token.balanceOf(deal.consumerID) >= nextPeriodSum) {
+                require(token.transferFrom(deal.consumerID, this, nextPeriodSum));
+                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(nextPeriodSum);
+            } else {
+                emit Billed(dealID, deals[dealID].blockedBalance);
+                InternalCloseDeal(dealID);
+                RefundRemainingFunds(dealID);
+                return true;
+            }
+        }
+        return true;
+    }
+
+    function RefundRemainingFunds(uint dealID) internal returns (bool){
+        if (deals[dealID].blockedBalance != 0) {
+            token.transfer(deals[dealID].consumerID, deals[dealID].blockedBalance);
+            deals[dealID].blockedBalance = 0;
+        }
+        return true;
+    }
+
+    function IsSpot(uint dealID) internal view returns (bool){
+        return deals[dealID].duration == 0;
+    }
+
+    function CalculatePayment(uint _price, uint _period) internal view returns (uint) {
+        uint rate = oracle.getCurrentPrice();
+        return rate.mul(_price).mul(_period).div(1e18);
+    }
+
+    function AddToBlacklist(uint dealID, BlacklistPerson role) internal {
+        // only consumer can blacklist
+        require(msg.sender == deals[dealID].consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);
+        if (role == BlacklistPerson.BLACKLIST_WORKER) {
+            bl.Add(deals[dealID].consumerID, deals[dealID].supplierID);
+        } else if (role == BlacklistPerson.BLACKLIST_MASTER) {
+            bl.Add(deals[dealID].consumerID, deals[dealID].masterID);
+        }
+    }
+
+    function InternalCloseDeal(uint dealID) internal {
+        if (deals[dealID].status == DealStatus.STATUS_CLOSED) {
+            return;
+        }
+        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));
+        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].masterID);
+        deals[dealID].status = DealStatus.STATUS_CLOSED;
+        deals[dealID].endTime = block.timestamp;
+        emit DealUpdated(dealID);
+    }
+
+    function ResizeBenchmarks(uint64[] _benchmarks) internal view returns (uint64[]) {
+        uint64[] memory benchmarks = new uint64[](benchmarksQuantity);
+        for (uint i = 0; i < _benchmarks.length; i++) {
+            benchmarks[i] = _benchmarks[i];
+        }
+        return benchmarks;
+    }
+
+    function ResizeNetflags(bool[] _netflags) internal view returns (bool[]) {
+        bool[] memory netflags = new bool[](netflagsQuantity);
+        for (uint i = 0; i < _netflags.length; i++) {
+            netflags[i] = _netflags[i];
+        }
+        return netflags;
+    }
+
+    // SETTERS
+
+    function SetProfileRegistryAddress(address _newPR) onlyOwner public returns (bool) {
+        pr = ProfileRegistry(_newPR);
+        return true;
+    }
+
+    function SetBlacklistAddress(address _newBL) onlyOwner public returns (bool) {
+        bl = Blacklist(_newBL);
+        return true;
+    }
+
+    function SetOracleAddress(address _newOracle) onlyOwner public returns (bool) {
+        require(OracleUSD(_newOracle).getCurrentPrice() != 0);
+        oracle = OracleUSD(_newOracle);
+        return true;
+    }
+
+    function SetBenchmarksQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+        require(_newQuantity > benchmarksQuantity);
+        emit NumBenchmarksUpdated(_newQuantity);
+        benchmarksQuantity = _newQuantity;
+        return true;
+    }
+
+    function SetNetflagsQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+        require(_newQuantity > netflagsQuantity);
+        emit NumNetflagsUpdated(_newQuantity);
+        netflagsQuantity = _newQuantity;
+        return true;
+    }
+
+    function KillMarket() onlyOwner public {
+        token.transfer(owner, token.balanceOf(address(this)));
+        selfdestruct(owner);
+    }
+}

From cfa4b09683263fc3eb4294ba821a1d0cb61f8743 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Wed, 26 Dec 2018 16:01:58 +0300
Subject: [PATCH 08/23] fix: working migrations

---
 blockchain/source/contracts/Orders.sol              |  4 ++++
 .../source/migration_utils/address_hashmap.js       |  3 +++
 .../migrations/4_deploy_new_market_with_old_api.js  | 13 +++++++------
 blockchain/source/scripts/dev.sh                    |  5 +++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/blockchain/source/contracts/Orders.sol b/blockchain/source/contracts/Orders.sol
index 330c5eb3f..75af8a4e1 100644
--- a/blockchain/source/contracts/Orders.sol
+++ b/blockchain/source/contracts/Orders.sol
@@ -111,6 +111,10 @@ contract Orders is Administratable {
         orders[orderID].info.requiredRating = _requiredRating;
     }
 
+    function SetOrderTag(uint orderID, bytes32 _tag) public onlyOwner {
+        orders[orderID].info.tag = _tag;
+    }
+
     function GetOrderInfo(uint orderID) public view
     returns (
         OrderType orderType,
diff --git a/blockchain/source/migration_utils/address_hashmap.js b/blockchain/source/migration_utils/address_hashmap.js
index c2a41bd86..3aeca3118 100644
--- a/blockchain/source/migration_utils/address_hashmap.js
+++ b/blockchain/source/migration_utils/address_hashmap.js
@@ -25,6 +25,9 @@ class ContractRegistry {
     async resolve (contract, name) {
         let address = await this.hm.read(name);
         console.log('resolved', name, 'to', address);
+        if (address === '0x0000000000000000000000000000000000000000') {
+            throw new Error('failed to resolve ' + name + ' in registry')
+        }
         return contract.at(address);
     }
 
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index 9e68e943c..1a46aebd7 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -33,7 +33,7 @@ async function deploySidechain (deployer, network, accounts) {
     let snm = await registry.resolve(SNM, 'sidechainSNMAddress');
     console.log('snm initialized');
 
-    let oracle = await registry.resolve(Oracle, 'oracleAddress');
+    let oracle = await registry.resolve(Oracle, 'oracleUsdAddress');
     console.log('oracle initialized');
 
     // deploy crud
@@ -62,7 +62,8 @@ async function deploySidechain (deployer, network, accounts) {
     console.log('deployed object fetched');
 
     // deploy market
-    await deployer.deploy(Market, snm.address, bl.address, oracle.address, pr.address, adm.address, orders.address, deals.address, cr.address, benchmarksNum, netflagsNum )
+    await deployer.deploy(Market, snm.address, bl.address, oracle.address, pr.address, adm.address,
+        orders.address, deals.address, cr.address, benchmarksNum, netflagsNum, { gas: 100000000} );
     console.log('market deployed');
     let market = await Market.deployed();
     console.log('deployed object fetched');
@@ -73,12 +74,12 @@ async function deploySidechain (deployer, network, accounts) {
     console.log('ms resolved');
 
     // link administratum crud to its contract
-    await ac.tranferOwnership(adm.address, { gasPrice: 0 });
+    await ac.transferOwnership(adm.address, { gasPrice: 0 });
 
     //transfer crud ownerships
-    await orders.tranferOwnership(market.address, { gasPrice: 0 });
-    await deals.tranferOwnership(market.address, { gasPrice: 0 });
-    await cr.tranferOwnership(market.address, { gasPrice: 0 });
+    await orders.transferOwnership(market.address, { gasPrice: 0 });
+    await deals.transferOwnership(market.address, { gasPrice: 0 });
+    await cr.transferOwnership(market.address, { gasPrice: 0 });
     await orders.transferAdministratorship(market.address, { gasPrice: 0 });
     await deals.transferAdministratorship(market.address, { gasPrice: 0 });
     await cr.transferAdministratorship(market.address, { gasPrice: 0 });
diff --git a/blockchain/source/scripts/dev.sh b/blockchain/source/scripts/dev.sh
index 891ca5967..c54e88eb4 100755
--- a/blockchain/source/scripts/dev.sh
+++ b/blockchain/source/scripts/dev.sh
@@ -28,8 +28,9 @@ run() {
     if rpc_running $port; then
         echo "rpc is running on $port"
     else
-        echo "running node_modules/.bin/ganache-cli $blockTime -d sonm --port=$port -i $port >> ./$port.log &"
-        node_modules/.bin/ganache-cli $blockTime -d sonm --port=$port -i $port >> ./$port.log &
+        set -x
+        node_modules/.bin/ganache-cli $blockTime --allowUnlimitedContractSize -l100000000 -d sonm --port=$port -i $port >> ./$port.log &
+        { set +x; } 2>/dev/null
         pids+=($!)
         echo "started ganache on $port (pid $!)"
     fi

From 1f50841f1407a3caeb54245c03d90cebc492948e Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Wed, 9 Jan 2019 17:45:00 +0300
Subject: [PATCH 09/23] fix: missing crud method in administratum

---
 blockchain/source/contracts/Administratum.sol | 35 ++++++++++++-------
 .../source/contracts/AdministratumCrud.sol    | 29 ++++++++-------
 blockchain/source/contracts/MarketV2.sol      | 18 +++++-----
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/blockchain/source/contracts/Administratum.sol b/blockchain/source/contracts/Administratum.sol
index d435f031a..7bdecfe21 100644
--- a/blockchain/source/contracts/Administratum.sol
+++ b/blockchain/source/contracts/Administratum.sol
@@ -30,9 +30,9 @@ contract Administratum is Ownable {
     //funcs
 
     function RegisterWorker(address _master) public returns (bool) {
-        require(crud.GetMaster(msg.sender) == msg.sender);
-        require(!crud.isMaster(msg.sender));
-        require(crud.GetMaster(_master) == _master);
+        require(GetMaster(msg.sender) == msg.sender);
+        require(!crud.IsMaster(msg.sender));
+        require(GetMaster(_master) == _master);
         masterRequest[_master][msg.sender] = true;
         emit WorkerAnnounced(msg.sender, _master);
         return true;
@@ -41,14 +41,14 @@ contract Administratum is Ownable {
     function ConfirmWorker(address _worker) public returns (bool) {
         require(masterRequest[msg.sender][_worker] == true || IsValid(_worker));
         crud.SetMaster(_worker, msg.sender);
-        crud.SwitchToMaster(msg.sender);
+        crud.FlagAsMaster(msg.sender);
         delete masterRequest[msg.sender][_worker];
-        emit WorkerConfirmed(_worker, crud.GetMaster(_worker));
+        emit WorkerConfirmed(_worker, GetMaster(_worker));
         return true;
     }
 
     function RemoveWorker(address _worker, address _master) public returns (bool) {
-        require(crud.GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));
+        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));
         crud.DeleteMaster(_worker);
         emit WorkerRemoved(_worker, _master);
         return true;
@@ -69,8 +69,17 @@ contract Administratum is Ownable {
 
     //GETTERS
 
-    function GetMaster(address _worker) public view returns (address master) {
-        return  crud.GetMaster(_worker);
+    function GetMaster(address _worker) public view returns (address) {
+        if (crud.IsMaster(_worker)) {
+            return _worker;
+        }
+
+        address master = crud.GetMaster(_worker);
+        if (master == address(0)) {
+            return _worker;
+        }
+
+        return master;
     }
 
     // EXTERNAL/OLD API
@@ -86,9 +95,9 @@ contract Administratum is Ownable {
 
 
     function ExternalRegisterWorker(address _master, address _worker) external OnlyMarket returns (bool) {
-        require(crud.GetMaster(_worker) == _worker);
-        require(!crud.isMaster(_worker));
-        require(crud.GetMaster(_master) == _master);
+        require(GetMaster(_worker) == _worker);
+        require(!crud.IsMaster(_worker));
+        require(GetMaster(_master) == _master);
         masterRequest[_master][_worker] = true;
         emit WorkerAnnounced(_worker, _master);
         return true;
@@ -97,14 +106,14 @@ contract Administratum is Ownable {
     function ExternalConfirmWorker(address _worker, address _master)  external OnlyMarket returns (bool) {
         require(masterRequest[_master][_worker] == true);
         crud.SetMaster(_worker, _master);
-        crud.SwitchToMaster(_master);
+        crud.FlagAsMaster(_master);
         delete masterRequest[_master][_worker];
         emit WorkerConfirmed(_worker, _master);
         return true;
     }
 
     function ExternalRemoveWorker(address _worker, address _master, address _sender) external  OnlyMarket returns (bool) {
-        require(crud.GetMaster(_worker) == _master && (_sender == _worker || _sender == _master));
+        require(GetMaster(_worker) == _master && (_sender == _worker || _sender == _master));
         crud.DeleteMaster(_worker);
         emit WorkerRemoved(_worker, _master);
         return true;
diff --git a/blockchain/source/contracts/AdministratumCrud.sol b/blockchain/source/contracts/AdministratumCrud.sol
index 6ca1d7b56..07a2be44d 100644
--- a/blockchain/source/contracts/AdministratumCrud.sol
+++ b/blockchain/source/contracts/AdministratumCrud.sol
@@ -26,30 +26,35 @@ contract AdministratumCrud is Administratable {
         masterOf[_worker] = _master;
     }
 
-    function SetAdmin(address _admin, address _master) public onlyOwner {
-        admins[_admin] = _master;
+    function GetMaster(address _worker) public view returns (address) {
+        return masterOf[_worker];
     }
 
     function DeleteMaster(address _worker) public onlyOwner {
         delete masterOf[_worker];
     }
 
-    function SwitchToMaster(address _target) public onlyOwner {
-        flagIsMaster[_target] = true;
-    }
-
-    function GetMaster(address _worker) public view returns (address) {
-        if (masterOf[_worker] == address(0) || flagIsMaster[_worker] == true){
-            return _worker;
-        }
-        return masterOf[_worker];
+    function SetAdmin(address _admin, address _master) public onlyOwner {
+        admins[_admin] = _master;
     }
 
     function GetAdminMaster(address _admin) public view returns (address) {
         return admins[_admin];
     }
 
-    function isMaster(address _address) public view returns (bool) {
+    function DeleteAdmin(address _admin) public onlyOwner {
+        delete admins[_admin];
+    }
+
+    function FlagAsMaster(address _target) public onlyOwner {
+        flagIsMaster[_target] = true;
+    }
+
+    function IsMaster(address _address) public view returns (bool) {
         return flagIsMaster[_address];
     }
+
+    function UnflagAsMaster(address _target) public onlyOwner {
+        delete flagIsMaster[_target];
+    }
 }
diff --git a/blockchain/source/contracts/MarketV2.sol b/blockchain/source/contracts/MarketV2.sol
index 718eae828..90524803d 100644
--- a/blockchain/source/contracts/MarketV2.sol
+++ b/blockchain/source/contracts/MarketV2.sol
@@ -168,7 +168,7 @@ contract MarketV2 is Ownable, Pausable {
 
 
         require(orderStatus == Orders.OrderStatus.ORDER_ACTIVE);
-        require(author == msg.sender || administratum.GetMaster(author) == msg.sender);
+        require(author == msg.sender || GetMaster(author) == msg.sender);
 
         require(token.transfer(msg.sender, frozenSum));
 
@@ -188,12 +188,12 @@ contract MarketV2 is Ownable, Pausable {
         require(profiles.GetProfileLevel(msg.sender) >= ordersCrud.GetOrderIdentityLevel(askID));
         require(bl.Check(ordersCrud.GetOrderBlacklist(askID), msg.sender) == false);
         require(
-            bl.Check(msg.sender, administratum.GetMaster(ordersCrud.GetOrderAuthor(askID))) == false
+            bl.Check(msg.sender, GetMaster(ordersCrud.GetOrderAuthor(askID))) == false
             && bl.Check(ordersCrud.GetOrderAuthor(askID), msg.sender) == false);
 
         PlaceOrder(
             Orders.OrderType.ORDER_BID,
-            administratum.GetMaster(ordersCrud.GetOrderAuthor(askID)),
+            GetMaster(ordersCrud.GetOrderAuthor(askID)),
             buyoutDuration,
             ordersCrud.GetOrderPrice(askID),
             ordersCrud.GetOrderNetflags(askID),
@@ -214,22 +214,22 @@ contract MarketV2 is Ownable, Pausable {
         require(ordersCrud.GetOrderCounterparty(_askID) == 0x0 || ordersCrud.GetOrderCounterparty(_askID) == ordersCrud.GetOrderAuthor(_bidID));
         require(
             ordersCrud.GetOrderCounterparty(_bidID) == 0x0
-            || ordersCrud.GetOrderCounterparty(_bidID) == administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))
+            || ordersCrud.GetOrderCounterparty(_bidID) == GetMaster(ordersCrud.GetOrderAuthor(_askID))
             || ordersCrud.GetOrderCounterparty(_bidID) == ordersCrud.GetOrderAuthor(_askID));
         require(ordersCrud.GetOrderType(_askID) == Orders.OrderType.ORDER_ASK);
         require(ordersCrud.GetOrderType(_bidID) == Orders.OrderType.ORDER_BID);
-        require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))));
+        require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), GetMaster(ordersCrud.GetOrderAuthor(_askID))));
         require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), ordersCrud.GetOrderAuthor(_askID)));
-        require(!bl.Check(ordersCrud.GetOrderAuthor(_bidID), administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))));
+        require(!bl.Check(ordersCrud.GetOrderAuthor(_bidID), GetMaster(ordersCrud.GetOrderAuthor(_askID))));
         require(!bl.Check(ordersCrud.GetOrderAuthor(_bidID), ordersCrud.GetOrderAuthor(_askID)));
         require(!bl.Check(ordersCrud.GetOrderBlacklist(_askID), ordersCrud.GetOrderAuthor(_bidID)));
-        require(!bl.Check(administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID)), ordersCrud.GetOrderAuthor(_bidID)));
+        require(!bl.Check(GetMaster(ordersCrud.GetOrderAuthor(_askID)), ordersCrud.GetOrderAuthor(_bidID)));
         require(!bl.Check(ordersCrud.GetOrderAuthor(_askID), ordersCrud.GetOrderAuthor(_bidID)));
         require(ordersCrud.GetOrderPrice(_askID) <= ordersCrud.GetOrderPrice(_bidID));
         require(ordersCrud.GetOrderDuration(_askID) >= ordersCrud.GetOrderDuration(_bidID));
         // profile level check
         require(profiles.GetProfileLevel(ordersCrud.GetOrderAuthor(_bidID)) >= ordersCrud.GetOrderIdentityLevel(_askID));
-        require(profiles.GetProfileLevel(administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))) >= ordersCrud.GetOrderIdentityLevel(_bidID)); //bug
+        require(profiles.GetProfileLevel(GetMaster(ordersCrud.GetOrderAuthor(_askID))) >= ordersCrud.GetOrderIdentityLevel(_bidID)); //bug
 
         bool[] memory askNetflags = ordersCrud.GetOrderNetflags(_askID);
         if (askNetflags.length < netflagsQuantity) {
@@ -283,7 +283,7 @@ contract MarketV2 is Ownable, Pausable {
         dealsCrud.SetDealBenchmarks(dealID, askBenchmarks);
         dealsCrud.SetDealConsumerID(dealID, ordersCrud.GetOrderAuthor(_bidID));
         dealsCrud.SetDealSupplierID(dealID, ordersCrud.GetOrderAuthor(_askID));
-        dealsCrud.SetDealMasterID(dealID, administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID)));
+        dealsCrud.SetDealMasterID(dealID, GetMaster(ordersCrud.GetOrderAuthor(_askID)));
         dealsCrud.SetDealAskID(dealID, _askID);
         dealsCrud.SetDealBidID(dealID, _bidID);
         dealsCrud.SetDealDuration(dealID, ordersCrud.GetOrderDuration(_bidID));

From ca381389114ebf7fbd5a794741f231a8d6bd5cb6 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 10 Jan 2019 12:41:57 +0300
Subject: [PATCH 10/23] refactor: deal method ordered the same way as fields

---
 blockchain/source/contracts/Deals.sol | 37 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/blockchain/source/contracts/Deals.sol b/blockchain/source/contracts/Deals.sol
index 7c811125a..05ebcc8f0 100644
--- a/blockchain/source/contracts/Deals.sol
+++ b/blockchain/source/contracts/Deals.sol
@@ -41,8 +41,6 @@ contract Deals is Administratable {
 
     mapping(uint => Deal) deals;
 
-    mapping(address => uint[]) dealsID;
-
     uint dealsAmount = 0;
 
     //Constructor
@@ -80,32 +78,32 @@ contract Deals is Administratable {
         deals[dealID].info.startTime = _startTime;
     }
 
-    function SetDealStatus(uint dealID, DealStatus _status) public onlyOwner {
-        deals[dealID].params.status = _status;
+    function SetDealDuration(uint dealID, uint _duration) public onlyOwner {
+        deals[dealID].params.duration = _duration;
+    }
+
+    function SetDealPrice(uint dealID, uint _price) public onlyOwner {
+        deals[dealID].params.price = _price;
     }
 
     function SetDealEndTime(uint dealID, uint _endTime) public onlyOwner {
         deals[dealID].params.endTime = _endTime;
     }
 
-    function SetDealBlockedBalance(uint dealID, uint _blockedBalance) public onlyOwner {
-        deals[dealID].params.blockedBalance = _blockedBalance;
+    function SetDealStatus(uint dealID, DealStatus _status) public onlyOwner {
+        deals[dealID].params.status = _status;
     }
 
-    function SetDealLastBillTS(uint dealID, uint _lastBillTS) public onlyOwner {
-        deals[dealID].params.lastBillTS = _lastBillTS;
+    function SetDealBlockedBalance(uint dealID, uint _blockedBalance) public onlyOwner {
+        deals[dealID].params.blockedBalance = _blockedBalance;
     }
 
     function SetDealTotalPayout(uint dealID, uint _totalPayout) public onlyOwner {
         deals[dealID].params.totalPayout = _totalPayout;
     }
 
-    function SetDealPrice(uint dealID, uint _price) public onlyOwner {
-        deals[dealID].params.price = _price;
-    }
-
-    function SetDealDuration(uint dealID, uint _duration) public onlyOwner {
-        deals[dealID].params.duration = _duration;
+    function SetDealLastBillTS(uint dealID, uint _lastBillTS) public onlyOwner {
+        deals[dealID].params.lastBillTS = _lastBillTS;
     }
 
     function IncreaseDealsAmount() public onlyOwner {
@@ -163,14 +161,14 @@ contract Deals is Administratable {
         return deals[dealID].info.benchmarks;
     }
 
-    function GetDealConsumerID(uint dealID) public view returns(address) {
-        return deals[dealID].info.consumerID;
-    }
-
     function GetDealSupplierID(uint dealID) public view returns(address) {
         return deals[dealID].info.supplierID;
     }
 
+    function GetDealConsumerID(uint dealID) public view returns(address) {
+        return deals[dealID].info.consumerID;
+    }
+
     function GetDealMasterID(uint dealID) public view returns(address) {
         return deals[dealID].info.masterID;
     }
@@ -219,4 +217,7 @@ contract Deals is Administratable {
         return dealsAmount;
     }
 
+    function DeleteDeal(uint dealID) public onlyOwner {
+        delete deals[dealID];
+    }
 }

From fbcd908ffadf9a3ab1464109f9a85d8bb4ad9dd8 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 10 Jan 2019 14:49:02 +0300
Subject: [PATCH 11/23] refactor: reorder Order accessors in crud

---
 blockchain/source/contracts/Deals.sol  |   4 +
 blockchain/source/contracts/Orders.sol | 199 +++++++++++++++----------
 2 files changed, 125 insertions(+), 78 deletions(-)

diff --git a/blockchain/source/contracts/Deals.sol b/blockchain/source/contracts/Deals.sol
index 05ebcc8f0..5621b915e 100644
--- a/blockchain/source/contracts/Deals.sol
+++ b/blockchain/source/contracts/Deals.sol
@@ -217,6 +217,10 @@ contract Deals is Administratable {
         return dealsAmount;
     }
 
+    function SetDealsAmount(uint newDealsAmount) public onlyOwner {
+        dealsAmount = newDealsAmount;
+    }
+
     function DeleteDeal(uint dealID) public onlyOwner {
         delete deals[dealID];
     }
diff --git a/blockchain/source/contracts/Orders.sol b/blockchain/source/contracts/Orders.sol
index 75af8a4e1..3f17c986c 100644
--- a/blockchain/source/contracts/Orders.sol
+++ b/blockchain/source/contracts/Orders.sol
@@ -50,13 +50,125 @@ contract Orders is Administratable {
 
     uint ordersAmount = 0;
 
-    //Constructor
-
     constructor() public {
         owner = msg.sender;
         administrator = msg.sender;
     }
 
+    // Accessors, listed in the same order as the appear in `Order` struct
+    function GetOrderType(uint orderID) public view returns (OrderType) {
+        return orders[orderID].info.orderType;
+    }
+
+    function SetOrderType(uint orderID, OrderType newType) public onlyOwner {
+        orders[orderID].info.orderType = newType;
+    }
+
+    function GetOrderAuthor(uint orderID) public view returns (address) {
+        return orders[orderID].info.author;
+    }
+
+    function SetOrderAuthor(uint orderID, address newAuthor) public onlyOwner {
+        orders[orderID].info.author = newAuthor;
+    }
+
+    function GetOrderCounterparty(uint orderID) public view returns (address) {
+        return orders[orderID].info.counterparty;
+    }
+
+    function SetOrderCounterparty(uint orderID, address newCounterparty) public onlyOwner {
+        orders[orderID].info.counterparty = newCounterparty;
+    }
+
+    function GetOrderDuration(uint orderID) public view returns (uint) {
+        return orders[orderID].info.duration;
+    }
+
+    function SetOrderDuration(uint orderID, uint newDuration) public onlyOwner {
+        orders[orderID].info.duration = newDuration;
+    }
+
+    function GetOrderPrice(uint orderID) public view returns (uint) {
+        return orders[orderID].info.price;
+    }
+
+    function SetOrderPrice(uint orderID, uint newPrice) public onlyOwner {
+        orders[orderID].info.price = newPrice;
+    }
+
+    function GetOrderNetflags(uint orderID) public view returns (bool[]) {
+        return orders[orderID].info.netflags;
+    }
+
+    function SetOrderNetflags(uint orderID, bool[] _netflags) public onlyOwner {
+        orders[orderID].info.netflags = _netflags;
+    }
+
+    function GetOrderIdentityLevel(uint orderID) public view returns (ProfileRegistry.IdentityLevel) {
+        return orders[orderID].info.identityLevel;
+    }
+
+    function SetOrderIdentityLevel(uint orderID, ProfileRegistry.IdentityLevel newLevel) public onlyOwner {
+        orders[orderID].info.identityLevel = newLevel;
+    }
+
+    function GetOrderBlacklist(uint orderID) public view returns (address) {
+        return orders[orderID].info.blacklist;
+    }
+
+    function SetOrderBlacklist(uint orderID, address newBlacklist) public onlyOwner {
+        orders[orderID].info.blacklist = newBlacklist;
+    }
+
+    function GetOrderTag(uint orderID) public view returns (bytes32) {
+        return orders[orderID].info.tag;
+    }
+
+    function SetOrderTag(uint orderID, bytes32 _tag) public onlyOwner {
+        orders[orderID].info.tag = _tag;
+    }
+
+    function GetOrderBenchmarks(uint orderID) public view returns (uint64[]) {
+        return orders[orderID].info.benchmarks;
+    }
+
+    function SetOrderBenchmarks(uint orderID, uint64[] _benchmarks) public onlyOwner {
+        orders[orderID].info.benchmarks = _benchmarks;
+    }
+
+    function GetOrderFrozenSum(uint orderID) public view returns (uint) {
+        return orders[orderID].info.frozenSum;
+    }
+
+    function SetOrderFrozenSum(uint orderID, uint newFrozenSum) public onlyOwner {
+        orders[orderID].info.frozenSum = newFrozenSum;
+    }
+
+    function GetOrderRequiredRating(uint orderID) public view returns (uint) {
+        return orders[orderID].info.requiredRating;
+    }
+
+    function SetOrderRequiredRating(uint orderID, uint newRequiredRating) public onlyOwner {
+        orders[orderID].info.requiredRating = newRequiredRating;
+    }
+
+    function GetOrderStatus(uint orderID) public view returns (OrderStatus) {
+        return orders[orderID].params.orderStatus;
+    }
+
+    function SetOrderStatus(uint orderID, OrderStatus _status) public onlyOwner {
+        orders[orderID].params.orderStatus = _status;
+    }
+
+    function GetOrderDealID(uint orderID) public view returns (uint) {
+        return orders[orderID].params.dealID;
+    }
+
+    function SetOrderDealID(uint orderID, uint _dealID) public onlyOwner {
+        orders[orderID].params.dealID = _dealID;
+    }
+
+    // Cummulative Order actions. Those are in fact only helpers.
     function Write(
         OrderType _orderType,
         OrderStatus _orderStatus,
@@ -91,28 +203,8 @@ contract Orders is Administratable {
         return ordersAmount;
     }
 
-    function SetOrderStatus(uint orderID, OrderStatus _status) public onlyOwner {
-        orders[orderID].params.orderStatus = _status;
-    }
-
-    function SetOrderDealID(uint orderID, uint _dealID) public onlyOwner {
-        orders[orderID].params.dealID = _dealID;
-    }
-
-    function SetOrderBenchmarks(uint orderID, uint64[] _benchmarks) public onlyOwner {
-        orders[orderID].info.benchmarks = _benchmarks;
-    }
-
-    function SetOrderNetflags(uint orderID, bool[] _netflags) public onlyOwner {
-        orders[orderID].info.netflags = _netflags;
-    }
-
-    function SetOrderRequiredRating(uint orderID, uint _requiredRating) public onlyOwner {
-        orders[orderID].info.requiredRating = _requiredRating;
-    }
-
-    function SetOrderTag(uint orderID, bytes32 _tag) public onlyOwner {
-        orders[orderID].info.tag = _tag;
+    function DeleteOrder(uint orderID) public onlyOwner {
+        delete orders[orderID];
     }
 
     function GetOrderInfo(uint orderID) public view
@@ -146,56 +238,6 @@ contract Orders is Administratable {
         info.requiredRating
         );
     }
-    function GetOrderType(uint orderID) public view returns (OrderType) {
-        return orders[orderID].info.orderType;
-    }
-
-    function GetOrderAuthor(uint orderID) public view returns (address) {
-        return orders[orderID].info.author;
-    }
-
-    function GetOrderCounterparty(uint orderID) public view returns (address) {
-        return orders[orderID].info.counterparty;
-    }
-
-    function GetOrderDuration(uint orderID) public view returns (uint) {
-        return orders[orderID].info.duration;
-    }
-
-    function GetOrderPrice(uint orderID) public view returns (uint) {
-        return orders[orderID].info.price;
-    }
-
-    function GetOrderNetflags(uint orderID) public view returns (bool[]) {
-        return orders[orderID].info.netflags;
-    }
-
-    function GetOrderIdentityLevel(uint orderID) public view returns (ProfileRegistry.IdentityLevel) {
-        return orders[orderID].info.identityLevel;
-    }
-
-    function GetOrderBlacklist(uint orderID) public view returns (address) {
-        return orders[orderID].info.blacklist;
-    }
-
-    function GetOrderTag(uint orderID) public view returns (bytes32) {
-        return orders[orderID].info.tag;
-    }
-
-    function GetOrderBenchmarks(uint orderID) public view returns (uint64[]) {
-        return orders[orderID].info.benchmarks;
-    }
-    function GetOrderFrozenSum(uint orderID) public view returns (uint) {
-        return orders[orderID].info.frozenSum;
-    }
-
-    function GetOrderRequiredRating(uint orderID) public view returns (uint) {
-        return orders[orderID].info.requiredRating;
-    }
-
-    function GetOrdersAmount() public view returns (uint) {
-        return ordersAmount;
-    }
 
     function GetOrderParams(uint orderID) public view
     returns (
@@ -209,11 +251,12 @@ contract Orders is Administratable {
         );
     }
 
-    function GetOrderStatus(uint orderID) public view returns (OrderStatus) {
-        return orders[orderID].params.orderStatus;
+    // ordersAmount accessors. Generally setter should not be used, but let it be here just in case.
+    function GetOrdersAmount() public view returns (uint) {
+        return ordersAmount;
     }
 
-    function GetOrderDealID(uint orderID) public view returns (uint) {
-        return orders[orderID].params.dealID;
+    function SetOrdersAmount(uint newOrdersAmount) public onlyOwner {
+        ordersAmount = newOrdersAmount;
     }
 }

From 475ca4ed262812c7c2ba9ec1a58164921f803c67 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 10 Jan 2019 16:54:23 +0300
Subject: [PATCH 12/23] refactor: regenerate api

---
 blockchain/gasLimits.go                            | 6 +++---
 blockchain/source/api/Market.go                    | 2 +-
 blockchain/source/api/OracleUSD.go                 | 2 +-
 blockchain/source/api/SimpleGatekeeperWithLimit.go | 2 +-
 blockchain/source/contracts/Orders.sol             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blockchain/gasLimits.go b/blockchain/gasLimits.go
index eee4716fc..314b0f5c5 100644
--- a/blockchain/gasLimits.go
+++ b/blockchain/gasLimits.go
@@ -9,8 +9,8 @@ const (
 	approveGasLimit             = 70000
 	placeOrderGasLimit          = 650000
 	cancelOrderGasLimit         = 300000
-	quickBuyGasLimit            = 1200000
-	openDealGasLimit            = 600000
+	quickBuyGasLimit            = 1300000
+	openDealGasLimit            = 800000
 	closeDealGasLimit           = 250000
 	billGasLimit                = 300000
 	createChangeRequestGasLimit = 300000
@@ -25,5 +25,5 @@ const (
 )
 
 func devicesGasLimit(size uint64) uint64 {
-	return 200000 + size/32*20000
+	return 400000 + size/32*31000
 }
diff --git a/blockchain/source/api/Market.go b/blockchain/source/api/Market.go
index 2fd8f1638..4a5e2020f 100644
--- a/blockchain/source/api/Market.go
+++ b/blockchain/source/api/Market.go
@@ -19,7 +19,7 @@ import (
 const MarketABI = "[{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"deals\",\"outputs\":[{\"name\":\"supplierID\",\"type\":\"address\"},{\"name\":\"consumerID\",\"type\":\"address\"},{\"name\":\"masterID\",\"type\":\"address\"},{\"name\":\"askID\",\"type\":\"uint256\"},{\"name\":\"bidID\",\"type\":\"uint256\"},{\"name\":\"duration\",\"type\":\"uint256\"},{\"name\":\"price\",\"type\":\"uint256\"},{\"name\":\"startTime\",\"type\":\"uint256\"},{\"name\":\"endTime\",\"type\":\"uint256\"},{\"name\":\"status\",\"type\":\"uint8\"},{\"name\":\"blockedBalance\",\"type\":\"uint256\"},{\"name\":\"totalPayout\",\"type\":\"uint256\"},{\"name\":\"lastBillTS\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"unpause\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"paused\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"pause\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"orders\",\"outputs\":[{\"name\":\"orderType\",\"type\":\"uint8\"},{\"name\":\"orderStatus\",\"type\":\"uint8\"},{\"name\":\"author\",\"type\":\"address\"},{\"name\":\"counterparty\",\"type\":\"address\"},{\"name\":\"duration\",\"type\":\"uint256\"},{\"name\":\"price\",\"type\":\"uint256\"},{\"name\":\"identityLevel\",\"type\":\"uint8\"},{\"name\":\"blacklist\",\"type\":\"address\"},{\"name\":\"tag\",\"type\":\"bytes32\"},{\"name\":\"frozenSum\",\"type\":\"uint256\"},{\"name\":\"dealID\",\"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\":\"_token\",\"type\":\"address\"},{\"name\":\"_blacklist\",\"type\":\"address\"},{\"name\":\"_oracle\",\"type\":\"address\"},{\"name\":\"_profileRegistry\",\"type\":\"address\"},{\"name\":\"_benchmarksQuantity\",\"type\":\"uint256\"},{\"name\":\"_netflagsQuantity\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"orderID\",\"type\":\"uint256\"}],\"name\":\"OrderPlaced\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"orderID\",\"type\":\"uint256\"}],\"name\":\"OrderUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"dealID\",\"type\":\"uint256\"}],\"name\":\"DealOpened\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"dealID\",\"type\":\"uint256\"}],\"name\":\"DealUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"dealID\",\"type\":\"uint256\"},{\"indexed\":true,\"name\":\"paidAmount\",\"type\":\"uint256\"}],\"name\":\"Billed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"changeRequestID\",\"type\":\"uint256\"}],\"name\":\"DealChangeRequestSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"changeRequestID\",\"type\":\"uint256\"}],\"name\":\"DealChangeRequestUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"worker\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"master\",\"type\":\"address\"}],\"name\":\"WorkerAnnounced\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"worker\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"master\",\"type\":\"address\"}],\"name\":\"WorkerConfirmed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"worker\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"master\",\"type\":\"address\"}],\"name\":\"WorkerRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"newNum\",\"type\":\"uint256\"}],\"name\":\"NumBenchmarksUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"newNum\",\"type\":\"uint256\"}],\"name\":\"NumNetflagsUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[],\"name\":\"Pause\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[],\"name\":\"Unpause\",\"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\"},{\"constant\":false,\"inputs\":[{\"name\":\"_orderType\",\"type\":\"uint8\"},{\"name\":\"_id_counterparty\",\"type\":\"address\"},{\"name\":\"_duration\",\"type\":\"uint256\"},{\"name\":\"_price\",\"type\":\"uint256\"},{\"name\":\"_netflags\",\"type\":\"bool[]\"},{\"name\":\"_identityLevel\",\"type\":\"uint8\"},{\"name\":\"_blacklist\",\"type\":\"address\"},{\"name\":\"_tag\",\"type\":\"bytes32\"},{\"name\":\"_benchmarks\",\"type\":\"uint64[]\"}],\"name\":\"PlaceOrder\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"orderID\",\"type\":\"uint256\"}],\"name\":\"CancelOrder\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"askID\",\"type\":\"uint256\"},{\"name\":\"buyoutDuration\",\"type\":\"uint256\"}],\"name\":\"QuickBuy\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_askID\",\"type\":\"uint256\"},{\"name\":\"_bidID\",\"type\":\"uint256\"}],\"name\":\"OpenDeal\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"},{\"name\":\"blacklisted\",\"type\":\"uint8\"}],\"name\":\"CloseDeal\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"}],\"name\":\"Bill\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"},{\"name\":\"newPrice\",\"type\":\"uint256\"},{\"name\":\"newDuration\",\"type\":\"uint256\"}],\"name\":\"CreateChangeRequest\",\"outputs\":[{\"name\":\"changeRequestID\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"changeRequestID\",\"type\":\"uint256\"}],\"name\":\"CancelChangeRequest\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_master\",\"type\":\"address\"}],\"name\":\"RegisterWorker\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_worker\",\"type\":\"address\"}],\"name\":\"ConfirmWorker\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_worker\",\"type\":\"address\"},{\"name\":\"_master\",\"type\":\"address\"}],\"name\":\"RemoveWorker\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"orderID\",\"type\":\"uint256\"}],\"name\":\"GetOrderInfo\",\"outputs\":[{\"name\":\"orderType\",\"type\":\"uint8\"},{\"name\":\"author\",\"type\":\"address\"},{\"name\":\"counterparty\",\"type\":\"address\"},{\"name\":\"duration\",\"type\":\"uint256\"},{\"name\":\"price\",\"type\":\"uint256\"},{\"name\":\"netflags\",\"type\":\"bool[]\"},{\"name\":\"identityLevel\",\"type\":\"uint8\"},{\"name\":\"blacklist\",\"type\":\"address\"},{\"name\":\"tag\",\"type\":\"bytes32\"},{\"name\":\"benchmarks\",\"type\":\"uint64[]\"},{\"name\":\"frozenSum\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"orderID\",\"type\":\"uint256\"}],\"name\":\"GetOrderParams\",\"outputs\":[{\"name\":\"orderStatus\",\"type\":\"uint8\"},{\"name\":\"dealID\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"}],\"name\":\"GetDealInfo\",\"outputs\":[{\"name\":\"benchmarks\",\"type\":\"uint64[]\"},{\"name\":\"supplierID\",\"type\":\"address\"},{\"name\":\"consumerID\",\"type\":\"address\"},{\"name\":\"masterID\",\"type\":\"address\"},{\"name\":\"askID\",\"type\":\"uint256\"},{\"name\":\"bidID\",\"type\":\"uint256\"},{\"name\":\"startTime\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"}],\"name\":\"GetDealParams\",\"outputs\":[{\"name\":\"duration\",\"type\":\"uint256\"},{\"name\":\"price\",\"type\":\"uint256\"},{\"name\":\"endTime\",\"type\":\"uint256\"},{\"name\":\"status\",\"type\":\"uint8\"},{\"name\":\"blockedBalance\",\"type\":\"uint256\"},{\"name\":\"totalPayout\",\"type\":\"uint256\"},{\"name\":\"lastBillTS\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_worker\",\"type\":\"address\"}],\"name\":\"GetMaster\",\"outputs\":[{\"name\":\"master\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"changeRequestID\",\"type\":\"uint256\"}],\"name\":\"GetChangeRequestInfo\",\"outputs\":[{\"name\":\"dealID\",\"type\":\"uint256\"},{\"name\":\"requestType\",\"type\":\"uint8\"},{\"name\":\"price\",\"type\":\"uint256\"},{\"name\":\"duration\",\"type\":\"uint256\"},{\"name\":\"status\",\"type\":\"uint8\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetDealsAmount\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetOrdersAmount\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetChangeRequestsAmount\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetBenchmarksQuantity\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetNetflagsQuantity\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newPR\",\"type\":\"address\"}],\"name\":\"SetProfileRegistryAddress\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newBL\",\"type\":\"address\"}],\"name\":\"SetBlacklistAddress\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOracle\",\"type\":\"address\"}],\"name\":\"SetOracleAddress\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newQuantity\",\"type\":\"uint256\"}],\"name\":\"SetBenchmarksQuantity\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newQuantity\",\"type\":\"uint256\"}],\"name\":\"SetNetflagsQuantity\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"KillMarket\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]"
 
 // MarketBin is the compiled bytecode used for deploying new contracts.
-const MarketBin = `0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153ce83398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a0396871690831617905560028054968616968216969096179095556003805493851693861693909317909255600480549390911692909316919091179091556008919091556009556152fc806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a72305820408bfacbeecd1fc4ca7528f2c7ac1eb0ff6868c895f4511b583e9f0b0cb030580029`
+const MarketBin = `0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153ce83398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a0396871690831617905560028054968616968216969096179095556003805493851693861693909317909255600480549390911692909316919091179091556008919091556009556152fc806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a723058204c821cd8ec0d34125017488e569263a04876edb010a9b34000b9b29c0ab3f66a0029`
 
 // DeployMarket deploys a new Ethereum contract, binding an instance of Market to it.
 func DeployMarket(auth *bind.TransactOpts, backend bind.ContractBackend, _token common.Address, _blacklist common.Address, _oracle common.Address, _profileRegistry common.Address, _benchmarksQuantity *big.Int, _netflagsQuantity *big.Int) (common.Address, *types.Transaction, *Market, error) {
diff --git a/blockchain/source/api/OracleUSD.go b/blockchain/source/api/OracleUSD.go
index 2829239f0..156012328 100644
--- a/blockchain/source/api/OracleUSD.go
+++ b/blockchain/source/api/OracleUSD.go
@@ -19,7 +19,7 @@ import (
 const OracleUSDABI = "[{\"constant\":false,\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"price\",\"type\":\"uint256\"}],\"name\":\"PriceChanged\",\"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\"},{\"constant\":false,\"inputs\":[{\"name\":\"_price\",\"type\":\"uint256\"}],\"name\":\"setCurrentPrice\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getCurrentPrice\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}]"
 
 // OracleUSDBin is the compiled bytecode used for deploying new contracts.
-const OracleUSDBin = `0x60806040526001805534801561001457600080fd5b5060008054600160a060020a0319908116339081179091161790556102c58061003e6000396000f30060806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820be6f69c6a3f6722d576a1b501aff2cf9b9de7b8c862ddb317bd0d7808c5a41ad0029`
+const OracleUSDBin = `0x60806040526001805534801561001457600080fd5b5060008054600160a060020a0319908116339081179091161790556102c58061003e6000396000f30060806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582017c8960aec5d89e3899911aa2faa4f94936492fa882d20c6373fefeae5bd80450029`
 
 // DeployOracleUSD deploys a new Ethereum contract, binding an instance of OracleUSD to it.
 func DeployOracleUSD(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *OracleUSD, error) {
diff --git a/blockchain/source/api/SimpleGatekeeperWithLimit.go b/blockchain/source/api/SimpleGatekeeperWithLimit.go
index d7e17d4fa..942776adf 100644
--- a/blockchain/source/api/SimpleGatekeeperWithLimit.go
+++ b/blockchain/source/api/SimpleGatekeeperWithLimit.go
@@ -19,7 +19,7 @@ import (
 const SimpleGatekeeperWithLimitABI = "[{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"keepers\",\"outputs\":[{\"name\":\"dayLimit\",\"type\":\"uint256\"},{\"name\":\"lastDay\",\"type\":\"uint256\"},{\"name\":\"spentToday\",\"type\":\"uint256\"},{\"name\":\"frozen\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"paid\",\"outputs\":[{\"name\":\"commitTS\",\"type\":\"uint256\"},{\"name\":\"paid\",\"type\":\"bool\"},{\"name\":\"keeper\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"transactionAmount\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"commissionBalance\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"commission\",\"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\":\"_token\",\"type\":\"address\"},{\"name\":\"_freezingTime\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"txNumber\",\"type\":\"uint256\"},{\"indexed\":true,\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"PayinTx\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"txNumber\",\"type\":\"uint256\"},{\"indexed\":true,\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"name\":\"commitTimestamp\",\"type\":\"uint256\"}],\"name\":\"CommitTx\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"txNumber\",\"type\":\"uint256\"},{\"indexed\":true,\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"PayoutTx\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"block\",\"type\":\"uint256\"}],\"name\":\"Suicide\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"keeper\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"dayLimit\",\"type\":\"uint256\"}],\"name\":\"LimitChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"keeper\",\"type\":\"address\"}],\"name\":\"KeeperFreezed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"keeper\",\"type\":\"address\"}],\"name\":\"KeeperUnfreezed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"commission\",\"type\":\"uint256\"}],\"name\":\"CommissionChanged\",\"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\"},{\"constant\":false,\"inputs\":[{\"name\":\"_keeper\",\"type\":\"address\"},{\"name\":\"_limit\",\"type\":\"uint256\"}],\"name\":\"ChangeKeeperLimit\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_keeper\",\"type\":\"address\"}],\"name\":\"FreezeKeeper\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_keeper\",\"type\":\"address\"}],\"name\":\"UnfreezeKeeper\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"Payin\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_value\",\"type\":\"uint256\"},{\"name\":\"_target\",\"type\":\"address\"}],\"name\":\"PayinTargeted\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_to\",\"type\":\"address\"},{\"name\":\"_value\",\"type\":\"uint256\"},{\"name\":\"_txNumber\",\"type\":\"uint256\"}],\"name\":\"Payout\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_freezingTime\",\"type\":\"uint256\"}],\"name\":\"SetFreezingTime\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetFreezingTime\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_commission\",\"type\":\"uint256\"}],\"name\":\"SetCommission\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"GetCommission\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"TransferCommission\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"kill\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]"
 
 // SimpleGatekeeperWithLimitBin is the compiled bytecode used for deploying new contracts.
-const SimpleGatekeeperWithLimitBin = `0x608060405260006003556000600455600060055534801561001f57600080fd5b50604051604080610eea8339810160405280516020909101516000805460018054600160a060020a03909516600160a060020a0319958616179055831633908117909316909217909155600755610e6f8061007b6000396000f3006080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058203cff4e898fe0b069055c08319c3c3d2db6e51a57270c6d550f468526830d13e20029`
+const SimpleGatekeeperWithLimitBin = `0x608060405260006003556000600455600060055534801561001f57600080fd5b50604051604080610eea8339810160405280516020909101516000805460018054600160a060020a03909516600160a060020a0319958616179055831633908117909316909217909155600755610e6f8061007b6000396000f3006080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058206440d33055cd2aea92a820944e0e59d41008475e74ef3e486562beb0827bf4d10029`
 
 // DeploySimpleGatekeeperWithLimit deploys a new Ethereum contract, binding an instance of SimpleGatekeeperWithLimit to it.
 func DeploySimpleGatekeeperWithLimit(auth *bind.TransactOpts, backend bind.ContractBackend, _token common.Address, _freezingTime *big.Int) (common.Address, *types.Transaction, *SimpleGatekeeperWithLimit, error) {
diff --git a/blockchain/source/contracts/Orders.sol b/blockchain/source/contracts/Orders.sol
index 3f17c986c..d61697454 100644
--- a/blockchain/source/contracts/Orders.sol
+++ b/blockchain/source/contracts/Orders.sol
@@ -46,7 +46,7 @@ contract Orders is Administratable {
         uint dealID;
     }
 
-    mapping(uint => Order) public orders;
+    mapping(uint => Order) orders;
 
     uint ordersAmount = 0;
 

From bb80d43ee8834d0d45983c8af31c0c70932f4ee3 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 10 Jan 2019 16:57:12 +0300
Subject: [PATCH 13/23] fix: add setter for change request amount

---
 blockchain/source/contracts/ChangeRequests.sol | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blockchain/source/contracts/ChangeRequests.sol b/blockchain/source/contracts/ChangeRequests.sol
index 170a4dd3a..5ea0d5015 100644
--- a/blockchain/source/contracts/ChangeRequests.sol
+++ b/blockchain/source/contracts/ChangeRequests.sol
@@ -76,6 +76,10 @@ contract ChangeRequests is Administratable {
         actualRequests[dealID][role] = _changeRequestID;
     }
 
+    function SetChangeRequestAmount(uint newAmount) public onlyOwner {
+        requestsAmount = newAmount;
+    }
+
     // GETTERS
 
     function GetChangeRequestDealID(uint _changeRequestID) public view returns(uint) {

From e34fc190e25b06627c6a31bdd0a9cdefb9d25ea7 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Fri, 11 Jan 2019 14:48:28 +0300
Subject: [PATCH 14/23] chore: deployed to testnet

---
 .../contracts/AddressHashMap.json             |     2 +-
 .../contracts/Administratable.json            |  1570 +-
 .../contracts/AutoPayout.json                 |  1930 +-
 .../contracts/BasicToken.json                 |  1010 +-
 .../contracts/Blacklist.json                  |  2068 +-
 .../migration_artifacts/contracts/ERC20.json  |   446 +-
 .../contracts/ERC20Basic.json                 |   318 +-
 .../migration_artifacts/contracts/Market.json | 34216 ++++++++--------
 .../contracts/Migrations.json                 |     2 +-
 .../contracts/MultiSigWallet.json             |     2 +-
 .../contracts/OracleUSD.json                  |   546 +-
 .../contracts/Ownable.json                    |   838 +-
 .../contracts/Pausable.json                   |   598 +-
 .../contracts/ProfileRegistry.json            |  5788 +--
 .../migration_artifacts/contracts/SNM.json    |   498 +-
 .../contracts/SafeMath.json                   |   946 +-
 .../contracts/SimpleGatekeeperWithLimit.json  |  5968 +--
 .../contracts/StandardToken.json              |  2522 +-
 .../4_deploy_new_market_with_old_api.js       |     4 +-
 19 files changed, 29635 insertions(+), 29637 deletions(-)

diff --git a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
index e1910b9e4..9ae4af79a 100644
--- a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
+++ b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
@@ -1259,5 +1259,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-24T11:55:10.283Z"
+  "updatedAt": "2019-01-10T14:00:11.054Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Administratable.json b/blockchain/source/migration_artifacts/contracts/Administratable.json
index 30b78fe84..33fff1fae 100644
--- a/blockchain/source/migration_artifacts/contracts/Administratable.json
+++ b/blockchain/source/migration_artifacts/contracts/Administratable.json
@@ -121,22 +121,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b506000805433600160a060020a0319918216811783556001805490921617905561033290819061004090396000f30060806040526004361061006c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a681146100715780638da5cb5b14610088578063a9f0a590146100b9578063f2fde38b146100da578063f53d0a8e146100fb575b600080fd5b34801561007d57600080fd5b50610086610110565b005b34801561009457600080fd5b5061009d610193565b60408051600160a060020a039092168252519081900360200190f35b3480156100c557600080fd5b50610086600160a060020a03600435166101a2565b3480156100e657600080fd5b50610086600160a060020a03600435166101c5565b34801561010757600080fd5b5061009d6101fc565b600054600160a060020a03163314806101335750600154600160a060020a031633145b151561013e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600154600160a060020a031633146101b957600080fd5b6101c28161020b565b50565b600054600160a060020a03163314806101e85750600154600160a060020a031633145b15156101f357600080fd5b6101c281610289565b600154600160a060020a031681565b600160a060020a038116151561022057600080fd5b600154604051600160a060020a038084169216907f39e41585bde2224ba5127a3a5d20414c158e7966cc0d391983c1abbcf142c52b90600090a36001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600160a060020a038116151561029e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820d431e5ec719c1a75bd110dc0fdc5399cde71d1ae7a8420db00784360a3e1a77b0029",
   "deployedBytecode": "0x60806040526004361061006c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a681146100715780638da5cb5b14610088578063a9f0a590146100b9578063f2fde38b146100da578063f53d0a8e146100fb575b600080fd5b34801561007d57600080fd5b50610086610110565b005b34801561009457600080fd5b5061009d610193565b60408051600160a060020a039092168252519081900360200190f35b3480156100c557600080fd5b50610086600160a060020a03600435166101a2565b3480156100e657600080fd5b50610086600160a060020a03600435166101c5565b34801561010757600080fd5b5061009d6101fc565b600054600160a060020a03163314806101335750600154600160a060020a031633145b151561013e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600154600160a060020a031633146101b957600080fd5b6101c28161020b565b50565b600054600160a060020a03163314806101e85750600154600160a060020a031633145b15156101f357600080fd5b6101c281610289565b600154600160a060020a031681565b600160a060020a038116151561022057600080fd5b600154604051600160a060020a038084169216907f39e41585bde2224ba5127a3a5d20414c158e7966cc0d391983c1abbcf142c52b90600090a36001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b600160a060020a038116151561029e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820d431e5ec719c1a75bd110dc0fdc5399cde71d1ae7a8420db00784360a3e1a77b0029",
-  "sourceMap": "26:1623:1:-;;;383:92;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;414:5:1;:18;;422:10;-1:-1:-1;;;;;;414:18:1;;;;;;;-1:-1:-1;442:26:1;;;;;;;;26:1623;;;;;;;;",
-  "deployedSourceMap": "26:1623:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;788:132;;8:9:-1;5:2;;;30:1;27;20:12;5:2;788:132:1;;;;;;57:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;57:20:1;;;;;;;;-1:-1:-1;;;;;57:20:1;;;;;;;;;;;;;;1243:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1243:149:1;-1:-1:-1;;;;;1243:149:1;;;;;926:120;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;926:120:1;-1:-1:-1;;;;;926:120:1;;;;;83:28;;8:9:-1;5:2;;;30:1;27;20:12;5:2;83:28:1;;;;788:132;628:5;;-1:-1:-1;;;;;628:5:1;614:10;:19;;:50;;-1:-1:-1;651:13:1;;-1:-1:-1;;;;;651:13:1;637:10;:27;614:50;606:59;;;;;;;;879:5;;;860:25;;-1:-1:-1;;;;;879:5:1;;;;860:25;;;911:1;895:18;;-1:-1:-1;;895:18:1;;;788:132::o;57:20::-;;;-1:-1:-1;;;;;57:20:1;;:::o;1243:149::-;750:13;;-1:-1:-1;;;;;750:13:1;736:10;:27;728:36;;;;;;1340:45;1367:17;1340:26;:45::i;:::-;1243:149;:::o;926:120::-;628:5;;-1:-1:-1;;;;;628:5:1;614:10;:19;;:50;;-1:-1:-1;651:13:1;;-1:-1:-1;;;;;651:13:1;637:10;:27;614:50;606:59;;;;;;;;1010:29;1029:9;1010:18;:29::i;83:28::-;;;-1:-1:-1;;;;;83:28:1;;:::o;1398:249::-;-1:-1:-1;;;;;1488:31:1;;;;1480:40;;;;;;1564:13;;1535:62;;-1:-1:-1;;;;;1535:62:1;;;;1564:13;;1535:62;;1564:13;;1535:62;1607:13;:33;;-1:-1:-1;;1607:33:1;-1:-1:-1;;;;;1607:33:1;;;;;;;;;;1398:249::o;1052:185::-;-1:-1:-1;;;;;1126:23:1;;;;1118:32;;;;;;1186:5;;;1165:38;;-1:-1:-1;;;;;1165:38:1;;;;1186:5;;;1165:38;;;1213:5;:17;;-1:-1:-1;;1213:17:1;-1:-1:-1;;;;;1213:17:1;;;;;;;;;;1052:185::o",
+  "sourceMap": "26:1623:0:-;;;383:92;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;414:5:0;:18;;422:10;-1:-1:-1;;;;;;414:18:0;;;;;;;-1:-1:-1;442:26:0;;;;;;;;26:1623;;;;;;;;",
+  "deployedSourceMap": "26:1623:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;788:132;;8:9:-1;5:2;;;30:1;27;20:12;5:2;788:132:0;;;;;;57:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;57:20:0;;;;;;;;-1:-1:-1;;;;;57:20:0;;;;;;;;;;;;;;1243:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1243:149:0;-1:-1:-1;;;;;1243:149:0;;;;;926:120;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;926:120:0;-1:-1:-1;;;;;926:120:0;;;;;83:28;;8:9:-1;5:2;;;30:1;27;20:12;5:2;83:28:0;;;;788:132;628:5;;-1:-1:-1;;;;;628:5:0;614:10;:19;;:50;;-1:-1:-1;651:13:0;;-1:-1:-1;;;;;651:13:0;637:10;:27;614:50;606:59;;;;;;;;879:5;;;860:25;;-1:-1:-1;;;;;879:5:0;;;;860:25;;;911:1;895:18;;-1:-1:-1;;895:18:0;;;788:132::o;57:20::-;;;-1:-1:-1;;;;;57:20:0;;:::o;1243:149::-;750:13;;-1:-1:-1;;;;;750:13:0;736:10;:27;728:36;;;;;;1340:45;1367:17;1340:26;:45::i;:::-;1243:149;:::o;926:120::-;628:5;;-1:-1:-1;;;;;628:5:0;614:10;:19;;:50;;-1:-1:-1;651:13:0;;-1:-1:-1;;;;;651:13:0;637:10;:27;614:50;606:59;;;;;;;;1010:29;1029:9;1010:18;:29::i;83:28::-;;;-1:-1:-1;;;;;83:28:0;;:::o;1398:249::-;-1:-1:-1;;;;;1488:31:0;;;;1480:40;;;;;;1564:13;;1535:62;;-1:-1:-1;;;;;1535:62:0;;;;1564:13;;1535:62;;1564:13;;1535:62;1607:13;:33;;-1:-1:-1;;1607:33:0;-1:-1:-1;;;;;1607:33:0;;;;;;;;;;1398:249::o;1052:185::-;-1:-1:-1;;;;;1126:23:0;;;;1118:32;;;;;;1186:5;;;1165:38;;-1:-1:-1;;;;;1165:38:0;;;;1186:5;;;1165:38;;;1213:5;:17;;-1:-1:-1;;1213:17:0;-1:-1:-1;;;;;1213:17:0;;;;;;;;;;1052:185::o",
   "source": "pragma solidity ^0.4.23;\n\ncontract Administratable {\n    address public owner;\n    address public administrator;\n\n\n    event OwnershipRenounced(address indexed previousOwner);\n    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n    event AdministratorshipTransferred(address indexed previousAdministrator, address indexed newAdministrator);\n\n    constructor() public {\n        owner = msg.sender;\n        administrator = msg.sender;\n    }\n\n    modifier onlyOwner() {\n        require(msg.sender == owner);\n        _;\n    }\n\n    modifier ownerOrAdministrator() {\n        require(msg.sender == owner || msg.sender == administrator);\n        _;\n    }\n\n    modifier onlyAdministrator() {\n        require(msg.sender == administrator);\n        _;\n    }\n\n    function renounceOwnership() public ownerOrAdministrator {\n        emit OwnershipRenounced(owner);\n        owner = address(0);\n    }\n\n    function transferOwnership(address _newOwner) public ownerOrAdministrator {\n        _transferOwnership(_newOwner);\n    }\n\n    function _transferOwnership(address _newOwner) internal {\n        require(_newOwner != address(0));\n        emit OwnershipTransferred(owner, _newOwner);\n        owner = _newOwner;\n    }\n\n    function transferAdministratorship(address _newAdministrator) public onlyAdministrator {\n        _transferAdministratorship(_newAdministrator);\n    }\n\n    function _transferAdministratorship(address _newAdministrator) internal {\n        require(_newAdministrator != address(0));\n        emit AdministratorshipTransferred(administrator, _newAdministrator);\n        administrator = _newAdministrator;\n    }\n}\n",
   "sourcePath": "contracts/Administratable.sol",
   "ast": {
     "absolutePath": "contracts/Administratable.sol",
     "exportedSymbols": {
       "Administratable": [
-        207
+        160
       ]
     },
-    "id": 208,
+    "id": 161,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 48,
+        "id": 1,
         "literals": [
           "solidity",
           "^",
@@ -144,7 +144,7 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:1"
+        "src": "0:24:0"
       },
       {
         "baseContracts": [],
@@ -152,20 +152,20 @@
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 207,
+        "id": 160,
         "linearizedBaseContracts": [
-          207
+          160
         ],
         "name": "Administratable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 50,
+            "id": 3,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 207,
-            "src": "57:20:1",
+            "scope": 160,
+            "src": "57:20:0",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -173,10 +173,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 49,
+              "id": 2,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "57:7:1",
+              "src": "57:7:0",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -187,11 +187,11 @@
           },
           {
             "constant": false,
-            "id": 52,
+            "id": 5,
             "name": "administrator",
             "nodeType": "VariableDeclaration",
-            "scope": 207,
-            "src": "83:28:1",
+            "scope": 160,
+            "src": "83:28:0",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -199,10 +199,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 51,
+              "id": 4,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "83:7:1",
+              "src": "83:7:0",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -214,21 +214,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 56,
+            "id": 9,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 55,
+              "id": 8,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 54,
+                  "id": 7,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 56,
-                  "src": "144:29:1",
+                  "scope": 9,
+                  "src": "144:29:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -236,10 +236,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 53,
+                    "id": 6,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "144:7:1",
+                    "src": "144:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -249,28 +249,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "143:31:1"
+              "src": "143:31:0"
             },
-            "src": "119:56:1"
+            "src": "119:56:0"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 62,
+            "id": 15,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 61,
+              "id": 14,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 58,
+                  "id": 11,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 62,
-                  "src": "207:29:1",
+                  "scope": 15,
+                  "src": "207:29:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -278,10 +278,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 57,
+                    "id": 10,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "207:7:1",
+                    "src": "207:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -292,12 +292,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 60,
+                  "id": 13,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 62,
-                  "src": "238:24:1",
+                  "scope": 15,
+                  "src": "238:24:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -305,10 +305,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 59,
+                    "id": 12,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "238:7:1",
+                    "src": "238:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -318,28 +318,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "206:57:1"
+              "src": "206:57:0"
             },
-            "src": "180:84:1"
+            "src": "180:84:0"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 68,
+            "id": 21,
             "name": "AdministratorshipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 67,
+              "id": 20,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 64,
+                  "id": 17,
                   "indexed": true,
                   "name": "previousAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 68,
-                  "src": "304:37:1",
+                  "scope": 21,
+                  "src": "304:37:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -347,10 +347,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 63,
+                    "id": 16,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "304:7:1",
+                    "src": "304:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -361,12 +361,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 66,
+                  "id": 19,
                   "indexed": true,
                   "name": "newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 68,
-                  "src": "343:32:1",
+                  "scope": 21,
+                  "src": "343:32:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -374,10 +374,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 65,
+                    "id": 18,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "343:7:1",
+                    "src": "343:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -387,32 +387,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "303:73:1"
+              "src": "303:73:0"
             },
-            "src": "269:108:1"
+            "src": "269:108:0"
           },
           {
             "body": {
-              "id": 81,
+              "id": 34,
               "nodeType": "Block",
-              "src": "404:71:1",
+              "src": "404:71:0",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 74,
+                    "id": 27,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 71,
+                      "id": 24,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "414:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "414:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -424,18 +424,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 72,
+                        "id": 25,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "422:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "422:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 73,
+                      "id": 26,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -443,38 +443,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "422:10:1",
+                      "src": "422:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "414:18:1",
+                    "src": "414:18:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 75,
+                  "id": 28,
                   "nodeType": "ExpressionStatement",
-                  "src": "414:18:1"
+                  "src": "414:18:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 79,
+                    "id": 32,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 76,
+                      "id": 29,
                       "name": "administrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 52,
-                      "src": "442:13:1",
+                      "referencedDeclaration": 5,
+                      "src": "442:13:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -486,18 +486,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 77,
+                        "id": 30,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "458:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "458:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 78,
+                      "id": 31,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -505,26 +505,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "458:10:1",
+                      "src": "458:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "442:26:1",
+                    "src": "442:26:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 80,
+                  "id": 33,
                   "nodeType": "ExpressionStatement",
-                  "src": "442:26:1"
+                  "src": "442:26:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 82,
+            "id": 35,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -532,29 +532,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 69,
+              "id": 22,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "394:2:1"
+              "src": "394:2:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 70,
+              "id": 23,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "404:0:1"
+              "src": "404:0:0"
             },
-            "scope": 207,
-            "src": "383:92:1",
+            "scope": 160,
+            "src": "383:92:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 92,
+              "id": 45,
               "nodeType": "Block",
-              "src": "502:56:1",
+              "src": "502:56:0",
               "statements": [
                 {
                   "expression": {
@@ -566,7 +566,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 88,
+                        "id": 41,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -575,18 +575,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 85,
+                            "id": 38,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "520:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "520:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 86,
+                          "id": 39,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -594,7 +594,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "520:10:1",
+                          "src": "520:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -604,18 +604,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 87,
+                          "id": 40,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 50,
-                          "src": "534:5:1",
+                          "referencedDeclaration": 3,
+                          "src": "534:5:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "520:19:1",
+                        "src": "520:19:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -629,21 +629,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 84,
+                      "id": 37,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "512:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "512:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 89,
+                    "id": 42,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -651,41 +651,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "512:28:1",
+                    "src": "512:28:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 90,
+                  "id": 43,
                   "nodeType": "ExpressionStatement",
-                  "src": "512:28:1"
+                  "src": "512:28:0"
                 },
                 {
-                  "id": 91,
+                  "id": 44,
                   "nodeType": "PlaceholderStatement",
-                  "src": "550:1:1"
+                  "src": "550:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 93,
+            "id": 46,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 83,
+              "id": 36,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "499:2:1"
+              "src": "499:2:0"
             },
-            "src": "481:77:1",
+            "src": "481:77:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 108,
+              "id": 61,
               "nodeType": "Block",
-              "src": "596:87:1",
+              "src": "596:87:0",
               "statements": [
                 {
                   "expression": {
@@ -697,7 +697,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 104,
+                        "id": 57,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -708,7 +708,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 99,
+                          "id": 52,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -717,18 +717,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 96,
+                              "id": 49,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "614:3:1",
+                              "referencedDeclaration": 11315,
+                              "src": "614:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 97,
+                            "id": 50,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -736,7 +736,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "614:10:1",
+                            "src": "614:10:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -746,18 +746,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 98,
+                            "id": 51,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 50,
-                            "src": "628:5:1",
+                            "referencedDeclaration": 3,
+                            "src": "628:5:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "614:19:1",
+                          "src": "614:19:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -771,7 +771,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 103,
+                          "id": 56,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -780,18 +780,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 100,
+                              "id": 53,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "637:3:1",
+                              "referencedDeclaration": 11315,
+                              "src": "637:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 101,
+                            "id": 54,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -799,7 +799,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "637:10:1",
+                            "src": "637:10:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -809,24 +809,24 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 102,
+                            "id": 55,
                             "name": "administrator",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 52,
-                            "src": "651:13:1",
+                            "referencedDeclaration": 5,
+                            "src": "651:13:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "637:27:1",
+                          "src": "637:27:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "614:50:1",
+                        "src": "614:50:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -840,21 +840,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 95,
+                      "id": 48,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "606:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "606:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 105,
+                    "id": 58,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -862,41 +862,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "606:59:1",
+                    "src": "606:59:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 106,
+                  "id": 59,
                   "nodeType": "ExpressionStatement",
-                  "src": "606:59:1"
+                  "src": "606:59:0"
                 },
                 {
-                  "id": 107,
+                  "id": 60,
                   "nodeType": "PlaceholderStatement",
-                  "src": "675:1:1"
+                  "src": "675:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 109,
+            "id": 62,
             "name": "ownerOrAdministrator",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 94,
+              "id": 47,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "593:2:1"
+              "src": "593:2:0"
             },
-            "src": "564:119:1",
+            "src": "564:119:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 119,
+              "id": 72,
               "nodeType": "Block",
-              "src": "718:64:1",
+              "src": "718:64:0",
               "statements": [
                 {
                   "expression": {
@@ -908,7 +908,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 115,
+                        "id": 68,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -917,18 +917,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 112,
+                            "id": 65,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "736:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "736:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 113,
+                          "id": 66,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -936,7 +936,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "736:10:1",
+                          "src": "736:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -946,18 +946,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 114,
+                          "id": 67,
                           "name": "administrator",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 52,
-                          "src": "750:13:1",
+                          "referencedDeclaration": 5,
+                          "src": "750:13:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "736:27:1",
+                        "src": "736:27:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -971,21 +971,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 111,
+                      "id": 64,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "728:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "728:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 116,
+                    "id": 69,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -993,41 +993,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "728:36:1",
+                    "src": "728:36:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 117,
+                  "id": 70,
                   "nodeType": "ExpressionStatement",
-                  "src": "728:36:1"
+                  "src": "728:36:0"
                 },
                 {
-                  "id": 118,
+                  "id": 71,
                   "nodeType": "PlaceholderStatement",
-                  "src": "774:1:1"
+                  "src": "774:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 120,
+            "id": 73,
             "name": "onlyAdministrator",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 110,
+              "id": 63,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "715:2:1"
+              "src": "715:2:0"
             },
-            "src": "689:93:1",
+            "src": "689:93:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 135,
+              "id": 88,
               "nodeType": "Block",
-              "src": "845:75:1",
+              "src": "845:75:0",
               "statements": [
                 {
                   "eventCall": {
@@ -1035,12 +1035,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 126,
+                        "id": 79,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 50,
-                        "src": "879:5:1",
+                        "referencedDeclaration": 3,
+                        "src": "879:5:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1054,18 +1054,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 125,
+                      "id": 78,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 56,
-                      "src": "860:18:1",
+                      "referencedDeclaration": 9,
+                      "src": "860:18:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 127,
+                    "id": 80,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1073,32 +1073,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "860:25:1",
+                    "src": "860:25:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 128,
+                  "id": 81,
                   "nodeType": "EmitStatement",
-                  "src": "855:30:1"
+                  "src": "855:30:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 133,
+                    "id": 86,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 129,
+                      "id": 82,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "895:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "895:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1112,14 +1112,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 131,
+                          "id": 84,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "911:1:1",
+                          "src": "911:1:0",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1135,20 +1135,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 130,
+                        "id": 83,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "903:7:1",
+                        "src": "903:7:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 132,
+                      "id": 85,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1156,76 +1156,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "903:10:1",
+                      "src": "903:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "895:18:1",
+                    "src": "895:18:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 134,
+                  "id": 87,
                   "nodeType": "ExpressionStatement",
-                  "src": "895:18:1"
+                  "src": "895:18:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 136,
+            "id": 89,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 123,
+                "id": 76,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 122,
+                  "id": 75,
                   "name": "ownerOrAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 109,
-                  "src": "824:20:1",
+                  "referencedDeclaration": 62,
+                  "src": "824:20:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "824:20:1"
+                "src": "824:20:0"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 121,
+              "id": 74,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "814:2:1"
+              "src": "814:2:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 124,
+              "id": 77,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "845:0:1"
+              "src": "845:0:0"
             },
-            "scope": 207,
-            "src": "788:132:1",
+            "scope": 160,
+            "src": "788:132:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 147,
+              "id": 100,
               "nodeType": "Block",
-              "src": "1000:46:1",
+              "src": "1000:46:0",
               "statements": [
                 {
                   "expression": {
@@ -1233,12 +1233,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 144,
+                        "id": 97,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 138,
-                        "src": "1029:9:1",
+                        "referencedDeclaration": 91,
+                        "src": "1029:9:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1252,18 +1252,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 143,
+                      "id": 96,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 171,
-                      "src": "1010:18:1",
+                      "referencedDeclaration": 124,
+                      "src": "1010:18:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 145,
+                    "id": 98,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1271,57 +1271,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1010:29:1",
+                    "src": "1010:29:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 146,
+                  "id": 99,
                   "nodeType": "ExpressionStatement",
-                  "src": "1010:29:1"
+                  "src": "1010:29:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 148,
+            "id": 101,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 141,
+                "id": 94,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 140,
+                  "id": 93,
                   "name": "ownerOrAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 109,
-                  "src": "979:20:1",
+                  "referencedDeclaration": 62,
+                  "src": "979:20:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "979:20:1"
+                "src": "979:20:0"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 139,
+              "id": 92,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 138,
+                  "id": 91,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 148,
-                  "src": "953:17:1",
+                  "scope": 101,
+                  "src": "953:17:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1329,10 +1329,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 137,
+                    "id": 90,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "953:7:1",
+                    "src": "953:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1342,26 +1342,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "952:19:1"
+              "src": "952:19:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 142,
+              "id": 95,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1000:0:1"
+              "src": "1000:0:0"
             },
-            "scope": 207,
-            "src": "926:120:1",
+            "scope": 160,
+            "src": "926:120:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 170,
+              "id": 123,
               "nodeType": "Block",
-              "src": "1108:129:1",
+              "src": "1108:129:0",
               "statements": [
                 {
                   "expression": {
@@ -1373,19 +1373,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 158,
+                        "id": 111,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 154,
+                          "id": 107,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 150,
-                          "src": "1126:9:1",
+                          "referencedDeclaration": 103,
+                          "src": "1126:9:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1399,14 +1399,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 156,
+                              "id": 109,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1147:1:1",
+                              "src": "1147:1:0",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1422,20 +1422,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 155,
+                            "id": 108,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1139:7:1",
+                            "src": "1139:7:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 157,
+                          "id": 110,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1443,13 +1443,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1139:10:1",
+                          "src": "1139:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1126:23:1",
+                        "src": "1126:23:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1463,21 +1463,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 153,
+                      "id": 106,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1118:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1118:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 159,
+                    "id": 112,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1485,15 +1485,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1118:32:1",
+                    "src": "1118:32:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 160,
+                  "id": 113,
                   "nodeType": "ExpressionStatement",
-                  "src": "1118:32:1"
+                  "src": "1118:32:0"
                 },
                 {
                   "eventCall": {
@@ -1501,12 +1501,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 162,
+                        "id": 115,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 50,
-                        "src": "1186:5:1",
+                        "referencedDeclaration": 3,
+                        "src": "1186:5:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1514,12 +1514,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 163,
+                        "id": 116,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 150,
-                        "src": "1193:9:1",
+                        "referencedDeclaration": 103,
+                        "src": "1193:9:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1537,18 +1537,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 161,
+                      "id": 114,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 62,
-                      "src": "1165:20:1",
+                      "referencedDeclaration": 15,
+                      "src": "1165:20:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 164,
+                    "id": 117,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1556,32 +1556,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1165:38:1",
+                    "src": "1165:38:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 165,
+                  "id": 118,
                   "nodeType": "EmitStatement",
-                  "src": "1160:43:1"
+                  "src": "1160:43:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 168,
+                    "id": 121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 166,
+                      "id": 119,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "1213:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "1213:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1591,31 +1591,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 167,
+                      "id": 120,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 150,
-                      "src": "1221:9:1",
+                      "referencedDeclaration": 103,
+                      "src": "1221:9:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1213:17:1",
+                    "src": "1213:17:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 169,
+                  "id": 122,
                   "nodeType": "ExpressionStatement",
-                  "src": "1213:17:1"
+                  "src": "1213:17:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 171,
+            "id": 124,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1623,16 +1623,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 151,
+              "id": 104,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 150,
+                  "id": 103,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 171,
-                  "src": "1080:17:1",
+                  "scope": 124,
+                  "src": "1080:17:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1640,10 +1640,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 149,
+                    "id": 102,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1080:7:1",
+                    "src": "1080:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1653,26 +1653,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1079:19:1"
+              "src": "1079:19:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 152,
+              "id": 105,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1108:0:1"
+              "src": "1108:0:0"
             },
-            "scope": 207,
-            "src": "1052:185:1",
+            "scope": 160,
+            "src": "1052:185:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 182,
+              "id": 135,
               "nodeType": "Block",
-              "src": "1330:62:1",
+              "src": "1330:62:0",
               "statements": [
                 {
                   "expression": {
@@ -1680,12 +1680,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 179,
+                        "id": 132,
                         "name": "_newAdministrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 173,
-                        "src": "1367:17:1",
+                        "referencedDeclaration": 126,
+                        "src": "1367:17:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1699,18 +1699,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 178,
+                      "id": 131,
                       "name": "_transferAdministratorship",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 206,
-                      "src": "1340:26:1",
+                      "referencedDeclaration": 159,
+                      "src": "1340:26:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 180,
+                    "id": 133,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1718,57 +1718,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1340:45:1",
+                    "src": "1340:45:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 181,
+                  "id": 134,
                   "nodeType": "ExpressionStatement",
-                  "src": "1340:45:1"
+                  "src": "1340:45:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 183,
+            "id": 136,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 176,
+                "id": 129,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 175,
+                  "id": 128,
                   "name": "onlyAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 120,
-                  "src": "1312:17:1",
+                  "referencedDeclaration": 73,
+                  "src": "1312:17:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1312:17:1"
+                "src": "1312:17:0"
               }
             ],
             "name": "transferAdministratorship",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 174,
+              "id": 127,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 173,
+                  "id": 126,
                   "name": "_newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 183,
-                  "src": "1278:25:1",
+                  "scope": 136,
+                  "src": "1278:25:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1776,10 +1776,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 172,
+                    "id": 125,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1278:7:1",
+                    "src": "1278:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1789,26 +1789,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1277:27:1"
+              "src": "1277:27:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 177,
+              "id": 130,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1330:0:1"
+              "src": "1330:0:0"
             },
-            "scope": 207,
-            "src": "1243:149:1",
+            "scope": 160,
+            "src": "1243:149:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 205,
+              "id": 158,
               "nodeType": "Block",
-              "src": "1470:177:1",
+              "src": "1470:177:0",
               "statements": [
                 {
                   "expression": {
@@ -1820,19 +1820,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 193,
+                        "id": 146,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 189,
+                          "id": 142,
                           "name": "_newAdministrator",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 185,
-                          "src": "1488:17:1",
+                          "referencedDeclaration": 138,
+                          "src": "1488:17:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1846,14 +1846,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 191,
+                              "id": 144,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1517:1:1",
+                              "src": "1517:1:0",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1869,20 +1869,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 190,
+                            "id": 143,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1509:7:1",
+                            "src": "1509:7:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 192,
+                          "id": 145,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1890,13 +1890,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1509:10:1",
+                          "src": "1509:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1488:31:1",
+                        "src": "1488:31:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1910,21 +1910,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 188,
+                      "id": 141,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1480:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1480:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 194,
+                    "id": 147,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1932,15 +1932,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1480:40:1",
+                    "src": "1480:40:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 195,
+                  "id": 148,
                   "nodeType": "ExpressionStatement",
-                  "src": "1480:40:1"
+                  "src": "1480:40:0"
                 },
                 {
                   "eventCall": {
@@ -1948,12 +1948,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 197,
+                        "id": 150,
                         "name": "administrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 52,
-                        "src": "1564:13:1",
+                        "referencedDeclaration": 5,
+                        "src": "1564:13:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1961,12 +1961,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 198,
+                        "id": 151,
                         "name": "_newAdministrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 185,
-                        "src": "1579:17:1",
+                        "referencedDeclaration": 138,
+                        "src": "1579:17:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1984,18 +1984,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 196,
+                      "id": 149,
                       "name": "AdministratorshipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 68,
-                      "src": "1535:28:1",
+                      "referencedDeclaration": 21,
+                      "src": "1535:28:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 199,
+                    "id": 152,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2003,32 +2003,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1535:62:1",
+                    "src": "1535:62:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 200,
+                  "id": 153,
                   "nodeType": "EmitStatement",
-                  "src": "1530:67:1"
+                  "src": "1530:67:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 203,
+                    "id": 156,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 201,
+                      "id": 154,
                       "name": "administrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 52,
-                      "src": "1607:13:1",
+                      "referencedDeclaration": 5,
+                      "src": "1607:13:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2038,31 +2038,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 202,
+                      "id": 155,
                       "name": "_newAdministrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 185,
-                      "src": "1623:17:1",
+                      "referencedDeclaration": 138,
+                      "src": "1623:17:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1607:33:1",
+                    "src": "1607:33:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 204,
+                  "id": 157,
                   "nodeType": "ExpressionStatement",
-                  "src": "1607:33:1"
+                  "src": "1607:33:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 206,
+            "id": 159,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2070,16 +2070,16 @@
             "name": "_transferAdministratorship",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 186,
+              "id": 139,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 185,
+                  "id": 138,
                   "name": "_newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 206,
-                  "src": "1434:25:1",
+                  "scope": 159,
+                  "src": "1434:25:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2087,10 +2087,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 184,
+                    "id": 137,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1434:7:1",
+                    "src": "1434:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2100,40 +2100,40 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1433:27:1"
+              "src": "1433:27:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 187,
+              "id": 140,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1470:0:1"
+              "src": "1470:0:0"
             },
-            "scope": 207,
-            "src": "1398:249:1",
+            "scope": 160,
+            "src": "1398:249:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 208,
-        "src": "26:1623:1"
+        "scope": 161,
+        "src": "26:1623:0"
       }
     ],
-    "src": "0:1650:1"
+    "src": "0:1650:0"
   },
   "legacyAST": {
     "absolutePath": "contracts/Administratable.sol",
     "exportedSymbols": {
       "Administratable": [
-        207
+        160
       ]
     },
-    "id": 208,
+    "id": 161,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 48,
+        "id": 1,
         "literals": [
           "solidity",
           "^",
@@ -2141,7 +2141,7 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:1"
+        "src": "0:24:0"
       },
       {
         "baseContracts": [],
@@ -2149,20 +2149,20 @@
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 207,
+        "id": 160,
         "linearizedBaseContracts": [
-          207
+          160
         ],
         "name": "Administratable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 50,
+            "id": 3,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 207,
-            "src": "57:20:1",
+            "scope": 160,
+            "src": "57:20:0",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -2170,10 +2170,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 49,
+              "id": 2,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "57:7:1",
+              "src": "57:7:0",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -2184,11 +2184,11 @@
           },
           {
             "constant": false,
-            "id": 52,
+            "id": 5,
             "name": "administrator",
             "nodeType": "VariableDeclaration",
-            "scope": 207,
-            "src": "83:28:1",
+            "scope": 160,
+            "src": "83:28:0",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -2196,10 +2196,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 51,
+              "id": 4,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "83:7:1",
+              "src": "83:7:0",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -2211,21 +2211,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 56,
+            "id": 9,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 55,
+              "id": 8,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 54,
+                  "id": 7,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 56,
-                  "src": "144:29:1",
+                  "scope": 9,
+                  "src": "144:29:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2233,10 +2233,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 53,
+                    "id": 6,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "144:7:1",
+                    "src": "144:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2246,28 +2246,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "143:31:1"
+              "src": "143:31:0"
             },
-            "src": "119:56:1"
+            "src": "119:56:0"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 62,
+            "id": 15,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 61,
+              "id": 14,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 58,
+                  "id": 11,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 62,
-                  "src": "207:29:1",
+                  "scope": 15,
+                  "src": "207:29:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2275,10 +2275,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 57,
+                    "id": 10,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "207:7:1",
+                    "src": "207:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2289,12 +2289,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 60,
+                  "id": 13,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 62,
-                  "src": "238:24:1",
+                  "scope": 15,
+                  "src": "238:24:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2302,10 +2302,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 59,
+                    "id": 12,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "238:7:1",
+                    "src": "238:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2315,28 +2315,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "206:57:1"
+              "src": "206:57:0"
             },
-            "src": "180:84:1"
+            "src": "180:84:0"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 68,
+            "id": 21,
             "name": "AdministratorshipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 67,
+              "id": 20,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 64,
+                  "id": 17,
                   "indexed": true,
                   "name": "previousAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 68,
-                  "src": "304:37:1",
+                  "scope": 21,
+                  "src": "304:37:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2344,10 +2344,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 63,
+                    "id": 16,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "304:7:1",
+                    "src": "304:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2358,12 +2358,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 66,
+                  "id": 19,
                   "indexed": true,
                   "name": "newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 68,
-                  "src": "343:32:1",
+                  "scope": 21,
+                  "src": "343:32:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2371,10 +2371,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 65,
+                    "id": 18,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "343:7:1",
+                    "src": "343:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2384,32 +2384,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "303:73:1"
+              "src": "303:73:0"
             },
-            "src": "269:108:1"
+            "src": "269:108:0"
           },
           {
             "body": {
-              "id": 81,
+              "id": 34,
               "nodeType": "Block",
-              "src": "404:71:1",
+              "src": "404:71:0",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 74,
+                    "id": 27,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 71,
+                      "id": 24,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "414:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "414:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2421,18 +2421,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 72,
+                        "id": 25,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "422:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "422:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 73,
+                      "id": 26,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2440,38 +2440,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "422:10:1",
+                      "src": "422:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "414:18:1",
+                    "src": "414:18:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 75,
+                  "id": 28,
                   "nodeType": "ExpressionStatement",
-                  "src": "414:18:1"
+                  "src": "414:18:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 79,
+                    "id": 32,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 76,
+                      "id": 29,
                       "name": "administrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 52,
-                      "src": "442:13:1",
+                      "referencedDeclaration": 5,
+                      "src": "442:13:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2483,18 +2483,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 77,
+                        "id": 30,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "458:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "458:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 78,
+                      "id": 31,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2502,26 +2502,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "458:10:1",
+                      "src": "458:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "442:26:1",
+                    "src": "442:26:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 80,
+                  "id": 33,
                   "nodeType": "ExpressionStatement",
-                  "src": "442:26:1"
+                  "src": "442:26:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 82,
+            "id": 35,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -2529,29 +2529,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 69,
+              "id": 22,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "394:2:1"
+              "src": "394:2:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 70,
+              "id": 23,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "404:0:1"
+              "src": "404:0:0"
             },
-            "scope": 207,
-            "src": "383:92:1",
+            "scope": 160,
+            "src": "383:92:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 92,
+              "id": 45,
               "nodeType": "Block",
-              "src": "502:56:1",
+              "src": "502:56:0",
               "statements": [
                 {
                   "expression": {
@@ -2563,7 +2563,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 88,
+                        "id": 41,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2572,18 +2572,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 85,
+                            "id": 38,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "520:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "520:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 86,
+                          "id": 39,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2591,7 +2591,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "520:10:1",
+                          "src": "520:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2601,18 +2601,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 87,
+                          "id": 40,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 50,
-                          "src": "534:5:1",
+                          "referencedDeclaration": 3,
+                          "src": "534:5:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "520:19:1",
+                        "src": "520:19:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2626,21 +2626,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 84,
+                      "id": 37,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "512:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "512:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 89,
+                    "id": 42,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2648,41 +2648,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "512:28:1",
+                    "src": "512:28:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 90,
+                  "id": 43,
                   "nodeType": "ExpressionStatement",
-                  "src": "512:28:1"
+                  "src": "512:28:0"
                 },
                 {
-                  "id": 91,
+                  "id": 44,
                   "nodeType": "PlaceholderStatement",
-                  "src": "550:1:1"
+                  "src": "550:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 93,
+            "id": 46,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 83,
+              "id": 36,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "499:2:1"
+              "src": "499:2:0"
             },
-            "src": "481:77:1",
+            "src": "481:77:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 108,
+              "id": 61,
               "nodeType": "Block",
-              "src": "596:87:1",
+              "src": "596:87:0",
               "statements": [
                 {
                   "expression": {
@@ -2694,7 +2694,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 104,
+                        "id": 57,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2705,7 +2705,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 99,
+                          "id": 52,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2714,18 +2714,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 96,
+                              "id": 49,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "614:3:1",
+                              "referencedDeclaration": 11315,
+                              "src": "614:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 97,
+                            "id": 50,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2733,7 +2733,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "614:10:1",
+                            "src": "614:10:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2743,18 +2743,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 98,
+                            "id": 51,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 50,
-                            "src": "628:5:1",
+                            "referencedDeclaration": 3,
+                            "src": "628:5:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "614:19:1",
+                          "src": "614:19:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2768,7 +2768,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 103,
+                          "id": 56,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2777,18 +2777,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 100,
+                              "id": 53,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "637:3:1",
+                              "referencedDeclaration": 11315,
+                              "src": "637:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 101,
+                            "id": 54,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2796,7 +2796,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "637:10:1",
+                            "src": "637:10:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2806,24 +2806,24 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 102,
+                            "id": 55,
                             "name": "administrator",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 52,
-                            "src": "651:13:1",
+                            "referencedDeclaration": 5,
+                            "src": "651:13:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "637:27:1",
+                          "src": "637:27:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "614:50:1",
+                        "src": "614:50:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2837,21 +2837,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 95,
+                      "id": 48,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "606:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "606:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 105,
+                    "id": 58,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2859,41 +2859,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "606:59:1",
+                    "src": "606:59:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 106,
+                  "id": 59,
                   "nodeType": "ExpressionStatement",
-                  "src": "606:59:1"
+                  "src": "606:59:0"
                 },
                 {
-                  "id": 107,
+                  "id": 60,
                   "nodeType": "PlaceholderStatement",
-                  "src": "675:1:1"
+                  "src": "675:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 109,
+            "id": 62,
             "name": "ownerOrAdministrator",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 94,
+              "id": 47,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "593:2:1"
+              "src": "593:2:0"
             },
-            "src": "564:119:1",
+            "src": "564:119:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 119,
+              "id": 72,
               "nodeType": "Block",
-              "src": "718:64:1",
+              "src": "718:64:0",
               "statements": [
                 {
                   "expression": {
@@ -2905,7 +2905,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 115,
+                        "id": 68,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2914,18 +2914,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 112,
+                            "id": 65,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "736:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "736:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 113,
+                          "id": 66,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2933,7 +2933,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "736:10:1",
+                          "src": "736:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2943,18 +2943,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 114,
+                          "id": 67,
                           "name": "administrator",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 52,
-                          "src": "750:13:1",
+                          "referencedDeclaration": 5,
+                          "src": "750:13:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "736:27:1",
+                        "src": "736:27:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2968,21 +2968,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 111,
+                      "id": 64,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "728:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "728:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 116,
+                    "id": 69,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2990,41 +2990,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "728:36:1",
+                    "src": "728:36:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 117,
+                  "id": 70,
                   "nodeType": "ExpressionStatement",
-                  "src": "728:36:1"
+                  "src": "728:36:0"
                 },
                 {
-                  "id": 118,
+                  "id": 71,
                   "nodeType": "PlaceholderStatement",
-                  "src": "774:1:1"
+                  "src": "774:1:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 120,
+            "id": 73,
             "name": "onlyAdministrator",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 110,
+              "id": 63,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "715:2:1"
+              "src": "715:2:0"
             },
-            "src": "689:93:1",
+            "src": "689:93:0",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 135,
+              "id": 88,
               "nodeType": "Block",
-              "src": "845:75:1",
+              "src": "845:75:0",
               "statements": [
                 {
                   "eventCall": {
@@ -3032,12 +3032,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 126,
+                        "id": 79,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 50,
-                        "src": "879:5:1",
+                        "referencedDeclaration": 3,
+                        "src": "879:5:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3051,18 +3051,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 125,
+                      "id": 78,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 56,
-                      "src": "860:18:1",
+                      "referencedDeclaration": 9,
+                      "src": "860:18:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 127,
+                    "id": 80,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3070,32 +3070,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "860:25:1",
+                    "src": "860:25:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 128,
+                  "id": 81,
                   "nodeType": "EmitStatement",
-                  "src": "855:30:1"
+                  "src": "855:30:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 133,
+                    "id": 86,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 129,
+                      "id": 82,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "895:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "895:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3109,14 +3109,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 131,
+                          "id": 84,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "911:1:1",
+                          "src": "911:1:0",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -3132,20 +3132,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 130,
+                        "id": 83,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "903:7:1",
+                        "src": "903:7:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 132,
+                      "id": 85,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3153,76 +3153,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "903:10:1",
+                      "src": "903:10:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "895:18:1",
+                    "src": "895:18:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 134,
+                  "id": 87,
                   "nodeType": "ExpressionStatement",
-                  "src": "895:18:1"
+                  "src": "895:18:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 136,
+            "id": 89,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 123,
+                "id": 76,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 122,
+                  "id": 75,
                   "name": "ownerOrAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 109,
-                  "src": "824:20:1",
+                  "referencedDeclaration": 62,
+                  "src": "824:20:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "824:20:1"
+                "src": "824:20:0"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 121,
+              "id": 74,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "814:2:1"
+              "src": "814:2:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 124,
+              "id": 77,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "845:0:1"
+              "src": "845:0:0"
             },
-            "scope": 207,
-            "src": "788:132:1",
+            "scope": 160,
+            "src": "788:132:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 147,
+              "id": 100,
               "nodeType": "Block",
-              "src": "1000:46:1",
+              "src": "1000:46:0",
               "statements": [
                 {
                   "expression": {
@@ -3230,12 +3230,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 144,
+                        "id": 97,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 138,
-                        "src": "1029:9:1",
+                        "referencedDeclaration": 91,
+                        "src": "1029:9:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3249,18 +3249,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 143,
+                      "id": 96,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 171,
-                      "src": "1010:18:1",
+                      "referencedDeclaration": 124,
+                      "src": "1010:18:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 145,
+                    "id": 98,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3268,57 +3268,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1010:29:1",
+                    "src": "1010:29:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 146,
+                  "id": 99,
                   "nodeType": "ExpressionStatement",
-                  "src": "1010:29:1"
+                  "src": "1010:29:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 148,
+            "id": 101,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 141,
+                "id": 94,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 140,
+                  "id": 93,
                   "name": "ownerOrAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 109,
-                  "src": "979:20:1",
+                  "referencedDeclaration": 62,
+                  "src": "979:20:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "979:20:1"
+                "src": "979:20:0"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 139,
+              "id": 92,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 138,
+                  "id": 91,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 148,
-                  "src": "953:17:1",
+                  "scope": 101,
+                  "src": "953:17:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3326,10 +3326,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 137,
+                    "id": 90,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "953:7:1",
+                    "src": "953:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3339,26 +3339,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "952:19:1"
+              "src": "952:19:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 142,
+              "id": 95,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1000:0:1"
+              "src": "1000:0:0"
             },
-            "scope": 207,
-            "src": "926:120:1",
+            "scope": 160,
+            "src": "926:120:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 170,
+              "id": 123,
               "nodeType": "Block",
-              "src": "1108:129:1",
+              "src": "1108:129:0",
               "statements": [
                 {
                   "expression": {
@@ -3370,19 +3370,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 158,
+                        "id": 111,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 154,
+                          "id": 107,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 150,
-                          "src": "1126:9:1",
+                          "referencedDeclaration": 103,
+                          "src": "1126:9:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3396,14 +3396,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 156,
+                              "id": 109,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1147:1:1",
+                              "src": "1147:1:0",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -3419,20 +3419,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 155,
+                            "id": 108,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1139:7:1",
+                            "src": "1139:7:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 157,
+                          "id": 110,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3440,13 +3440,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1139:10:1",
+                          "src": "1139:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1126:23:1",
+                        "src": "1126:23:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3460,21 +3460,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 153,
+                      "id": 106,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1118:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1118:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 159,
+                    "id": 112,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3482,15 +3482,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1118:32:1",
+                    "src": "1118:32:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 160,
+                  "id": 113,
                   "nodeType": "ExpressionStatement",
-                  "src": "1118:32:1"
+                  "src": "1118:32:0"
                 },
                 {
                   "eventCall": {
@@ -3498,12 +3498,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 162,
+                        "id": 115,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 50,
-                        "src": "1186:5:1",
+                        "referencedDeclaration": 3,
+                        "src": "1186:5:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3511,12 +3511,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 163,
+                        "id": 116,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 150,
-                        "src": "1193:9:1",
+                        "referencedDeclaration": 103,
+                        "src": "1193:9:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3534,18 +3534,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 161,
+                      "id": 114,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 62,
-                      "src": "1165:20:1",
+                      "referencedDeclaration": 15,
+                      "src": "1165:20:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 164,
+                    "id": 117,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3553,32 +3553,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1165:38:1",
+                    "src": "1165:38:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 165,
+                  "id": 118,
                   "nodeType": "EmitStatement",
-                  "src": "1160:43:1"
+                  "src": "1160:43:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 168,
+                    "id": 121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 166,
+                      "id": 119,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 50,
-                      "src": "1213:5:1",
+                      "referencedDeclaration": 3,
+                      "src": "1213:5:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3588,31 +3588,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 167,
+                      "id": 120,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 150,
-                      "src": "1221:9:1",
+                      "referencedDeclaration": 103,
+                      "src": "1221:9:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1213:17:1",
+                    "src": "1213:17:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 169,
+                  "id": 122,
                   "nodeType": "ExpressionStatement",
-                  "src": "1213:17:1"
+                  "src": "1213:17:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 171,
+            "id": 124,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3620,16 +3620,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 151,
+              "id": 104,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 150,
+                  "id": 103,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 171,
-                  "src": "1080:17:1",
+                  "scope": 124,
+                  "src": "1080:17:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3637,10 +3637,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 149,
+                    "id": 102,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1080:7:1",
+                    "src": "1080:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3650,26 +3650,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1079:19:1"
+              "src": "1079:19:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 152,
+              "id": 105,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1108:0:1"
+              "src": "1108:0:0"
             },
-            "scope": 207,
-            "src": "1052:185:1",
+            "scope": 160,
+            "src": "1052:185:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 182,
+              "id": 135,
               "nodeType": "Block",
-              "src": "1330:62:1",
+              "src": "1330:62:0",
               "statements": [
                 {
                   "expression": {
@@ -3677,12 +3677,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 179,
+                        "id": 132,
                         "name": "_newAdministrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 173,
-                        "src": "1367:17:1",
+                        "referencedDeclaration": 126,
+                        "src": "1367:17:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3696,18 +3696,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 178,
+                      "id": 131,
                       "name": "_transferAdministratorship",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 206,
-                      "src": "1340:26:1",
+                      "referencedDeclaration": 159,
+                      "src": "1340:26:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 180,
+                    "id": 133,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3715,57 +3715,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1340:45:1",
+                    "src": "1340:45:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 181,
+                  "id": 134,
                   "nodeType": "ExpressionStatement",
-                  "src": "1340:45:1"
+                  "src": "1340:45:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 183,
+            "id": 136,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 176,
+                "id": 129,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 175,
+                  "id": 128,
                   "name": "onlyAdministrator",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 120,
-                  "src": "1312:17:1",
+                  "referencedDeclaration": 73,
+                  "src": "1312:17:0",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1312:17:1"
+                "src": "1312:17:0"
               }
             ],
             "name": "transferAdministratorship",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 174,
+              "id": 127,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 173,
+                  "id": 126,
                   "name": "_newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 183,
-                  "src": "1278:25:1",
+                  "scope": 136,
+                  "src": "1278:25:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3773,10 +3773,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 172,
+                    "id": 125,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1278:7:1",
+                    "src": "1278:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3786,26 +3786,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1277:27:1"
+              "src": "1277:27:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 177,
+              "id": 130,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1330:0:1"
+              "src": "1330:0:0"
             },
-            "scope": 207,
-            "src": "1243:149:1",
+            "scope": 160,
+            "src": "1243:149:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 205,
+              "id": 158,
               "nodeType": "Block",
-              "src": "1470:177:1",
+              "src": "1470:177:0",
               "statements": [
                 {
                   "expression": {
@@ -3817,19 +3817,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 193,
+                        "id": 146,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 189,
+                          "id": 142,
                           "name": "_newAdministrator",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 185,
-                          "src": "1488:17:1",
+                          "referencedDeclaration": 138,
+                          "src": "1488:17:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3843,14 +3843,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 191,
+                              "id": 144,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1517:1:1",
+                              "src": "1517:1:0",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -3866,20 +3866,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 190,
+                            "id": 143,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1509:7:1",
+                            "src": "1509:7:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 192,
+                          "id": 145,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3887,13 +3887,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1509:10:1",
+                          "src": "1509:10:0",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1488:31:1",
+                        "src": "1488:31:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3907,21 +3907,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 188,
+                      "id": 141,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1480:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1480:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 194,
+                    "id": 147,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3929,15 +3929,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1480:40:1",
+                    "src": "1480:40:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 195,
+                  "id": 148,
                   "nodeType": "ExpressionStatement",
-                  "src": "1480:40:1"
+                  "src": "1480:40:0"
                 },
                 {
                   "eventCall": {
@@ -3945,12 +3945,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 197,
+                        "id": 150,
                         "name": "administrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 52,
-                        "src": "1564:13:1",
+                        "referencedDeclaration": 5,
+                        "src": "1564:13:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3958,12 +3958,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 198,
+                        "id": 151,
                         "name": "_newAdministrator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 185,
-                        "src": "1579:17:1",
+                        "referencedDeclaration": 138,
+                        "src": "1579:17:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3981,18 +3981,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 196,
+                      "id": 149,
                       "name": "AdministratorshipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 68,
-                      "src": "1535:28:1",
+                      "referencedDeclaration": 21,
+                      "src": "1535:28:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 199,
+                    "id": 152,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4000,32 +4000,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1535:62:1",
+                    "src": "1535:62:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 200,
+                  "id": 153,
                   "nodeType": "EmitStatement",
-                  "src": "1530:67:1"
+                  "src": "1530:67:0"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 203,
+                    "id": 156,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 201,
+                      "id": 154,
                       "name": "administrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 52,
-                      "src": "1607:13:1",
+                      "referencedDeclaration": 5,
+                      "src": "1607:13:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -4035,31 +4035,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 202,
+                      "id": 155,
                       "name": "_newAdministrator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 185,
-                      "src": "1623:17:1",
+                      "referencedDeclaration": 138,
+                      "src": "1623:17:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1607:33:1",
+                    "src": "1607:33:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 204,
+                  "id": 157,
                   "nodeType": "ExpressionStatement",
-                  "src": "1607:33:1"
+                  "src": "1607:33:0"
                 }
               ]
             },
             "documentation": null,
-            "id": 206,
+            "id": 159,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4067,16 +4067,16 @@
             "name": "_transferAdministratorship",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 186,
+              "id": 139,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 185,
+                  "id": 138,
                   "name": "_newAdministrator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 206,
-                  "src": "1434:25:1",
+                  "scope": 159,
+                  "src": "1434:25:0",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4084,10 +4084,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 184,
+                    "id": 137,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1434:7:1",
+                    "src": "1434:7:0",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4097,27 +4097,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1433:27:1"
+              "src": "1433:27:0"
             },
             "payable": false,
             "returnParameters": {
-              "id": 187,
+              "id": 140,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1470:0:1"
+              "src": "1470:0:0"
             },
-            "scope": 207,
-            "src": "1398:249:1",
+            "scope": 160,
+            "src": "1398:249:0",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 208,
-        "src": "26:1623:1"
+        "scope": 161,
+        "src": "26:1623:0"
       }
     ],
-    "src": "0:1650:1"
+    "src": "0:1650:0"
   },
   "compiler": {
     "name": "solc",
@@ -4125,5 +4125,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.127Z"
+  "updatedAt": "2019-01-10T13:57:39.958Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/AutoPayout.json b/blockchain/source/migration_artifacts/contracts/AutoPayout.json
index b19e1194e..25970d6ba 100644
--- a/blockchain/source/migration_artifacts/contracts/AutoPayout.json
+++ b/blockchain/source/migration_artifacts/contracts/AutoPayout.json
@@ -193,24 +193,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405160408061083b8339810160405280516020909101516000805460018054600160a060020a0319908116600160a060020a039687161790915560028054821695909416949094179092553391831682179092161781556107c290819061007990396000f3006080604052600436106100825763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166312fbd33c811461008757806341c0e1b5146100c9578063715018a6146100e05780638a12ae40146100f55780638da5cb5b14610119578063b5dfc1d51461014a578063f2fde38b1461016b575b600080fd5b34801561009357600080fd5b506100a8600160a060020a036004351661018c565b60408051928352600160a060020a0390911660208301528051918290030190f35b3480156100d557600080fd5b506100de6101ae565b005b3480156100ec57600080fd5b506100de610343565b34801561010157600080fd5b506100de600435600160a060020a03602435166103af565b34801561012557600080fd5b5061012e61041b565b60408051600160a060020a039092168252519081900360200190f35b34801561015657600080fd5b506100de600160a060020a036004351661042a565b34801561017757600080fd5b506100de600160a060020a03600435166106f6565b60036020526000908152604090208054600190910154600160a060020a031682565b600054600160a060020a031633146101c557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561023957600080fd5b505af115801561024d573d6000803e3d6000fd5b505050506040513d602081101561026357600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156102cb57600080fd5b505af11580156102df573d6000803e3d6000fd5b505050506040513d60208110156102f557600080fd5b5051151561030257600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b600054600160a060020a0316331461035a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b33600081815260036020526040808220858155600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0386169081179091559051859391927f1ee471395ea2cfa5c7eec94aabde2b3c330825cb942ef8d0fd1eeb7a0d3d275291a45050565b600054600160a060020a031681565b600154604080517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a038481166004830152915160009392909216916370a082319160248082019260209290919082900301818787803b15801561049557600080fd5b505af11580156104a9573d6000803e3d6000fd5b505050506040513d60208110156104bf57600080fd5b5051600160a060020a0383166000908152600360205260409020549091508110156104e957600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a03858116600483015230602483015260448201859052915191909216916323b872dd9160648083019260209291908290030181600087803b15801561055e57600080fd5b505af1158015610572573d6000803e3d6000fd5b505050506040513d602081101561058857600080fd5b5050600154600254604080517f095ea7b3000000000000000000000000000000000000000000000000000000008152600160a060020a039283166004820152602481018590529051919092169163095ea7b39160448083019260209291908290030181600087803b1580156105fc57600080fd5b505af1158015610610573d6000803e3d6000fd5b505050506040513d602081101561062657600080fd5b5050600254600160a060020a038381166000908152600360205260408082206001015481517fe3fcd18e0000000000000000000000000000000000000000000000000000000081526004810187905290841660248201529051929093169263e3fcd18e926044808301939282900301818387803b1580156106a657600080fd5b505af11580156106ba573d6000803e3d6000fd5b5050604051600160a060020a03851692507f5a9b1e90057b7163b237d41fbf5ba76b7eaf01f482fe75255aa290ced89e91b29150600090a25050565b600054600160a060020a0316331461070d57600080fd5b61071681610719565b50565b600160a060020a038116151561072e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f78d917c984b1a5b6c5b5d1f5609b909abf97b3c1d1e24680ef3a8c125667c950029",
-  "deployedBytecode": "0x6080604052600436106100825763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166312fbd33c811461008757806341c0e1b5146100c9578063715018a6146100e05780638a12ae40146100f55780638da5cb5b14610119578063b5dfc1d51461014a578063f2fde38b1461016b575b600080fd5b34801561009357600080fd5b506100a8600160a060020a036004351661018c565b60408051928352600160a060020a0390911660208301528051918290030190f35b3480156100d557600080fd5b506100de6101ae565b005b3480156100ec57600080fd5b506100de610343565b34801561010157600080fd5b506100de600435600160a060020a03602435166103af565b34801561012557600080fd5b5061012e61041b565b60408051600160a060020a039092168252519081900360200190f35b34801561015657600080fd5b506100de600160a060020a036004351661042a565b34801561017757600080fd5b506100de600160a060020a03600435166106f6565b60036020526000908152604090208054600190910154600160a060020a031682565b600054600160a060020a031633146101c557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561023957600080fd5b505af115801561024d573d6000803e3d6000fd5b505050506040513d602081101561026357600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156102cb57600080fd5b505af11580156102df573d6000803e3d6000fd5b505050506040513d60208110156102f557600080fd5b5051151561030257600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b600054600160a060020a0316331461035a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b33600081815260036020526040808220858155600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0386169081179091559051859391927f1ee471395ea2cfa5c7eec94aabde2b3c330825cb942ef8d0fd1eeb7a0d3d275291a45050565b600054600160a060020a031681565b600154604080517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a038481166004830152915160009392909216916370a082319160248082019260209290919082900301818787803b15801561049557600080fd5b505af11580156104a9573d6000803e3d6000fd5b505050506040513d60208110156104bf57600080fd5b5051600160a060020a0383166000908152600360205260409020549091508110156104e957600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a03858116600483015230602483015260448201859052915191909216916323b872dd9160648083019260209291908290030181600087803b15801561055e57600080fd5b505af1158015610572573d6000803e3d6000fd5b505050506040513d602081101561058857600080fd5b5050600154600254604080517f095ea7b3000000000000000000000000000000000000000000000000000000008152600160a060020a039283166004820152602481018590529051919092169163095ea7b39160448083019260209291908290030181600087803b1580156105fc57600080fd5b505af1158015610610573d6000803e3d6000fd5b505050506040513d602081101561062657600080fd5b5050600254600160a060020a038381166000908152600360205260408082206001015481517fe3fcd18e0000000000000000000000000000000000000000000000000000000081526004810187905290841660248201529051929093169263e3fcd18e926044808301939282900301818387803b1580156106a657600080fd5b505af11580156106ba573d6000803e3d6000fd5b5050604051600160a060020a03851692507f5a9b1e90057b7163b237d41fbf5ba76b7eaf01f482fe75255aa290ced89e91b29150600090a25050565b600054600160a060020a0316331461070d57600080fd5b61071681610719565b50565b600160a060020a038116151561072e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f78d917c984b1a5b6c5b5d1f5609b909abf97b3c1d1e24680ef3a8c125667c950029",
-  "sourceMap": "89:1513:2:-;;;543:181;8:9:-1;5:2;;;30:1;27;20:12;5:2;543:181:2;;;;;;;;;;;;;;;;;;;567:5:18;:18;;;609:19:2;;-1:-1:-1;;;;;;609:19:2;;;-1:-1:-1;;;;;609:19:2;;;;;;;638:10;:51;;;;;;;;;;;;;;;575:10:18;567:18;;;;;699::2;;;;;;89:1513;;;;;;;;",
-  "deployedSourceMap": "89:1513:2:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;481:55;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;481:55:2;-1:-1:-1;;;;;481:55:2;;;;;;;;;;;;-1:-1:-1;;;;;481:55:2;;;;;;;;;;;;;;;;1363:237;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1363:237:2;;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;730:238:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;730:238:2;;;-1:-1:-1;;;;;730:238:2;;;;;238:20:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;;;;;-1:-1:-1;;;;;238:20:18;;;;;;;;;;;;;;974:383:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;974:383:2;-1:-1:-1;;;;;974:383:2;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;481:55:2;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;481:55:2;;:::o;1363:237::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1414:5:2;;;1429;;1436:30;;;;;;1460:4;1436:30;;;;;;-1:-1:-1;;;;;1414:5:2;;;;:14;;1429:5;;;1414;;1436:15;;:30;;;;;;;;;;;;;;;;1414:5;1436:30;;;5:2:-1;;;;30:1;27;20:12;5:2;1436:30:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1436:30:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1436:30:2;1414:53;;;;;;;;;;-1:-1:-1;;;;;1414:53:2;;;;;;;;;;;;;;;;;;;;1436:30;;1414:53;;;;;;;-1:-1:-1;1414:53:2;;;;5:2:-1;;;;30:1;27;20:12;5:2;1414:53:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1414:53:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1414:53:2;1406:62;;;;;;;;1483:24;;;1491:15;1483:24;;;;;;;;;;;;;1587:5;;-1:-1:-1;;;;;1587:5:2;1574:19;1001:111:18;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;730:238:2:-;818:10;803:26;;;;:14;:26;;;;;;:44;;;857:33;;:43;;-1:-1:-1;;857:43:2;-1:-1:-1;;;;;857:43:2;;;;;;;;915:46;;803:44;;857:43;;915:46;;;730:238;;:::o;238:20:18:-;;;-1:-1:-1;;;;;238:20:18;;:::o;974:383:2:-;1048:5;;:24;;;;;;-1:-1:-1;;;;;1048:24:2;;;;;;;;;1030:15;;1048:5;;;;;:15;;:24;;;;;;;;;;;;;;;1030:15;1048:5;:24;;;5:2:-1;;;;30:1;27;20:12;5:2;1048:24:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1048:24:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1048:24:2;-1:-1:-1;;;;;1101:23:2;;;;;;:14;1048:24;1101:23;;;;:32;1048:24;;-1:-1:-1;1090:43:2;;;1082:52;;;;;;1145:5;;:51;;;;;;-1:-1:-1;;;;;1145:51:2;;;;;;;1181:4;1145:51;;;;;;;;;;;;:5;;;;;:18;;:51;;;;;;;;;;;;;;:5;;:51;;;5:2:-1;;;;30:1;27;20:12;5:2;1145:51:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1145:51:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;1207:5:2;;1221:10;;1207:34;;;;;;-1:-1:-1;;;;;1221:10:2;;;1207:34;;;;;;;;;;;;:5;;;;;:13;;:34;;;;;1145:51;;1207:34;;;;;;;:5;;:34;;;5:2:-1;;;;30:1;27;20:12;5:2;1207:34:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1207:34:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;1251:10:2;;-1:-1:-1;;;;;1285:23:2;;;1251:10;1285:23;;;:14;1207:34;1285:23;;;;;1251:10;1285:30;;1251:65;;;;;;;;;;;1285:30;;;1251:65;;;;;;:10;;;;;:24;;:65;;;;;:10;:65;;;;;:10;;:65;;;5:2:-1;;;;30:1;27;20:12;5:2;1251:65:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;-1:-1;;1331:19:2;;-1:-1:-1;;;;;1331:19:2;;;-1:-1:-1;1331:19:2;;-1:-1:-1;1331:19:2;;;974:383;;:::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405160408061083b8339810160405280516020909101516000805460018054600160a060020a0319908116600160a060020a039687161790915560028054821695909416949094179092553391831682179092161781556107c290819061007990396000f3006080604052600436106100825763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166312fbd33c811461008757806341c0e1b5146100c9578063715018a6146100e05780638a12ae40146100f55780638da5cb5b14610119578063b5dfc1d51461014a578063f2fde38b1461016b575b600080fd5b34801561009357600080fd5b506100a8600160a060020a036004351661018c565b60408051928352600160a060020a0390911660208301528051918290030190f35b3480156100d557600080fd5b506100de6101ae565b005b3480156100ec57600080fd5b506100de610343565b34801561010157600080fd5b506100de600435600160a060020a03602435166103af565b34801561012557600080fd5b5061012e61041b565b60408051600160a060020a039092168252519081900360200190f35b34801561015657600080fd5b506100de600160a060020a036004351661042a565b34801561017757600080fd5b506100de600160a060020a03600435166106f6565b60036020526000908152604090208054600190910154600160a060020a031682565b600054600160a060020a031633146101c557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561023957600080fd5b505af115801561024d573d6000803e3d6000fd5b505050506040513d602081101561026357600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156102cb57600080fd5b505af11580156102df573d6000803e3d6000fd5b505050506040513d60208110156102f557600080fd5b5051151561030257600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b600054600160a060020a0316331461035a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b33600081815260036020526040808220858155600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0386169081179091559051859391927f1ee471395ea2cfa5c7eec94aabde2b3c330825cb942ef8d0fd1eeb7a0d3d275291a45050565b600054600160a060020a031681565b600154604080517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a038481166004830152915160009392909216916370a082319160248082019260209290919082900301818787803b15801561049557600080fd5b505af11580156104a9573d6000803e3d6000fd5b505050506040513d60208110156104bf57600080fd5b5051600160a060020a0383166000908152600360205260409020549091508110156104e957600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a03858116600483015230602483015260448201859052915191909216916323b872dd9160648083019260209291908290030181600087803b15801561055e57600080fd5b505af1158015610572573d6000803e3d6000fd5b505050506040513d602081101561058857600080fd5b5050600154600254604080517f095ea7b3000000000000000000000000000000000000000000000000000000008152600160a060020a039283166004820152602481018590529051919092169163095ea7b39160448083019260209291908290030181600087803b1580156105fc57600080fd5b505af1158015610610573d6000803e3d6000fd5b505050506040513d602081101561062657600080fd5b5050600254600160a060020a038381166000908152600360205260408082206001015481517fe3fcd18e0000000000000000000000000000000000000000000000000000000081526004810187905290841660248201529051929093169263e3fcd18e926044808301939282900301818387803b1580156106a657600080fd5b505af11580156106ba573d6000803e3d6000fd5b5050604051600160a060020a03851692507f5a9b1e90057b7163b237d41fbf5ba76b7eaf01f482fe75255aa290ced89e91b29150600090a25050565b600054600160a060020a0316331461070d57600080fd5b61071681610719565b50565b600160a060020a038116151561072e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058205eda73734b8fdd74c6a5c06d7ea0e21014ff767259578ae208a710d0a49a1b440029",
+  "deployedBytecode": "0x6080604052600436106100825763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166312fbd33c811461008757806341c0e1b5146100c9578063715018a6146100e05780638a12ae40146100f55780638da5cb5b14610119578063b5dfc1d51461014a578063f2fde38b1461016b575b600080fd5b34801561009357600080fd5b506100a8600160a060020a036004351661018c565b60408051928352600160a060020a0390911660208301528051918290030190f35b3480156100d557600080fd5b506100de6101ae565b005b3480156100ec57600080fd5b506100de610343565b34801561010157600080fd5b506100de600435600160a060020a03602435166103af565b34801561012557600080fd5b5061012e61041b565b60408051600160a060020a039092168252519081900360200190f35b34801561015657600080fd5b506100de600160a060020a036004351661042a565b34801561017757600080fd5b506100de600160a060020a03600435166106f6565b60036020526000908152604090208054600190910154600160a060020a031682565b600054600160a060020a031633146101c557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561023957600080fd5b505af115801561024d573d6000803e3d6000fd5b505050506040513d602081101561026357600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156102cb57600080fd5b505af11580156102df573d6000803e3d6000fd5b505050506040513d60208110156102f557600080fd5b5051151561030257600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b600054600160a060020a0316331461035a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b33600081815260036020526040808220858155600101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0386169081179091559051859391927f1ee471395ea2cfa5c7eec94aabde2b3c330825cb942ef8d0fd1eeb7a0d3d275291a45050565b600054600160a060020a031681565b600154604080517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a038481166004830152915160009392909216916370a082319160248082019260209290919082900301818787803b15801561049557600080fd5b505af11580156104a9573d6000803e3d6000fd5b505050506040513d60208110156104bf57600080fd5b5051600160a060020a0383166000908152600360205260409020549091508110156104e957600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a03858116600483015230602483015260448201859052915191909216916323b872dd9160648083019260209291908290030181600087803b15801561055e57600080fd5b505af1158015610572573d6000803e3d6000fd5b505050506040513d602081101561058857600080fd5b5050600154600254604080517f095ea7b3000000000000000000000000000000000000000000000000000000008152600160a060020a039283166004820152602481018590529051919092169163095ea7b39160448083019260209291908290030181600087803b1580156105fc57600080fd5b505af1158015610610573d6000803e3d6000fd5b505050506040513d602081101561062657600080fd5b5050600254600160a060020a038381166000908152600360205260408082206001015481517fe3fcd18e0000000000000000000000000000000000000000000000000000000081526004810187905290841660248201529051929093169263e3fcd18e926044808301939282900301818387803b1580156106a657600080fd5b505af11580156106ba573d6000803e3d6000fd5b5050604051600160a060020a03851692507f5a9b1e90057b7163b237d41fbf5ba76b7eaf01f482fe75255aa290ced89e91b29150600090a25050565b600054600160a060020a0316331461070d57600080fd5b61071681610719565b50565b600160a060020a038116151561072e57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058205eda73734b8fdd74c6a5c06d7ea0e21014ff767259578ae208a710d0a49a1b440029",
+  "sourceMap": "89:1513:3:-;;;543:181;8:9:-1;5:2;;;30:1;27;20:12;5:2;543:181:3;;;;;;;;;;;;;;;;;;;567:5:16;:18;;;609:19:3;;-1:-1:-1;;;;;;609:19:3;;;-1:-1:-1;;;;;609:19:3;;;;;;;638:10;:51;;;;;;;;;;;;;;;575:10:16;567:18;;;;;699::3;;;;;;89:1513;;;;;;;;",
+  "deployedSourceMap": "89:1513:3:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;481:55;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;481:55:3;-1:-1:-1;;;;;481:55:3;;;;;;;;;;;;-1:-1:-1;;;;;481:55:3;;;;;;;;;;;;;;;;1363:237;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1363:237:3;;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;730:238:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;730:238:3;;;-1:-1:-1;;;;;730:238:3;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;974:383:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;974:383:3;-1:-1:-1;;;;;974:383:3;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;481:55:3;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;481:55:3;;:::o;1363:237::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1414:5:3;;;1429;;1436:30;;;;;;1460:4;1436:30;;;;;;-1:-1:-1;;;;;1414:5:3;;;;:14;;1429:5;;;1414;;1436:15;;:30;;;;;;;;;;;;;;;;1414:5;1436:30;;;5:2:-1;;;;30:1;27;20:12;5:2;1436:30:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1436:30:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1436:30:3;1414:53;;;;;;;;;;-1:-1:-1;;;;;1414:53:3;;;;;;;;;;;;;;;;;;;;1436:30;;1414:53;;;;;;;-1:-1:-1;1414:53:3;;;;5:2:-1;;;;30:1;27;20:12;5:2;1414:53:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1414:53:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1414:53:3;1406:62;;;;;;;;1483:24;;;1491:15;1483:24;;;;;;;;;;;;;1587:5;;-1:-1:-1;;;;;1587:5:3;1574:19;1001:111:16;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;730:238:3:-;818:10;803:26;;;;:14;:26;;;;;;:44;;;857:33;;:43;;-1:-1:-1;;857:43:3;-1:-1:-1;;;;;857:43:3;;;;;;;;915:46;;803:44;;857:43;;915:46;;;730:238;;:::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;974:383:3:-;1048:5;;:24;;;;;;-1:-1:-1;;;;;1048:24:3;;;;;;;;;1030:15;;1048:5;;;;;:15;;:24;;;;;;;;;;;;;;;1030:15;1048:5;:24;;;5:2:-1;;;;30:1;27;20:12;5:2;1048:24:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1048:24:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1048:24:3;-1:-1:-1;;;;;1101:23:3;;;;;;:14;1048:24;1101:23;;;;:32;1048:24;;-1:-1:-1;1090:43:3;;;1082:52;;;;;;1145:5;;:51;;;;;;-1:-1:-1;;;;;1145:51:3;;;;;;;1181:4;1145:51;;;;;;;;;;;;:5;;;;;:18;;:51;;;;;;;;;;;;;;:5;;:51;;;5:2:-1;;;;30:1;27;20:12;5:2;1145:51:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1145:51:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;1207:5:3;;1221:10;;1207:34;;;;;;-1:-1:-1;;;;;1221:10:3;;;1207:34;;;;;;;;;;;;:5;;;;;:13;;:34;;;;;1145:51;;1207:34;;;;;;;:5;;:34;;;5:2:-1;;;;30:1;27;20:12;5:2;1207:34:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1207:34:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;1251:10:3;;-1:-1:-1;;;;;1285:23:3;;;1251:10;1285:23;;;:14;1207:34;1285:23;;;;;1251:10;1285:30;;1251:65;;;;;;;;;;;1285:30;;;1251:65;;;;;;:10;;;;;:24;;:65;;;;;:10;:65;;;;;:10;;:65;;;5:2:-1;;;;30:1;27;20:12;5:2;1251:65:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;-1:-1;;1331:19:3;;-1:-1:-1;;;;;1331:19:3;;;-1:-1:-1;1331:19:3;;-1:-1:-1;1331:19:3;;;974:383;;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\nimport \"./SNM.sol\";\nimport \"./SimpleGatekeeperWithLimit.sol\";\n\ncontract AutoPayout is Ownable {\n\n    using SafeMath for uint256;\n\n    event AutoPayoutChanged(address indexed master, address indexed target, uint256 indexed limit);\n    event AutoPayout(address indexed master);\n    event Suicide(uint block);\n\n    struct PayoutSetting {\n        uint256 lowLimit;\n        address target;\n    }\n\n    SNM token;\n\n    SimpleGatekeeperWithLimit gatekeeper;\n\n    mapping(address => PayoutSetting) public allowedPayouts;\n\n    constructor(address _token, address _gatekeeper) public {\n        token = SNM(_token);\n        gatekeeper = SimpleGatekeeperWithLimit(_gatekeeper);\n        owner = msg.sender;\n    }\n\n    function SetAutoPayout(uint256 _limit, address _target) public {\n        allowedPayouts[msg.sender].lowLimit = _limit;\n        allowedPayouts[msg.sender].target = _target;\n        emit AutoPayoutChanged(msg.sender, _target, _limit);\n    }\n\n    function DoAutoPayout(address _master) public {\n        uint256 balance = token.balanceOf(_master);\n        require(balance >= allowedPayouts[_master].lowLimit);\n\n        token.transferFrom(_master, address(this), balance);\n\n        token.approve(gatekeeper, balance);\n        gatekeeper.PayinTargeted(balance, allowedPayouts[_master].target);\n        emit AutoPayout(_master);\n    }\n\n    function kill() public onlyOwner {\n        require(token.transfer(owner, token.balanceOf(address(this))));\n        emit Suicide(block.timestamp);\n        // solium-disable-line security/no-block-members\n        selfdestruct(owner);\n    }\n}\n",
   "sourcePath": "contracts/AutoPayout.sol",
   "ast": {
     "absolutePath": "contracts/AutoPayout.sol",
     "exportedSymbols": {
       "AutoPayout": [
-        383
+        952
       ]
     },
-    "id": 384,
+    "id": 953,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 209,
+        "id": 778,
         "literals": [
           "solidity",
           "^",
@@ -218,27 +218,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:2"
+        "src": "0:24:3"
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 210,
+        "id": 779,
         "nodeType": "ImportDirective",
-        "scope": 384,
-        "sourceUnit": 5515,
-        "src": "26:19:2",
+        "scope": 953,
+        "sourceUnit": 10081,
+        "src": "26:19:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SimpleGatekeeperWithLimit.sol",
         "file": "./SimpleGatekeeperWithLimit.sol",
-        "id": 211,
+        "id": 780,
         "nodeType": "ImportDirective",
-        "scope": 384,
-        "sourceUnit": 6489,
-        "src": "46:41:2",
+        "scope": 953,
+        "sourceUnit": 10643,
+        "src": "46:41:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -248,56 +248,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 212,
+              "id": 781,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "112:7:2",
+              "referencedDeclaration": 10882,
+              "src": "112:7:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 213,
+            "id": 782,
             "nodeType": "InheritanceSpecifier",
-            "src": "112:7:2"
+            "src": "112:7:3"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 383,
+        "id": 952,
         "linearizedBaseContracts": [
-          383,
-          7336
+          952,
+          10882
         ],
         "name": "AutoPayout",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 216,
+            "id": 785,
             "libraryName": {
               "contractScope": null,
-              "id": 214,
+              "id": 783,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "133:8:2",
+              "referencedDeclaration": 10796,
+              "src": "133:8:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "127:27:2",
+            "src": "127:27:3",
             "typeName": {
-              "id": 215,
+              "id": 784,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "146:7:2",
+              "src": "146:7:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -307,21 +307,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 224,
+            "id": 793,
             "name": "AutoPayoutChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 223,
+              "id": 792,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 218,
+                  "id": 787,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "184:22:2",
+                  "scope": 793,
+                  "src": "184:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -329,10 +329,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 217,
+                    "id": 786,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "184:7:2",
+                    "src": "184:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -343,12 +343,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 220,
+                  "id": 789,
                   "indexed": true,
                   "name": "target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "208:22:2",
+                  "scope": 793,
+                  "src": "208:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -356,10 +356,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 219,
+                    "id": 788,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "208:7:2",
+                    "src": "208:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -370,12 +370,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 222,
+                  "id": 791,
                   "indexed": true,
                   "name": "limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "232:21:2",
+                  "scope": 793,
+                  "src": "232:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -383,10 +383,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 221,
+                    "id": 790,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "232:7:2",
+                    "src": "232:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -396,28 +396,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "183:71:2"
+              "src": "183:71:3"
             },
-            "src": "160:95:2"
+            "src": "160:95:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 228,
+            "id": 797,
             "name": "AutoPayout",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 227,
+              "id": 796,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 226,
+                  "id": 795,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 228,
-                  "src": "277:22:2",
+                  "scope": 797,
+                  "src": "277:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -425,10 +425,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 225,
+                    "id": 794,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "277:7:2",
+                    "src": "277:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -438,28 +438,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "276:24:2"
+              "src": "276:24:3"
             },
-            "src": "260:41:2"
+            "src": "260:41:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 232,
+            "id": 801,
             "name": "Suicide",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 231,
+              "id": 800,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 230,
+                  "id": 799,
                   "indexed": false,
                   "name": "block",
                   "nodeType": "VariableDeclaration",
-                  "scope": 232,
-                  "src": "320:10:2",
+                  "scope": 801,
+                  "src": "320:10:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -467,10 +467,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 229,
+                    "id": 798,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "320:4:2",
+                    "src": "320:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -480,21 +480,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "319:12:2"
+              "src": "319:12:3"
             },
-            "src": "306:26:2"
+            "src": "306:26:3"
           },
           {
             "canonicalName": "AutoPayout.PayoutSetting",
-            "id": 237,
+            "id": 806,
             "members": [
               {
                 "constant": false,
-                "id": 234,
+                "id": 803,
                 "name": "lowLimit",
                 "nodeType": "VariableDeclaration",
-                "scope": 237,
-                "src": "369:16:2",
+                "scope": 806,
+                "src": "369:16:3",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -502,10 +502,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 233,
+                  "id": 802,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "369:7:2",
+                  "src": "369:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -516,11 +516,11 @@
               },
               {
                 "constant": false,
-                "id": 236,
+                "id": 805,
                 "name": "target",
                 "nodeType": "VariableDeclaration",
-                "scope": 237,
-                "src": "395:14:2",
+                "scope": 806,
+                "src": "395:14:3",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -528,10 +528,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 235,
+                  "id": 804,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "395:7:2",
+                  "src": "395:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -543,32 +543,32 @@
             ],
             "name": "PayoutSetting",
             "nodeType": "StructDefinition",
-            "scope": 383,
-            "src": "338:78:2",
+            "scope": 952,
+            "src": "338:78:3",
             "visibility": "public"
           },
           {
             "constant": false,
-            "id": 239,
+            "id": 808,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "422:9:2",
+            "scope": 952,
+            "src": "422:9:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$5514",
+              "typeIdentifier": "t_contract$_SNM_$10080",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 238,
+              "id": 807,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5514,
-              "src": "422:3:2",
+              "referencedDeclaration": 10080,
+              "src": "422:3:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$5514",
+                "typeIdentifier": "t_contract$_SNM_$10080",
                 "typeString": "contract SNM"
               }
             },
@@ -577,26 +577,26 @@
           },
           {
             "constant": false,
-            "id": 241,
+            "id": 810,
             "name": "gatekeeper",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "438:36:2",
+            "scope": 952,
+            "src": "438:36:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
               "typeString": "contract SimpleGatekeeperWithLimit"
             },
             "typeName": {
               "contractScope": null,
-              "id": 240,
+              "id": 809,
               "name": "SimpleGatekeeperWithLimit",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 6488,
-              "src": "438:25:2",
+              "referencedDeclaration": 10642,
+              "src": "438:25:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                 "typeString": "contract SimpleGatekeeperWithLimit"
               }
             },
@@ -605,44 +605,44 @@
           },
           {
             "constant": false,
-            "id": 245,
+            "id": 814,
             "name": "allowedPayouts",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "481:55:2",
+            "scope": 952,
+            "src": "481:55:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
               "typeString": "mapping(address => struct AutoPayout.PayoutSetting)"
             },
             "typeName": {
-              "id": 244,
+              "id": 813,
               "keyType": {
-                "id": 242,
+                "id": 811,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "489:7:2",
+                "src": "489:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "481:33:2",
+              "src": "481:33:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                 "typeString": "mapping(address => struct AutoPayout.PayoutSetting)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 243,
+                "id": 812,
                 "name": "PayoutSetting",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 237,
-                "src": "500:13:2",
+                "referencedDeclaration": 806,
+                "src": "500:13:3",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_PayoutSetting_$237_storage_ptr",
+                  "typeIdentifier": "t_struct$_PayoutSetting_$806_storage_ptr",
                   "typeString": "struct AutoPayout.PayoutSetting"
                 }
               }
@@ -652,28 +652,28 @@
           },
           {
             "body": {
-              "id": 269,
+              "id": 838,
               "nodeType": "Block",
-              "src": "599:125:2",
+              "src": "599:125:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 256,
+                    "id": 825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 252,
+                      "id": 821,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 239,
-                      "src": "609:5:2",
+                      "referencedDeclaration": 808,
+                      "src": "609:5:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
@@ -684,12 +684,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 254,
+                          "id": 823,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 247,
-                          "src": "621:6:2",
+                          "referencedDeclaration": 816,
+                          "src": "621:6:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -703,18 +703,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 253,
+                        "id": 822,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5514,
-                        "src": "617:3:2",
+                        "referencedDeclaration": 10080,
+                        "src": "617:3:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$5514_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 255,
+                      "id": 824,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -722,40 +722,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "617:11:2",
+                      "src": "617:11:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "609:19:2",
+                    "src": "609:19:3",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$5514",
+                      "typeIdentifier": "t_contract$_SNM_$10080",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 257,
+                  "id": 826,
                   "nodeType": "ExpressionStatement",
-                  "src": "609:19:2"
+                  "src": "609:19:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 262,
+                    "id": 831,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 258,
+                      "id": 827,
                       "name": "gatekeeper",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 241,
-                      "src": "638:10:2",
+                      "referencedDeclaration": 810,
+                      "src": "638:10:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                         "typeString": "contract SimpleGatekeeperWithLimit"
                       }
                     },
@@ -766,12 +766,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 260,
+                          "id": 829,
                           "name": "_gatekeeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 249,
-                          "src": "677:11:2",
+                          "referencedDeclaration": 818,
+                          "src": "677:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -785,18 +785,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 259,
+                        "id": 828,
                         "name": "SimpleGatekeeperWithLimit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6488,
-                        "src": "651:25:2",
+                        "referencedDeclaration": 10642,
+                        "src": "651:25:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SimpleGatekeeperWithLimit_$6488_$",
+                          "typeIdentifier": "t_type$_t_contract$_SimpleGatekeeperWithLimit_$10642_$",
                           "typeString": "type(contract SimpleGatekeeperWithLimit)"
                         }
                       },
-                      "id": 261,
+                      "id": 830,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -804,38 +804,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "651:38:2",
+                      "src": "651:38:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                         "typeString": "contract SimpleGatekeeperWithLimit"
                       }
                     },
-                    "src": "638:51:2",
+                    "src": "638:51:3",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                       "typeString": "contract SimpleGatekeeperWithLimit"
                     }
                   },
-                  "id": 263,
+                  "id": 832,
                   "nodeType": "ExpressionStatement",
-                  "src": "638:51:2"
+                  "src": "638:51:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 267,
+                    "id": 836,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 264,
+                      "id": 833,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "699:5:2",
+                      "referencedDeclaration": 10800,
+                      "src": "699:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -847,18 +847,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 265,
+                        "id": 834,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "707:3:2",
+                        "referencedDeclaration": 11315,
+                        "src": "707:3:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 266,
+                      "id": 835,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -866,26 +866,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "707:10:2",
+                      "src": "707:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "699:18:2",
+                    "src": "699:18:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 268,
+                  "id": 837,
                   "nodeType": "ExpressionStatement",
-                  "src": "699:18:2"
+                  "src": "699:18:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 270,
+            "id": 839,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -893,16 +893,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 250,
+              "id": 819,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 247,
+                  "id": 816,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 270,
-                  "src": "555:14:2",
+                  "scope": 839,
+                  "src": "555:14:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -910,10 +910,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 246,
+                    "id": 815,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "555:7:2",
+                    "src": "555:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -924,11 +924,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 249,
+                  "id": 818,
                   "name": "_gatekeeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 270,
-                  "src": "571:19:2",
+                  "scope": 839,
+                  "src": "571:19:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -936,10 +936,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 248,
+                    "id": 817,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "571:7:2",
+                    "src": "571:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -949,31 +949,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "554:37:2"
+              "src": "554:37:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 251,
+              "id": 820,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "599:0:2"
+              "src": "599:0:3"
             },
-            "scope": 383,
-            "src": "543:181:2",
+            "scope": 952,
+            "src": "543:181:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 300,
+              "id": 869,
               "nodeType": "Block",
-              "src": "793:175:2",
+              "src": "793:175:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 283,
+                    "id": 852,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -984,34 +984,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 277,
+                          "id": 846,
                           "name": "allowedPayouts",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 245,
-                          "src": "803:14:2",
+                          "referencedDeclaration": 814,
+                          "src": "803:14:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                             "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                           }
                         },
-                        "id": 280,
+                        "id": 849,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 278,
+                            "id": 847,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "818:3:2",
+                            "referencedDeclaration": 11315,
+                            "src": "818:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 279,
+                          "id": 848,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1019,7 +1019,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "818:10:2",
+                          "src": "818:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1030,21 +1030,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "803:26:2",
+                        "src": "803:26:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                          "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                           "typeString": "struct AutoPayout.PayoutSetting storage ref"
                         }
                       },
-                      "id": 281,
+                      "id": 850,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lowLimit",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 234,
-                      "src": "803:35:2",
+                      "referencedDeclaration": 803,
+                      "src": "803:35:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1054,31 +1054,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 282,
+                      "id": 851,
                       "name": "_limit",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 272,
-                      "src": "841:6:2",
+                      "referencedDeclaration": 841,
+                      "src": "841:6:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "803:44:2",
+                    "src": "803:44:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 284,
+                  "id": 853,
                   "nodeType": "ExpressionStatement",
-                  "src": "803:44:2"
+                  "src": "803:44:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 291,
+                    "id": 860,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1089,34 +1089,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 285,
+                          "id": 854,
                           "name": "allowedPayouts",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 245,
-                          "src": "857:14:2",
+                          "referencedDeclaration": 814,
+                          "src": "857:14:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                             "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                           }
                         },
-                        "id": 288,
+                        "id": 857,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 286,
+                            "id": 855,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "872:3:2",
+                            "referencedDeclaration": 11315,
+                            "src": "872:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 287,
+                          "id": 856,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1124,7 +1124,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "872:10:2",
+                          "src": "872:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1135,21 +1135,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "857:26:2",
+                        "src": "857:26:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                          "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                           "typeString": "struct AutoPayout.PayoutSetting storage ref"
                         }
                       },
-                      "id": 289,
+                      "id": 858,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "target",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 236,
-                      "src": "857:33:2",
+                      "referencedDeclaration": 805,
+                      "src": "857:33:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1159,26 +1159,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 290,
+                      "id": 859,
                       "name": "_target",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 274,
-                      "src": "893:7:2",
+                      "referencedDeclaration": 843,
+                      "src": "893:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "857:43:2",
+                    "src": "857:43:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 292,
+                  "id": 861,
                   "nodeType": "ExpressionStatement",
-                  "src": "857:43:2"
+                  "src": "857:43:3"
                 },
                 {
                   "eventCall": {
@@ -1188,18 +1188,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 294,
+                          "id": 863,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "933:3:2",
+                          "referencedDeclaration": 11315,
+                          "src": "933:3:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 295,
+                        "id": 864,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1207,7 +1207,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "933:10:2",
+                        "src": "933:10:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1215,12 +1215,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 296,
+                        "id": 865,
                         "name": "_target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 274,
-                        "src": "945:7:2",
+                        "referencedDeclaration": 843,
+                        "src": "945:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1228,12 +1228,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 297,
+                        "id": 866,
                         "name": "_limit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 272,
-                        "src": "954:6:2",
+                        "referencedDeclaration": 841,
+                        "src": "954:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1255,18 +1255,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 293,
+                      "id": 862,
                       "name": "AutoPayoutChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 224,
-                      "src": "915:17:2",
+                      "referencedDeclaration": 793,
+                      "src": "915:17:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 298,
+                    "id": 867,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1274,20 +1274,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "915:46:2",
+                    "src": "915:46:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 299,
+                  "id": 868,
                   "nodeType": "EmitStatement",
-                  "src": "910:51:2"
+                  "src": "910:51:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 301,
+            "id": 870,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1295,16 +1295,16 @@
             "name": "SetAutoPayout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 275,
+              "id": 844,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 272,
+                  "id": 841,
                   "name": "_limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 301,
-                  "src": "753:14:2",
+                  "scope": 870,
+                  "src": "753:14:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1312,10 +1312,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 271,
+                    "id": 840,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:2",
+                    "src": "753:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1326,11 +1326,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 274,
+                  "id": 843,
                   "name": "_target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 301,
-                  "src": "769:15:2",
+                  "scope": 870,
+                  "src": "769:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1338,10 +1338,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 273,
+                    "id": 842,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "769:7:2",
+                    "src": "769:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1351,39 +1351,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "752:33:2"
+              "src": "752:33:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 276,
+              "id": 845,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "793:0:2"
+              "src": "793:0:3"
             },
-            "scope": 383,
-            "src": "730:238:2",
+            "scope": 952,
+            "src": "730:238:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 353,
+              "id": 922,
               "nodeType": "Block",
-              "src": "1020:337:2",
+              "src": "1020:337:3",
               "statements": [
                 {
                   "assignments": [
-                    307
+                    876
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 307,
+                      "id": 876,
                       "name": "balance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 354,
-                      "src": "1030:15:2",
+                      "scope": 923,
+                      "src": "1030:15:3",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -1391,10 +1391,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 306,
+                        "id": 875,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "1030:7:2",
+                        "src": "1030:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1404,18 +1404,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 312,
+                  "id": 881,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 310,
+                        "id": 879,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1064:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1064:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1431,32 +1431,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 308,
+                        "id": 877,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1048:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1048:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 309,
+                      "id": 878,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "balanceOf",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7431,
-                      "src": "1048:15:2",
+                      "referencedDeclaration": 10977,
+                      "src": "1048:15:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                         "typeString": "function (address) view external returns (uint256)"
                       }
                     },
-                    "id": 311,
+                    "id": 880,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1464,14 +1464,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1048:24:2",
+                    "src": "1048:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "1030:42:2"
+                  "src": "1030:42:3"
                 },
                 {
                   "expression": {
@@ -1483,19 +1483,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 319,
+                        "id": 888,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 314,
+                          "id": 883,
                           "name": "balance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 307,
-                          "src": "1090:7:2",
+                          "referencedDeclaration": 876,
+                          "src": "1090:7:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1509,26 +1509,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 315,
+                              "id": 884,
                               "name": "allowedPayouts",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 245,
-                              "src": "1101:14:2",
+                              "referencedDeclaration": 814,
+                              "src": "1101:14:3",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                                 "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                               }
                             },
-                            "id": 317,
+                            "id": 886,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 316,
+                              "id": 885,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 303,
-                              "src": "1116:7:2",
+                              "referencedDeclaration": 872,
+                              "src": "1116:7:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1539,27 +1539,27 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1101:23:2",
+                            "src": "1101:23:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                              "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                               "typeString": "struct AutoPayout.PayoutSetting storage ref"
                             }
                           },
-                          "id": 318,
+                          "id": 887,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lowLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 234,
-                          "src": "1101:32:2",
+                          "referencedDeclaration": 803,
+                          "src": "1101:32:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1090:43:2",
+                        "src": "1090:43:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1573,21 +1573,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 313,
+                      "id": 882,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1082:7:2",
+                      "referencedDeclaration": 11318,
+                      "src": "1082:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 320,
+                    "id": 889,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1595,15 +1595,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1082:52:2",
+                    "src": "1082:52:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 321,
+                  "id": 890,
                   "nodeType": "ExpressionStatement",
-                  "src": "1082:52:2"
+                  "src": "1082:52:3"
                 },
                 {
                   "expression": {
@@ -1611,12 +1611,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 325,
+                        "id": 894,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1164:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1164:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1627,14 +1627,14 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 327,
+                            "id": 896,
                             "name": "this",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7802,
-                            "src": "1181:4:2",
+                            "referencedDeclaration": 11350,
+                            "src": "1181:4:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_AutoPayout_$383",
+                              "typeIdentifier": "t_contract$_AutoPayout_$952",
                               "typeString": "contract AutoPayout"
                             }
                           }
@@ -1642,24 +1642,24 @@
                         "expression": {
                           "argumentTypes": [
                             {
-                              "typeIdentifier": "t_contract$_AutoPayout_$383",
+                              "typeIdentifier": "t_contract$_AutoPayout_$952",
                               "typeString": "contract AutoPayout"
                             }
                           ],
-                          "id": 326,
+                          "id": 895,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "1173:7:2",
+                          "src": "1173:7:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 328,
+                        "id": 897,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1667,7 +1667,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "1173:13:2",
+                        "src": "1173:13:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1675,12 +1675,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 329,
+                        "id": 898,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1188:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1188:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1704,32 +1704,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 322,
+                        "id": 891,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1145:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1145:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 324,
+                      "id": 893,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transferFrom",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7607,
-                      "src": "1145:18:2",
+                      "referencedDeclaration": 11153,
+                      "src": "1145:18:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 330,
+                    "id": 899,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1737,15 +1737,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1145:51:2",
+                    "src": "1145:51:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 331,
+                  "id": 900,
                   "nodeType": "ExpressionStatement",
-                  "src": "1145:51:2"
+                  "src": "1145:51:3"
                 },
                 {
                   "expression": {
@@ -1753,25 +1753,25 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 335,
+                        "id": 904,
                         "name": "gatekeeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 241,
-                        "src": "1221:10:2",
+                        "referencedDeclaration": 810,
+                        "src": "1221:10:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         }
                       },
                       {
                         "argumentTypes": null,
-                        "id": 336,
+                        "id": 905,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1233:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1233:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1781,7 +1781,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         },
                         {
@@ -1791,32 +1791,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 332,
+                        "id": 901,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1207:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1207:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 334,
+                      "id": 903,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "approve",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7635,
-                      "src": "1207:13:2",
+                      "referencedDeclaration": 11181,
+                      "src": "1207:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 337,
+                    "id": 906,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1824,15 +1824,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1207:34:2",
+                    "src": "1207:34:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 338,
+                  "id": 907,
                   "nodeType": "ExpressionStatement",
-                  "src": "1207:34:2"
+                  "src": "1207:34:3"
                 },
                 {
                   "expression": {
@@ -1840,12 +1840,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 342,
+                        "id": 911,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1276:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1276:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1857,26 +1857,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 343,
+                            "id": 912,
                             "name": "allowedPayouts",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 245,
-                            "src": "1285:14:2",
+                            "referencedDeclaration": 814,
+                            "src": "1285:14:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                               "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                             }
                           },
-                          "id": 345,
+                          "id": 914,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 344,
+                            "id": 913,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 303,
-                            "src": "1300:7:2",
+                            "referencedDeclaration": 872,
+                            "src": "1300:7:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1887,21 +1887,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1285:23:2",
+                          "src": "1285:23:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                            "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                             "typeString": "struct AutoPayout.PayoutSetting storage ref"
                           }
                         },
-                        "id": 346,
+                        "id": 915,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "target",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 236,
-                        "src": "1285:30:2",
+                        "referencedDeclaration": 805,
+                        "src": "1285:30:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1921,32 +1921,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 339,
+                        "id": 908,
                         "name": "gatekeeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 241,
-                        "src": "1251:10:2",
+                        "referencedDeclaration": 810,
+                        "src": "1251:10:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         }
                       },
-                      "id": 341,
+                      "id": 910,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "PayinTargeted",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 6187,
-                      "src": "1251:24:2",
+                      "referencedDeclaration": 10341,
+                      "src": "1251:24:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$",
                         "typeString": "function (uint256,address) external"
                       }
                     },
-                    "id": 347,
+                    "id": 916,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1954,15 +1954,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1251:65:2",
+                    "src": "1251:65:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 348,
+                  "id": 917,
                   "nodeType": "ExpressionStatement",
-                  "src": "1251:65:2"
+                  "src": "1251:65:3"
                 },
                 {
                   "eventCall": {
@@ -1970,12 +1970,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 350,
+                        "id": 919,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1342:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1342:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1989,18 +1989,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 349,
+                      "id": 918,
                       "name": "AutoPayout",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 228,
-                      "src": "1331:10:2",
+                      "referencedDeclaration": 797,
+                      "src": "1331:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 351,
+                    "id": 920,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2008,20 +2008,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1331:19:2",
+                    "src": "1331:19:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 352,
+                  "id": 921,
                   "nodeType": "EmitStatement",
-                  "src": "1326:24:2"
+                  "src": "1326:24:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 354,
+            "id": 923,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2029,16 +2029,16 @@
             "name": "DoAutoPayout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 304,
+              "id": 873,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 303,
+                  "id": 872,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 354,
-                  "src": "996:15:2",
+                  "scope": 923,
+                  "src": "996:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2046,10 +2046,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 302,
+                    "id": 871,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "996:7:2",
+                    "src": "996:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2059,26 +2059,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "995:17:2"
+              "src": "995:17:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 305,
+              "id": 874,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1020:0:2"
+              "src": "1020:0:3"
             },
-            "scope": 383,
-            "src": "974:383:2",
+            "scope": 952,
+            "src": "974:383:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 381,
+              "id": 950,
               "nodeType": "Block",
-              "src": "1396:204:2",
+              "src": "1396:204:3",
               "statements": [
                 {
                   "expression": {
@@ -2089,12 +2089,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 362,
+                            "id": 931,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "1429:5:2",
+                            "referencedDeclaration": 10800,
+                            "src": "1429:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2108,14 +2108,14 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 366,
+                                    "id": 935,
                                     "name": "this",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7802,
-                                    "src": "1460:4:2",
+                                    "referencedDeclaration": 11350,
+                                    "src": "1460:4:3",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_AutoPayout_$383",
+                                      "typeIdentifier": "t_contract$_AutoPayout_$952",
                                       "typeString": "contract AutoPayout"
                                     }
                                   }
@@ -2123,24 +2123,24 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_contract$_AutoPayout_$383",
+                                      "typeIdentifier": "t_contract$_AutoPayout_$952",
                                       "typeString": "contract AutoPayout"
                                     }
                                   ],
-                                  "id": 365,
+                                  "id": 934,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "lValueRequested": false,
                                   "nodeType": "ElementaryTypeNameExpression",
-                                  "src": "1452:7:2",
+                                  "src": "1452:7:3",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_type$_t_address_$",
                                     "typeString": "type(address)"
                                   },
                                   "typeName": "address"
                                 },
-                                "id": 367,
+                                "id": 936,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -2148,7 +2148,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "1452:13:2",
+                                "src": "1452:13:3",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2164,32 +2164,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 363,
+                                "id": 932,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 239,
-                                "src": "1436:5:2",
+                                "referencedDeclaration": 808,
+                                "src": "1436:5:3",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 364,
+                              "id": 933,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "1436:15:2",
+                              "referencedDeclaration": 10977,
+                              "src": "1436:15:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 368,
+                            "id": 937,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2197,7 +2197,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "1436:30:2",
+                            "src": "1436:30:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -2217,32 +2217,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 360,
+                            "id": 929,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 239,
-                            "src": "1414:5:2",
+                            "referencedDeclaration": 808,
+                            "src": "1414:5:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 361,
+                          "id": 930,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "1414:14:2",
+                          "referencedDeclaration": 10965,
+                          "src": "1414:14:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 369,
+                        "id": 938,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2250,7 +2250,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "1414:53:2",
+                        "src": "1414:53:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2264,21 +2264,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 359,
+                      "id": 928,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1406:7:2",
+                      "referencedDeclaration": 11318,
+                      "src": "1406:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 370,
+                    "id": 939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2286,15 +2286,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1406:62:2",
+                    "src": "1406:62:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 371,
+                  "id": 940,
                   "nodeType": "ExpressionStatement",
-                  "src": "1406:62:2"
+                  "src": "1406:62:3"
                 },
                 {
                   "eventCall": {
@@ -2304,18 +2304,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 373,
+                          "id": 942,
                           "name": "block",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7759,
-                          "src": "1491:5:2",
+                          "referencedDeclaration": 11305,
+                          "src": "1491:5:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_block",
                             "typeString": "block"
                           }
                         },
-                        "id": 374,
+                        "id": 943,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2323,7 +2323,7 @@
                         "memberName": "timestamp",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1491:15:2",
+                        "src": "1491:15:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2337,18 +2337,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 372,
+                      "id": 941,
                       "name": "Suicide",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 232,
-                      "src": "1483:7:2",
+                      "referencedDeclaration": 801,
+                      "src": "1483:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 375,
+                    "id": 944,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2356,15 +2356,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1483:24:2",
+                    "src": "1483:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 376,
+                  "id": 945,
                   "nodeType": "EmitStatement",
-                  "src": "1478:29:2"
+                  "src": "1478:29:3"
                 },
                 {
                   "expression": {
@@ -2372,12 +2372,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 378,
+                        "id": 947,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "1587:5:2",
+                        "referencedDeclaration": 10800,
+                        "src": "1587:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2391,18 +2391,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 377,
+                      "id": 946,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "1574:12:2",
+                      "referencedDeclaration": 11323,
+                      "src": "1574:12:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 379,
+                    "id": 948,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2410,84 +2410,84 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:19:2",
+                    "src": "1574:19:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 380,
+                  "id": 949,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:19:2"
+                  "src": "1574:19:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 382,
+            "id": 951,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 357,
+                "id": 926,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 356,
+                  "id": 925,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1386:9:2",
+                  "referencedDeclaration": 10830,
+                  "src": "1386:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1386:9:2"
+                "src": "1386:9:3"
               }
             ],
             "name": "kill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 355,
+              "id": 924,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1376:2:2"
+              "src": "1376:2:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 358,
+              "id": 927,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1396:0:2"
+              "src": "1396:0:3"
             },
-            "scope": 383,
-            "src": "1363:237:2",
+            "scope": 952,
+            "src": "1363:237:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 384,
-        "src": "89:1513:2"
+        "scope": 953,
+        "src": "89:1513:3"
       }
     ],
-    "src": "0:1603:2"
+    "src": "0:1603:3"
   },
   "legacyAST": {
     "absolutePath": "contracts/AutoPayout.sol",
     "exportedSymbols": {
       "AutoPayout": [
-        383
+        952
       ]
     },
-    "id": 384,
+    "id": 953,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 209,
+        "id": 778,
         "literals": [
           "solidity",
           "^",
@@ -2495,27 +2495,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:2"
+        "src": "0:24:3"
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 210,
+        "id": 779,
         "nodeType": "ImportDirective",
-        "scope": 384,
-        "sourceUnit": 5515,
-        "src": "26:19:2",
+        "scope": 953,
+        "sourceUnit": 10081,
+        "src": "26:19:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SimpleGatekeeperWithLimit.sol",
         "file": "./SimpleGatekeeperWithLimit.sol",
-        "id": 211,
+        "id": 780,
         "nodeType": "ImportDirective",
-        "scope": 384,
-        "sourceUnit": 6489,
-        "src": "46:41:2",
+        "scope": 953,
+        "sourceUnit": 10643,
+        "src": "46:41:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -2525,56 +2525,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 212,
+              "id": 781,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "112:7:2",
+              "referencedDeclaration": 10882,
+              "src": "112:7:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 213,
+            "id": 782,
             "nodeType": "InheritanceSpecifier",
-            "src": "112:7:2"
+            "src": "112:7:3"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 383,
+        "id": 952,
         "linearizedBaseContracts": [
-          383,
-          7336
+          952,
+          10882
         ],
         "name": "AutoPayout",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 216,
+            "id": 785,
             "libraryName": {
               "contractScope": null,
-              "id": 214,
+              "id": 783,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "133:8:2",
+              "referencedDeclaration": 10796,
+              "src": "133:8:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "127:27:2",
+            "src": "127:27:3",
             "typeName": {
-              "id": 215,
+              "id": 784,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "146:7:2",
+              "src": "146:7:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -2584,21 +2584,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 224,
+            "id": 793,
             "name": "AutoPayoutChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 223,
+              "id": 792,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 218,
+                  "id": 787,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "184:22:2",
+                  "scope": 793,
+                  "src": "184:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2606,10 +2606,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 217,
+                    "id": 786,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "184:7:2",
+                    "src": "184:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2620,12 +2620,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 220,
+                  "id": 789,
                   "indexed": true,
                   "name": "target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "208:22:2",
+                  "scope": 793,
+                  "src": "208:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2633,10 +2633,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 219,
+                    "id": 788,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "208:7:2",
+                    "src": "208:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2647,12 +2647,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 222,
+                  "id": 791,
                   "indexed": true,
                   "name": "limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 224,
-                  "src": "232:21:2",
+                  "scope": 793,
+                  "src": "232:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2660,10 +2660,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 221,
+                    "id": 790,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "232:7:2",
+                    "src": "232:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2673,28 +2673,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "183:71:2"
+              "src": "183:71:3"
             },
-            "src": "160:95:2"
+            "src": "160:95:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 228,
+            "id": 797,
             "name": "AutoPayout",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 227,
+              "id": 796,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 226,
+                  "id": 795,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 228,
-                  "src": "277:22:2",
+                  "scope": 797,
+                  "src": "277:22:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2702,10 +2702,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 225,
+                    "id": 794,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "277:7:2",
+                    "src": "277:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2715,28 +2715,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "276:24:2"
+              "src": "276:24:3"
             },
-            "src": "260:41:2"
+            "src": "260:41:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 232,
+            "id": 801,
             "name": "Suicide",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 231,
+              "id": 800,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 230,
+                  "id": 799,
                   "indexed": false,
                   "name": "block",
                   "nodeType": "VariableDeclaration",
-                  "scope": 232,
-                  "src": "320:10:2",
+                  "scope": 801,
+                  "src": "320:10:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2744,10 +2744,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 229,
+                    "id": 798,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "320:4:2",
+                    "src": "320:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2757,21 +2757,21 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "319:12:2"
+              "src": "319:12:3"
             },
-            "src": "306:26:2"
+            "src": "306:26:3"
           },
           {
             "canonicalName": "AutoPayout.PayoutSetting",
-            "id": 237,
+            "id": 806,
             "members": [
               {
                 "constant": false,
-                "id": 234,
+                "id": 803,
                 "name": "lowLimit",
                 "nodeType": "VariableDeclaration",
-                "scope": 237,
-                "src": "369:16:2",
+                "scope": 806,
+                "src": "369:16:3",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2779,10 +2779,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 233,
+                  "id": 802,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "369:7:2",
+                  "src": "369:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2793,11 +2793,11 @@
               },
               {
                 "constant": false,
-                "id": 236,
+                "id": 805,
                 "name": "target",
                 "nodeType": "VariableDeclaration",
-                "scope": 237,
-                "src": "395:14:2",
+                "scope": 806,
+                "src": "395:14:3",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2805,10 +2805,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 235,
+                  "id": 804,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "395:7:2",
+                  "src": "395:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -2820,32 +2820,32 @@
             ],
             "name": "PayoutSetting",
             "nodeType": "StructDefinition",
-            "scope": 383,
-            "src": "338:78:2",
+            "scope": 952,
+            "src": "338:78:3",
             "visibility": "public"
           },
           {
             "constant": false,
-            "id": 239,
+            "id": 808,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "422:9:2",
+            "scope": 952,
+            "src": "422:9:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$5514",
+              "typeIdentifier": "t_contract$_SNM_$10080",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 238,
+              "id": 807,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5514,
-              "src": "422:3:2",
+              "referencedDeclaration": 10080,
+              "src": "422:3:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$5514",
+                "typeIdentifier": "t_contract$_SNM_$10080",
                 "typeString": "contract SNM"
               }
             },
@@ -2854,26 +2854,26 @@
           },
           {
             "constant": false,
-            "id": 241,
+            "id": 810,
             "name": "gatekeeper",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "438:36:2",
+            "scope": 952,
+            "src": "438:36:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
               "typeString": "contract SimpleGatekeeperWithLimit"
             },
             "typeName": {
               "contractScope": null,
-              "id": 240,
+              "id": 809,
               "name": "SimpleGatekeeperWithLimit",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 6488,
-              "src": "438:25:2",
+              "referencedDeclaration": 10642,
+              "src": "438:25:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                 "typeString": "contract SimpleGatekeeperWithLimit"
               }
             },
@@ -2882,44 +2882,44 @@
           },
           {
             "constant": false,
-            "id": 245,
+            "id": 814,
             "name": "allowedPayouts",
             "nodeType": "VariableDeclaration",
-            "scope": 383,
-            "src": "481:55:2",
+            "scope": 952,
+            "src": "481:55:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
               "typeString": "mapping(address => struct AutoPayout.PayoutSetting)"
             },
             "typeName": {
-              "id": 244,
+              "id": 813,
               "keyType": {
-                "id": 242,
+                "id": 811,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "489:7:2",
+                "src": "489:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "481:33:2",
+              "src": "481:33:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                 "typeString": "mapping(address => struct AutoPayout.PayoutSetting)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 243,
+                "id": 812,
                 "name": "PayoutSetting",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 237,
-                "src": "500:13:2",
+                "referencedDeclaration": 806,
+                "src": "500:13:3",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_PayoutSetting_$237_storage_ptr",
+                  "typeIdentifier": "t_struct$_PayoutSetting_$806_storage_ptr",
                   "typeString": "struct AutoPayout.PayoutSetting"
                 }
               }
@@ -2929,28 +2929,28 @@
           },
           {
             "body": {
-              "id": 269,
+              "id": 838,
               "nodeType": "Block",
-              "src": "599:125:2",
+              "src": "599:125:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 256,
+                    "id": 825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 252,
+                      "id": 821,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 239,
-                      "src": "609:5:2",
+                      "referencedDeclaration": 808,
+                      "src": "609:5:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
@@ -2961,12 +2961,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 254,
+                          "id": 823,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 247,
-                          "src": "621:6:2",
+                          "referencedDeclaration": 816,
+                          "src": "621:6:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2980,18 +2980,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 253,
+                        "id": 822,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5514,
-                        "src": "617:3:2",
+                        "referencedDeclaration": 10080,
+                        "src": "617:3:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$5514_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 255,
+                      "id": 824,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2999,40 +2999,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "617:11:2",
+                      "src": "617:11:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "609:19:2",
+                    "src": "609:19:3",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$5514",
+                      "typeIdentifier": "t_contract$_SNM_$10080",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 257,
+                  "id": 826,
                   "nodeType": "ExpressionStatement",
-                  "src": "609:19:2"
+                  "src": "609:19:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 262,
+                    "id": 831,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 258,
+                      "id": 827,
                       "name": "gatekeeper",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 241,
-                      "src": "638:10:2",
+                      "referencedDeclaration": 810,
+                      "src": "638:10:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                         "typeString": "contract SimpleGatekeeperWithLimit"
                       }
                     },
@@ -3043,12 +3043,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 260,
+                          "id": 829,
                           "name": "_gatekeeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 249,
-                          "src": "677:11:2",
+                          "referencedDeclaration": 818,
+                          "src": "677:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3062,18 +3062,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 259,
+                        "id": 828,
                         "name": "SimpleGatekeeperWithLimit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6488,
-                        "src": "651:25:2",
+                        "referencedDeclaration": 10642,
+                        "src": "651:25:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SimpleGatekeeperWithLimit_$6488_$",
+                          "typeIdentifier": "t_type$_t_contract$_SimpleGatekeeperWithLimit_$10642_$",
                           "typeString": "type(contract SimpleGatekeeperWithLimit)"
                         }
                       },
-                      "id": 261,
+                      "id": 830,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3081,38 +3081,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "651:38:2",
+                      "src": "651:38:3",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                        "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                         "typeString": "contract SimpleGatekeeperWithLimit"
                       }
                     },
-                    "src": "638:51:2",
+                    "src": "638:51:3",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                       "typeString": "contract SimpleGatekeeperWithLimit"
                     }
                   },
-                  "id": 263,
+                  "id": 832,
                   "nodeType": "ExpressionStatement",
-                  "src": "638:51:2"
+                  "src": "638:51:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 267,
+                    "id": 836,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 264,
+                      "id": 833,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "699:5:2",
+                      "referencedDeclaration": 10800,
+                      "src": "699:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3124,18 +3124,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 265,
+                        "id": 834,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "707:3:2",
+                        "referencedDeclaration": 11315,
+                        "src": "707:3:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 266,
+                      "id": 835,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3143,26 +3143,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "707:10:2",
+                      "src": "707:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "699:18:2",
+                    "src": "699:18:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 268,
+                  "id": 837,
                   "nodeType": "ExpressionStatement",
-                  "src": "699:18:2"
+                  "src": "699:18:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 270,
+            "id": 839,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -3170,16 +3170,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 250,
+              "id": 819,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 247,
+                  "id": 816,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 270,
-                  "src": "555:14:2",
+                  "scope": 839,
+                  "src": "555:14:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3187,10 +3187,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 246,
+                    "id": 815,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "555:7:2",
+                    "src": "555:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3201,11 +3201,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 249,
+                  "id": 818,
                   "name": "_gatekeeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 270,
-                  "src": "571:19:2",
+                  "scope": 839,
+                  "src": "571:19:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3213,10 +3213,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 248,
+                    "id": 817,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "571:7:2",
+                    "src": "571:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3226,31 +3226,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "554:37:2"
+              "src": "554:37:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 251,
+              "id": 820,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "599:0:2"
+              "src": "599:0:3"
             },
-            "scope": 383,
-            "src": "543:181:2",
+            "scope": 952,
+            "src": "543:181:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 300,
+              "id": 869,
               "nodeType": "Block",
-              "src": "793:175:2",
+              "src": "793:175:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 283,
+                    "id": 852,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3261,34 +3261,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 277,
+                          "id": 846,
                           "name": "allowedPayouts",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 245,
-                          "src": "803:14:2",
+                          "referencedDeclaration": 814,
+                          "src": "803:14:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                             "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                           }
                         },
-                        "id": 280,
+                        "id": 849,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 278,
+                            "id": 847,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "818:3:2",
+                            "referencedDeclaration": 11315,
+                            "src": "818:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 279,
+                          "id": 848,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3296,7 +3296,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "818:10:2",
+                          "src": "818:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3307,21 +3307,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "803:26:2",
+                        "src": "803:26:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                          "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                           "typeString": "struct AutoPayout.PayoutSetting storage ref"
                         }
                       },
-                      "id": 281,
+                      "id": 850,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lowLimit",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 234,
-                      "src": "803:35:2",
+                      "referencedDeclaration": 803,
+                      "src": "803:35:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3331,31 +3331,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 282,
+                      "id": 851,
                       "name": "_limit",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 272,
-                      "src": "841:6:2",
+                      "referencedDeclaration": 841,
+                      "src": "841:6:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "803:44:2",
+                    "src": "803:44:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 284,
+                  "id": 853,
                   "nodeType": "ExpressionStatement",
-                  "src": "803:44:2"
+                  "src": "803:44:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 291,
+                    "id": 860,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3366,34 +3366,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 285,
+                          "id": 854,
                           "name": "allowedPayouts",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 245,
-                          "src": "857:14:2",
+                          "referencedDeclaration": 814,
+                          "src": "857:14:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                             "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                           }
                         },
-                        "id": 288,
+                        "id": 857,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 286,
+                            "id": 855,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "872:3:2",
+                            "referencedDeclaration": 11315,
+                            "src": "872:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 287,
+                          "id": 856,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3401,7 +3401,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "872:10:2",
+                          "src": "872:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3412,21 +3412,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "857:26:2",
+                        "src": "857:26:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                          "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                           "typeString": "struct AutoPayout.PayoutSetting storage ref"
                         }
                       },
-                      "id": 289,
+                      "id": 858,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "target",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 236,
-                      "src": "857:33:2",
+                      "referencedDeclaration": 805,
+                      "src": "857:33:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3436,26 +3436,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 290,
+                      "id": 859,
                       "name": "_target",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 274,
-                      "src": "893:7:2",
+                      "referencedDeclaration": 843,
+                      "src": "893:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "857:43:2",
+                    "src": "857:43:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 292,
+                  "id": 861,
                   "nodeType": "ExpressionStatement",
-                  "src": "857:43:2"
+                  "src": "857:43:3"
                 },
                 {
                   "eventCall": {
@@ -3465,18 +3465,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 294,
+                          "id": 863,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "933:3:2",
+                          "referencedDeclaration": 11315,
+                          "src": "933:3:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 295,
+                        "id": 864,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3484,7 +3484,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "933:10:2",
+                        "src": "933:10:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3492,12 +3492,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 296,
+                        "id": 865,
                         "name": "_target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 274,
-                        "src": "945:7:2",
+                        "referencedDeclaration": 843,
+                        "src": "945:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3505,12 +3505,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 297,
+                        "id": 866,
                         "name": "_limit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 272,
-                        "src": "954:6:2",
+                        "referencedDeclaration": 841,
+                        "src": "954:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3532,18 +3532,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 293,
+                      "id": 862,
                       "name": "AutoPayoutChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 224,
-                      "src": "915:17:2",
+                      "referencedDeclaration": 793,
+                      "src": "915:17:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 298,
+                    "id": 867,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3551,20 +3551,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "915:46:2",
+                    "src": "915:46:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 299,
+                  "id": 868,
                   "nodeType": "EmitStatement",
-                  "src": "910:51:2"
+                  "src": "910:51:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 301,
+            "id": 870,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3572,16 +3572,16 @@
             "name": "SetAutoPayout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 275,
+              "id": 844,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 272,
+                  "id": 841,
                   "name": "_limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 301,
-                  "src": "753:14:2",
+                  "scope": 870,
+                  "src": "753:14:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3589,10 +3589,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 271,
+                    "id": 840,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:2",
+                    "src": "753:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3603,11 +3603,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 274,
+                  "id": 843,
                   "name": "_target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 301,
-                  "src": "769:15:2",
+                  "scope": 870,
+                  "src": "769:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3615,10 +3615,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 273,
+                    "id": 842,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "769:7:2",
+                    "src": "769:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3628,39 +3628,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "752:33:2"
+              "src": "752:33:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 276,
+              "id": 845,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "793:0:2"
+              "src": "793:0:3"
             },
-            "scope": 383,
-            "src": "730:238:2",
+            "scope": 952,
+            "src": "730:238:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 353,
+              "id": 922,
               "nodeType": "Block",
-              "src": "1020:337:2",
+              "src": "1020:337:3",
               "statements": [
                 {
                   "assignments": [
-                    307
+                    876
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 307,
+                      "id": 876,
                       "name": "balance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 354,
-                      "src": "1030:15:2",
+                      "scope": 923,
+                      "src": "1030:15:3",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -3668,10 +3668,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 306,
+                        "id": 875,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "1030:7:2",
+                        "src": "1030:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3681,18 +3681,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 312,
+                  "id": 881,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 310,
+                        "id": 879,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1064:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1064:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3708,32 +3708,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 308,
+                        "id": 877,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1048:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1048:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 309,
+                      "id": 878,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "balanceOf",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7431,
-                      "src": "1048:15:2",
+                      "referencedDeclaration": 10977,
+                      "src": "1048:15:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                         "typeString": "function (address) view external returns (uint256)"
                       }
                     },
-                    "id": 311,
+                    "id": 880,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3741,14 +3741,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1048:24:2",
+                    "src": "1048:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "1030:42:2"
+                  "src": "1030:42:3"
                 },
                 {
                   "expression": {
@@ -3760,19 +3760,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 319,
+                        "id": 888,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 314,
+                          "id": 883,
                           "name": "balance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 307,
-                          "src": "1090:7:2",
+                          "referencedDeclaration": 876,
+                          "src": "1090:7:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3786,26 +3786,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 315,
+                              "id": 884,
                               "name": "allowedPayouts",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 245,
-                              "src": "1101:14:2",
+                              "referencedDeclaration": 814,
+                              "src": "1101:14:3",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                                 "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                               }
                             },
-                            "id": 317,
+                            "id": 886,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 316,
+                              "id": 885,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 303,
-                              "src": "1116:7:2",
+                              "referencedDeclaration": 872,
+                              "src": "1116:7:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3816,27 +3816,27 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1101:23:2",
+                            "src": "1101:23:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                              "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                               "typeString": "struct AutoPayout.PayoutSetting storage ref"
                             }
                           },
-                          "id": 318,
+                          "id": 887,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lowLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 234,
-                          "src": "1101:32:2",
+                          "referencedDeclaration": 803,
+                          "src": "1101:32:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1090:43:2",
+                        "src": "1090:43:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3850,21 +3850,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 313,
+                      "id": 882,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1082:7:2",
+                      "referencedDeclaration": 11318,
+                      "src": "1082:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 320,
+                    "id": 889,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3872,15 +3872,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1082:52:2",
+                    "src": "1082:52:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 321,
+                  "id": 890,
                   "nodeType": "ExpressionStatement",
-                  "src": "1082:52:2"
+                  "src": "1082:52:3"
                 },
                 {
                   "expression": {
@@ -3888,12 +3888,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 325,
+                        "id": 894,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1164:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1164:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3904,14 +3904,14 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 327,
+                            "id": 896,
                             "name": "this",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7802,
-                            "src": "1181:4:2",
+                            "referencedDeclaration": 11350,
+                            "src": "1181:4:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_AutoPayout_$383",
+                              "typeIdentifier": "t_contract$_AutoPayout_$952",
                               "typeString": "contract AutoPayout"
                             }
                           }
@@ -3919,24 +3919,24 @@
                         "expression": {
                           "argumentTypes": [
                             {
-                              "typeIdentifier": "t_contract$_AutoPayout_$383",
+                              "typeIdentifier": "t_contract$_AutoPayout_$952",
                               "typeString": "contract AutoPayout"
                             }
                           ],
-                          "id": 326,
+                          "id": 895,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "1173:7:2",
+                          "src": "1173:7:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 328,
+                        "id": 897,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3944,7 +3944,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "1173:13:2",
+                        "src": "1173:13:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3952,12 +3952,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 329,
+                        "id": 898,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1188:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1188:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3981,32 +3981,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 322,
+                        "id": 891,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1145:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1145:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 324,
+                      "id": 893,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transferFrom",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7607,
-                      "src": "1145:18:2",
+                      "referencedDeclaration": 11153,
+                      "src": "1145:18:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 330,
+                    "id": 899,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4014,15 +4014,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1145:51:2",
+                    "src": "1145:51:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 331,
+                  "id": 900,
                   "nodeType": "ExpressionStatement",
-                  "src": "1145:51:2"
+                  "src": "1145:51:3"
                 },
                 {
                   "expression": {
@@ -4030,25 +4030,25 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 335,
+                        "id": 904,
                         "name": "gatekeeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 241,
-                        "src": "1221:10:2",
+                        "referencedDeclaration": 810,
+                        "src": "1221:10:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         }
                       },
                       {
                         "argumentTypes": null,
-                        "id": 336,
+                        "id": 905,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1233:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1233:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4058,7 +4058,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         },
                         {
@@ -4068,32 +4068,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 332,
+                        "id": 901,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 239,
-                        "src": "1207:5:2",
+                        "referencedDeclaration": 808,
+                        "src": "1207:5:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 334,
+                      "id": 903,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "approve",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7635,
-                      "src": "1207:13:2",
+                      "referencedDeclaration": 11181,
+                      "src": "1207:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 337,
+                    "id": 906,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4101,15 +4101,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1207:34:2",
+                    "src": "1207:34:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 338,
+                  "id": 907,
                   "nodeType": "ExpressionStatement",
-                  "src": "1207:34:2"
+                  "src": "1207:34:3"
                 },
                 {
                   "expression": {
@@ -4117,12 +4117,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 342,
+                        "id": 911,
                         "name": "balance",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 307,
-                        "src": "1276:7:2",
+                        "referencedDeclaration": 876,
+                        "src": "1276:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4134,26 +4134,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 343,
+                            "id": 912,
                             "name": "allowedPayouts",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 245,
-                            "src": "1285:14:2",
+                            "referencedDeclaration": 814,
+                            "src": "1285:14:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$237_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_PayoutSetting_$806_storage_$",
                               "typeString": "mapping(address => struct AutoPayout.PayoutSetting storage ref)"
                             }
                           },
-                          "id": 345,
+                          "id": 914,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 344,
+                            "id": 913,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 303,
-                            "src": "1300:7:2",
+                            "referencedDeclaration": 872,
+                            "src": "1300:7:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4164,21 +4164,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1285:23:2",
+                          "src": "1285:23:3",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_PayoutSetting_$237_storage",
+                            "typeIdentifier": "t_struct$_PayoutSetting_$806_storage",
                             "typeString": "struct AutoPayout.PayoutSetting storage ref"
                           }
                         },
-                        "id": 346,
+                        "id": 915,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "target",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 236,
-                        "src": "1285:30:2",
+                        "referencedDeclaration": 805,
+                        "src": "1285:30:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4198,32 +4198,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 339,
+                        "id": 908,
                         "name": "gatekeeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 241,
-                        "src": "1251:10:2",
+                        "referencedDeclaration": 810,
+                        "src": "1251:10:3",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                          "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                           "typeString": "contract SimpleGatekeeperWithLimit"
                         }
                       },
-                      "id": 341,
+                      "id": 910,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "PayinTargeted",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 6187,
-                      "src": "1251:24:2",
+                      "referencedDeclaration": 10341,
+                      "src": "1251:24:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$",
                         "typeString": "function (uint256,address) external"
                       }
                     },
-                    "id": 347,
+                    "id": 916,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4231,15 +4231,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1251:65:2",
+                    "src": "1251:65:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 348,
+                  "id": 917,
                   "nodeType": "ExpressionStatement",
-                  "src": "1251:65:2"
+                  "src": "1251:65:3"
                 },
                 {
                   "eventCall": {
@@ -4247,12 +4247,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 350,
+                        "id": 919,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 303,
-                        "src": "1342:7:2",
+                        "referencedDeclaration": 872,
+                        "src": "1342:7:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4266,18 +4266,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 349,
+                      "id": 918,
                       "name": "AutoPayout",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 228,
-                      "src": "1331:10:2",
+                      "referencedDeclaration": 797,
+                      "src": "1331:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 351,
+                    "id": 920,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4285,20 +4285,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1331:19:2",
+                    "src": "1331:19:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 352,
+                  "id": 921,
                   "nodeType": "EmitStatement",
-                  "src": "1326:24:2"
+                  "src": "1326:24:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 354,
+            "id": 923,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4306,16 +4306,16 @@
             "name": "DoAutoPayout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 304,
+              "id": 873,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 303,
+                  "id": 872,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 354,
-                  "src": "996:15:2",
+                  "scope": 923,
+                  "src": "996:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4323,10 +4323,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 302,
+                    "id": 871,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "996:7:2",
+                    "src": "996:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4336,26 +4336,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "995:17:2"
+              "src": "995:17:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 305,
+              "id": 874,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1020:0:2"
+              "src": "1020:0:3"
             },
-            "scope": 383,
-            "src": "974:383:2",
+            "scope": 952,
+            "src": "974:383:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 381,
+              "id": 950,
               "nodeType": "Block",
-              "src": "1396:204:2",
+              "src": "1396:204:3",
               "statements": [
                 {
                   "expression": {
@@ -4366,12 +4366,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 362,
+                            "id": 931,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "1429:5:2",
+                            "referencedDeclaration": 10800,
+                            "src": "1429:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4385,14 +4385,14 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 366,
+                                    "id": 935,
                                     "name": "this",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7802,
-                                    "src": "1460:4:2",
+                                    "referencedDeclaration": 11350,
+                                    "src": "1460:4:3",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_AutoPayout_$383",
+                                      "typeIdentifier": "t_contract$_AutoPayout_$952",
                                       "typeString": "contract AutoPayout"
                                     }
                                   }
@@ -4400,24 +4400,24 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_contract$_AutoPayout_$383",
+                                      "typeIdentifier": "t_contract$_AutoPayout_$952",
                                       "typeString": "contract AutoPayout"
                                     }
                                   ],
-                                  "id": 365,
+                                  "id": 934,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "lValueRequested": false,
                                   "nodeType": "ElementaryTypeNameExpression",
-                                  "src": "1452:7:2",
+                                  "src": "1452:7:3",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_type$_t_address_$",
                                     "typeString": "type(address)"
                                   },
                                   "typeName": "address"
                                 },
-                                "id": 367,
+                                "id": 936,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4425,7 +4425,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "1452:13:2",
+                                "src": "1452:13:3",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -4441,32 +4441,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 363,
+                                "id": 932,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 239,
-                                "src": "1436:5:2",
+                                "referencedDeclaration": 808,
+                                "src": "1436:5:3",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 364,
+                              "id": 933,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "1436:15:2",
+                              "referencedDeclaration": 10977,
+                              "src": "1436:15:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 368,
+                            "id": 937,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4474,7 +4474,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "1436:30:2",
+                            "src": "1436:30:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -4494,32 +4494,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 360,
+                            "id": 929,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 239,
-                            "src": "1414:5:2",
+                            "referencedDeclaration": 808,
+                            "src": "1414:5:3",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 361,
+                          "id": 930,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "1414:14:2",
+                          "referencedDeclaration": 10965,
+                          "src": "1414:14:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 369,
+                        "id": 938,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4527,7 +4527,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "1414:53:2",
+                        "src": "1414:53:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4541,21 +4541,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 359,
+                      "id": 928,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1406:7:2",
+                      "referencedDeclaration": 11318,
+                      "src": "1406:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 370,
+                    "id": 939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4563,15 +4563,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1406:62:2",
+                    "src": "1406:62:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 371,
+                  "id": 940,
                   "nodeType": "ExpressionStatement",
-                  "src": "1406:62:2"
+                  "src": "1406:62:3"
                 },
                 {
                   "eventCall": {
@@ -4581,18 +4581,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 373,
+                          "id": 942,
                           "name": "block",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7759,
-                          "src": "1491:5:2",
+                          "referencedDeclaration": 11305,
+                          "src": "1491:5:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_block",
                             "typeString": "block"
                           }
                         },
-                        "id": 374,
+                        "id": 943,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4600,7 +4600,7 @@
                         "memberName": "timestamp",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1491:15:2",
+                        "src": "1491:15:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4614,18 +4614,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 372,
+                      "id": 941,
                       "name": "Suicide",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 232,
-                      "src": "1483:7:2",
+                      "referencedDeclaration": 801,
+                      "src": "1483:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 375,
+                    "id": 944,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4633,15 +4633,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1483:24:2",
+                    "src": "1483:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 376,
+                  "id": 945,
                   "nodeType": "EmitStatement",
-                  "src": "1478:29:2"
+                  "src": "1478:29:3"
                 },
                 {
                   "expression": {
@@ -4649,12 +4649,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 378,
+                        "id": 947,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "1587:5:2",
+                        "referencedDeclaration": 10800,
+                        "src": "1587:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4668,18 +4668,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 377,
+                      "id": 946,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "1574:12:2",
+                      "referencedDeclaration": 11323,
+                      "src": "1574:12:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 379,
+                    "id": 948,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4687,71 +4687,71 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:19:2",
+                    "src": "1574:19:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 380,
+                  "id": 949,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:19:2"
+                  "src": "1574:19:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 382,
+            "id": 951,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 357,
+                "id": 926,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 356,
+                  "id": 925,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1386:9:2",
+                  "referencedDeclaration": 10830,
+                  "src": "1386:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1386:9:2"
+                "src": "1386:9:3"
               }
             ],
             "name": "kill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 355,
+              "id": 924,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1376:2:2"
+              "src": "1376:2:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 358,
+              "id": 927,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1396:0:2"
+              "src": "1396:0:3"
             },
-            "scope": 383,
-            "src": "1363:237:2",
+            "scope": 952,
+            "src": "1363:237:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 384,
-        "src": "89:1513:2"
+        "scope": 953,
+        "src": "89:1513:3"
       }
     ],
-    "src": "0:1603:2"
+    "src": "0:1603:3"
   },
   "compiler": {
     "name": "solc",
@@ -4759,5 +4759,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.127Z"
+  "updatedAt": "2019-01-10T13:57:39.963Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/BasicToken.json b/blockchain/source/migration_artifacts/contracts/BasicToken.json
index bae6450d8..22dc8c68c 100644
--- a/blockchain/source/migration_artifacts/contracts/BasicToken.json
+++ b/blockchain/source/migration_artifacts/contracts/BasicToken.json
@@ -82,22 +82,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b5061027a806100206000396000f3006080604052600436106100565763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318160ddd811461005b57806370a0823114610082578063a9059cbb146100b0575b600080fd5b34801561006757600080fd5b506100706100f5565b60408051918252519081900360200190f35b34801561008e57600080fd5b5061007073ffffffffffffffffffffffffffffffffffffffff600435166100fb565b3480156100bc57600080fd5b506100e173ffffffffffffffffffffffffffffffffffffffff60043516602435610123565b604080519115158252519081900360200190f35b60015490565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561013f57600080fd5b73ffffffffffffffffffffffffffffffffffffffff8316151561016157600080fd5b33600090815260208190526040902054610181908363ffffffff61022916565b336000908152602081905260408082209290925573ffffffffffffffffffffffffffffffffffffffff8516815220546101c0908363ffffffff61023b16565b73ffffffffffffffffffffffffffffffffffffffff8416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b60008282111561023557fe5b50900390565b8181018281101561024857fe5b929150505600a165627a7a72305820a73f6f448cf69fbe26f0b7d655baa07795e7ba05810e585a35162fdf09634a9f0029",
   "deployedBytecode": "0x6080604052600436106100565763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318160ddd811461005b57806370a0823114610082578063a9059cbb146100b0575b600080fd5b34801561006757600080fd5b506100706100f5565b60408051918252519081900360200190f35b34801561008e57600080fd5b5061007073ffffffffffffffffffffffffffffffffffffffff600435166100fb565b3480156100bc57600080fd5b506100e173ffffffffffffffffffffffffffffffffffffffff60043516602435610123565b604080519115158252519081900360200190f35b60015490565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561013f57600080fd5b73ffffffffffffffffffffffffffffffffffffffff8316151561016157600080fd5b33600090815260208190526040902054610181908363ffffffff61022916565b336000908152602081905260408082209290925573ffffffffffffffffffffffffffffffffffffffff8516815220546101c0908363ffffffff61023b16565b73ffffffffffffffffffffffffffffffffffffffff8416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b60008282111561023557fe5b50900390565b8181018281101561024857fe5b929150505600a165627a7a72305820a73f6f448cf69fbe26f0b7d655baa07795e7ba05810e585a35162fdf09634a9f0029",
-  "sourceMap": "180:1071:19:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;180:1071:19;;;;;;;",
-  "deployedSourceMap": "180:1071:19:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:19;;;;;;;;;;;;;;;;;;;;1149:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:19;;;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:19;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;455:12;;389:83;:::o;1149:99::-;1227:16;;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;754:17;;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;:20;856:13;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;840:13;;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:19;626:321;;;;:::o;1060:116:17:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:17;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
+  "sourceMap": "180:1071:17:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;180:1071:17;;;;;;;",
+  "deployedSourceMap": "180:1071:17:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;1149:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;;;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;455:12;;389:83;:::o;1149:99::-;1227:16;;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;754:17;;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;:20;856:13;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;840:13;;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
   "source": "pragma solidity ^0.4.24;\n\n\nimport \"./ERC20Basic.sol\";\nimport \"../../math/SafeMath.sol\";\n\n\n/**\n * @title Basic token\n * @dev Basic version of StandardToken, with no allowances.\n */\ncontract BasicToken is ERC20Basic {\n  using SafeMath for uint256;\n\n  mapping(address => uint256) internal balances;\n\n  uint256 internal totalSupply_;\n\n  /**\n  * @dev Total number of tokens in existence\n  */\n  function totalSupply() public view returns (uint256) {\n    return totalSupply_;\n  }\n\n  /**\n  * @dev Transfer token for a specified address\n  * @param _to The address to transfer to.\n  * @param _value The amount to be transferred.\n  */\n  function transfer(address _to, uint256 _value) public returns (bool) {\n    require(_value <= balances[msg.sender]);\n    require(_to != address(0));\n\n    balances[msg.sender] = balances[msg.sender].sub(_value);\n    balances[_to] = balances[_to].add(_value);\n    emit Transfer(msg.sender, _to, _value);\n    return true;\n  }\n\n  /**\n  * @dev Gets the balance of the specified address.\n  * @param _owner The address to query the the balance of.\n  * @return An uint256 representing the amount owned by the passed address.\n  */\n  function balanceOf(address _owner) public view returns (uint256) {\n    return balances[_owner];\n  }\n\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
     "exportedSymbols": {
       "BasicToken": [
-        7432
+        10978
       ]
     },
-    "id": 7433,
+    "id": 10979,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7338,
+        "id": 10884,
         "literals": [
           "solidity",
           "^",
@@ -105,27 +105,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:19"
+        "src": "0:24:17"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 7339,
+        "id": 10885,
         "nodeType": "ImportDirective",
-        "scope": 7433,
-        "sourceUnit": 7508,
-        "src": "27:26:19",
+        "scope": 10979,
+        "sourceUnit": 11054,
+        "src": "27:26:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
         "file": "../../math/SafeMath.sol",
-        "id": 7340,
+        "id": 10886,
         "nodeType": "ImportDirective",
-        "scope": 7433,
-        "sourceUnit": 7251,
-        "src": "54:33:19",
+        "scope": 10979,
+        "sourceUnit": 10797,
+        "src": "54:33:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -135,56 +135,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7341,
+              "id": 10887,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7507,
-              "src": "203:10:19",
+              "referencedDeclaration": 11053,
+              "src": "203:10:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$7507",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 7342,
+            "id": 10888,
             "nodeType": "InheritanceSpecifier",
-            "src": "203:10:19"
+            "src": "203:10:17"
           }
         ],
         "contractDependencies": [
-          7507
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.",
         "fullyImplemented": true,
-        "id": 7432,
+        "id": 10978,
         "linearizedBaseContracts": [
-          7432,
-          7507
+          10978,
+          11053
         ],
         "name": "BasicToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 7345,
+            "id": 10891,
             "libraryName": {
               "contractScope": null,
-              "id": 7343,
+              "id": 10889,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "224:8:19",
+              "referencedDeclaration": 10796,
+              "src": "224:8:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "218:27:19",
+            "src": "218:27:17",
             "typeName": {
-              "id": 7344,
+              "id": 10890,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "237:7:19",
+              "src": "237:7:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -193,11 +193,11 @@
           },
           {
             "constant": false,
-            "id": 7349,
+            "id": 10895,
             "name": "balances",
             "nodeType": "VariableDeclaration",
-            "scope": 7432,
-            "src": "249:45:19",
+            "scope": 10978,
+            "src": "249:45:17",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -205,28 +205,28 @@
               "typeString": "mapping(address => uint256)"
             },
             "typeName": {
-              "id": 7348,
+              "id": 10894,
               "keyType": {
-                "id": 7346,
+                "id": 10892,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "257:7:19",
+                "src": "257:7:17",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "249:27:19",
+              "src": "249:27:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                 "typeString": "mapping(address => uint256)"
               },
               "valueType": {
-                "id": 7347,
+                "id": 10893,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "268:7:19",
+                "src": "268:7:17",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
@@ -238,11 +238,11 @@
           },
           {
             "constant": false,
-            "id": 7351,
+            "id": 10897,
             "name": "totalSupply_",
             "nodeType": "VariableDeclaration",
-            "scope": 7432,
-            "src": "299:29:19",
+            "scope": 10978,
+            "src": "299:29:17",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -250,10 +250,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 7350,
+              "id": 10896,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "299:7:19",
+              "src": "299:7:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -264,33 +264,33 @@
           },
           {
             "body": {
-              "id": 7358,
+              "id": 10904,
               "nodeType": "Block",
-              "src": "442:30:19",
+              "src": "442:30:17",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7356,
+                    "id": 10902,
                     "name": "totalSupply_",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 7351,
-                    "src": "455:12:19",
+                    "referencedDeclaration": 10897,
+                    "src": "455:12:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7355,
-                  "id": 7357,
+                  "functionReturnParameters": 10901,
+                  "id": 10903,
                   "nodeType": "Return",
-                  "src": "448:19:19"
+                  "src": "448:19:17"
                 }
               ]
             },
             "documentation": "@dev Total number of tokens in existence",
-            "id": 7359,
+            "id": 10905,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -298,23 +298,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7352,
+              "id": 10898,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "409:2:19"
+              "src": "409:2:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7355,
+              "id": 10901,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7354,
+                  "id": 10900,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7359,
-                  "src": "433:7:19",
+                  "scope": 10905,
+                  "src": "433:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -322,10 +322,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7353,
+                    "id": 10899,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "433:7:19",
+                    "src": "433:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -335,19 +335,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "432:9:19"
+              "src": "432:9:17"
             },
-            "scope": 7432,
-            "src": "389:83:19",
+            "scope": 10978,
+            "src": "389:83:17",
             "stateMutability": "view",
-            "superFunction": 7482,
+            "superFunction": 11028,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7418,
+              "id": 10964,
               "nodeType": "Block",
-              "src": "695:252:19",
+              "src": "695:252:17",
               "statements": [
                 {
                   "expression": {
@@ -359,19 +359,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7374,
+                        "id": 10920,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7369,
+                          "id": 10915,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "709:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "709:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -383,34 +383,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7370,
+                            "id": 10916,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "719:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "719:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7373,
+                          "id": 10919,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7371,
+                              "id": 10917,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "728:3:19",
+                              "referencedDeclaration": 11315,
+                              "src": "728:3:17",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7372,
+                            "id": 10918,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -418,7 +418,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "728:10:19",
+                            "src": "728:10:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -429,13 +429,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "719:20:19",
+                          "src": "719:20:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "709:30:19",
+                        "src": "709:30:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -449,21 +449,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7368,
+                      "id": 10914,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "701:7:19",
+                      "referencedDeclaration": 11318,
+                      "src": "701:7:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7375,
+                    "id": 10921,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -471,15 +471,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "701:39:19",
+                    "src": "701:39:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7376,
+                  "id": 10922,
                   "nodeType": "ExpressionStatement",
-                  "src": "701:39:19"
+                  "src": "701:39:17"
                 },
                 {
                   "expression": {
@@ -491,19 +491,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 7382,
+                        "id": 10928,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7378,
+                          "id": 10924,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7361,
-                          "src": "754:3:19",
+                          "referencedDeclaration": 10907,
+                          "src": "754:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -517,14 +517,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 7380,
+                              "id": 10926,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "769:1:19",
+                              "src": "769:1:17",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -540,20 +540,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 7379,
+                            "id": 10925,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "761:7:19",
+                            "src": "761:7:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 7381,
+                          "id": 10927,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -561,13 +561,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "761:10:19",
+                          "src": "761:10:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "754:17:19",
+                        "src": "754:17:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -581,21 +581,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7377,
+                      "id": 10923,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "746:7:19",
+                      "referencedDeclaration": 11318,
+                      "src": "746:7:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7383,
+                    "id": 10929,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -603,20 +603,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "746:26:19",
+                    "src": "746:26:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7384,
+                  "id": 10930,
                   "nodeType": "ExpressionStatement",
-                  "src": "746:26:19"
+                  "src": "746:26:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7396,
+                    "id": 10942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -625,34 +625,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7385,
+                        "id": 10931,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "779:8:19",
+                        "referencedDeclaration": 10895,
+                        "src": "779:8:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7388,
+                      "id": 10934,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7386,
+                          "id": 10932,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "788:3:19",
+                          "referencedDeclaration": 11315,
+                          "src": "788:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7387,
+                        "id": 10933,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -660,7 +660,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "788:10:19",
+                        "src": "788:10:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -671,7 +671,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "779:20:19",
+                      "src": "779:20:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -684,12 +684,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7394,
+                          "id": 10940,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "827:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "827:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -707,34 +707,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7389,
+                            "id": 10935,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "802:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "802:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7392,
+                          "id": 10938,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7390,
+                              "id": 10936,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "811:3:19",
+                              "referencedDeclaration": 11315,
+                              "src": "811:3:17",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7391,
+                            "id": 10937,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -742,7 +742,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "811:10:19",
+                            "src": "811:10:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -753,27 +753,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "802:20:19",
+                          "src": "802:20:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7393,
+                        "id": 10939,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "802:24:19",
+                        "referencedDeclaration": 10771,
+                        "src": "802:24:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7395,
+                      "id": 10941,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -781,26 +781,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "802:32:19",
+                      "src": "802:32:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "779:55:19",
+                    "src": "779:55:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7397,
+                  "id": 10943,
                   "nodeType": "ExpressionStatement",
-                  "src": "779:55:19"
+                  "src": "779:55:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7407,
+                    "id": 10953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -809,26 +809,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7398,
+                        "id": 10944,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "840:8:19",
+                        "referencedDeclaration": 10895,
+                        "src": "840:8:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7400,
+                      "id": 10946,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7399,
+                        "id": 10945,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7361,
-                        "src": "849:3:19",
+                        "referencedDeclaration": 10907,
+                        "src": "849:3:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -839,7 +839,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "840:13:19",
+                      "src": "840:13:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -852,12 +852,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7405,
+                          "id": 10951,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "874:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "874:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -875,26 +875,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7401,
+                            "id": 10947,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "856:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "856:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7403,
+                          "id": 10949,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7402,
+                            "id": 10948,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7361,
-                            "src": "865:3:19",
+                            "referencedDeclaration": 10907,
+                            "src": "865:3:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -905,27 +905,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "856:13:19",
+                          "src": "856:13:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7404,
+                        "id": 10950,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "856:17:19",
+                        "referencedDeclaration": 10795,
+                        "src": "856:17:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7406,
+                      "id": 10952,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -933,21 +933,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "856:25:19",
+                      "src": "856:25:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "840:41:19",
+                    "src": "840:41:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7408,
+                  "id": 10954,
                   "nodeType": "ExpressionStatement",
-                  "src": "840:41:19"
+                  "src": "840:41:17"
                 },
                 {
                   "eventCall": {
@@ -957,18 +957,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7410,
+                          "id": 10956,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "901:3:19",
+                          "referencedDeclaration": 11315,
+                          "src": "901:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7411,
+                        "id": 10957,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -976,7 +976,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "901:10:19",
+                        "src": "901:10:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -984,12 +984,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7412,
+                        "id": 10958,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7361,
-                        "src": "913:3:19",
+                        "referencedDeclaration": 10907,
+                        "src": "913:3:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -997,12 +997,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7413,
+                        "id": 10959,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7363,
-                        "src": "918:6:19",
+                        "referencedDeclaration": 10909,
+                        "src": "918:6:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1024,18 +1024,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7409,
+                      "id": 10955,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7506,
-                      "src": "892:8:19",
+                      "referencedDeclaration": 11052,
+                      "src": "892:8:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7414,
+                    "id": 10960,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1043,28 +1043,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "892:33:19",
+                    "src": "892:33:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7415,
+                  "id": 10961,
                   "nodeType": "EmitStatement",
-                  "src": "887:38:19"
+                  "src": "887:38:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7416,
+                    "id": 10962,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "938:4:19",
+                    "src": "938:4:17",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1072,15 +1072,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7367,
-                  "id": 7417,
+                  "functionReturnParameters": 10913,
+                  "id": 10963,
                   "nodeType": "Return",
-                  "src": "931:11:19"
+                  "src": "931:11:17"
                 }
               ]
             },
             "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.",
-            "id": 7419,
+            "id": 10965,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1088,16 +1088,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7364,
+              "id": 10910,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7361,
+                  "id": 10907,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "644:11:19",
+                  "scope": 10965,
+                  "src": "644:11:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1105,10 +1105,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7360,
+                    "id": 10906,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "644:7:19",
+                    "src": "644:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1119,11 +1119,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7363,
+                  "id": 10909,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "657:14:19",
+                  "scope": 10965,
+                  "src": "657:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1131,10 +1131,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7362,
+                    "id": 10908,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "657:7:19",
+                    "src": "657:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1144,20 +1144,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "643:29:19"
+              "src": "643:29:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7367,
+              "id": 10913,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7366,
+                  "id": 10912,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "689:4:19",
+                  "scope": 10965,
+                  "src": "689:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1165,10 +1165,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7365,
+                    "id": 10911,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "689:4:19",
+                    "src": "689:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1178,45 +1178,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "688:6:19"
+              "src": "688:6:17"
             },
-            "scope": 7432,
-            "src": "626:321:19",
+            "scope": 10978,
+            "src": "626:321:17",
             "stateMutability": "nonpayable",
-            "superFunction": 7498,
+            "superFunction": 11044,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7430,
+              "id": 10976,
               "nodeType": "Block",
-              "src": "1214:34:19",
+              "src": "1214:34:17",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 7426,
+                      "id": 10972,
                       "name": "balances",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7349,
-                      "src": "1227:8:19",
+                      "referencedDeclaration": 10895,
+                      "src": "1227:8:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7428,
+                    "id": 10974,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7427,
+                      "id": 10973,
                       "name": "_owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7421,
-                      "src": "1236:6:19",
+                      "referencedDeclaration": 10967,
+                      "src": "1236:6:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1227,21 +1227,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1227:16:19",
+                    "src": "1227:16:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7425,
-                  "id": 7429,
+                  "functionReturnParameters": 10971,
+                  "id": 10975,
                   "nodeType": "Return",
-                  "src": "1220:23:19"
+                  "src": "1220:23:17"
                 }
               ]
             },
             "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.",
-            "id": 7431,
+            "id": 10977,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1249,16 +1249,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7422,
+              "id": 10968,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7421,
+                  "id": 10967,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7431,
-                  "src": "1168:14:19",
+                  "scope": 10977,
+                  "src": "1168:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1266,10 +1266,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7420,
+                    "id": 10966,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1168:7:19",
+                    "src": "1168:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1279,20 +1279,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1167:16:19"
+              "src": "1167:16:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7425,
+              "id": 10971,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7424,
+                  "id": 10970,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7431,
-                  "src": "1205:7:19",
+                  "scope": 10977,
+                  "src": "1205:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1300,10 +1300,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7423,
+                    "id": 10969,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1205:7:19",
+                    "src": "1205:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1313,33 +1313,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1204:9:19"
+              "src": "1204:9:17"
             },
-            "scope": 7432,
-            "src": "1149:99:19",
+            "scope": 10978,
+            "src": "1149:99:17",
             "stateMutability": "view",
-            "superFunction": 7489,
+            "superFunction": 11035,
             "visibility": "public"
           }
         ],
-        "scope": 7433,
-        "src": "180:1071:19"
+        "scope": 10979,
+        "src": "180:1071:17"
       }
     ],
-    "src": "0:1252:19"
+    "src": "0:1252:17"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
     "exportedSymbols": {
       "BasicToken": [
-        7432
+        10978
       ]
     },
-    "id": 7433,
+    "id": 10979,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7338,
+        "id": 10884,
         "literals": [
           "solidity",
           "^",
@@ -1347,27 +1347,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:19"
+        "src": "0:24:17"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 7339,
+        "id": 10885,
         "nodeType": "ImportDirective",
-        "scope": 7433,
-        "sourceUnit": 7508,
-        "src": "27:26:19",
+        "scope": 10979,
+        "sourceUnit": 11054,
+        "src": "27:26:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
         "file": "../../math/SafeMath.sol",
-        "id": 7340,
+        "id": 10886,
         "nodeType": "ImportDirective",
-        "scope": 7433,
-        "sourceUnit": 7251,
-        "src": "54:33:19",
+        "scope": 10979,
+        "sourceUnit": 10797,
+        "src": "54:33:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -1377,56 +1377,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7341,
+              "id": 10887,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7507,
-              "src": "203:10:19",
+              "referencedDeclaration": 11053,
+              "src": "203:10:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$7507",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 7342,
+            "id": 10888,
             "nodeType": "InheritanceSpecifier",
-            "src": "203:10:19"
+            "src": "203:10:17"
           }
         ],
         "contractDependencies": [
-          7507
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.",
         "fullyImplemented": true,
-        "id": 7432,
+        "id": 10978,
         "linearizedBaseContracts": [
-          7432,
-          7507
+          10978,
+          11053
         ],
         "name": "BasicToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 7345,
+            "id": 10891,
             "libraryName": {
               "contractScope": null,
-              "id": 7343,
+              "id": 10889,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "224:8:19",
+              "referencedDeclaration": 10796,
+              "src": "224:8:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "218:27:19",
+            "src": "218:27:17",
             "typeName": {
-              "id": 7344,
+              "id": 10890,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "237:7:19",
+              "src": "237:7:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1435,11 +1435,11 @@
           },
           {
             "constant": false,
-            "id": 7349,
+            "id": 10895,
             "name": "balances",
             "nodeType": "VariableDeclaration",
-            "scope": 7432,
-            "src": "249:45:19",
+            "scope": 10978,
+            "src": "249:45:17",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1447,28 +1447,28 @@
               "typeString": "mapping(address => uint256)"
             },
             "typeName": {
-              "id": 7348,
+              "id": 10894,
               "keyType": {
-                "id": 7346,
+                "id": 10892,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "257:7:19",
+                "src": "257:7:17",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "249:27:19",
+              "src": "249:27:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                 "typeString": "mapping(address => uint256)"
               },
               "valueType": {
-                "id": 7347,
+                "id": 10893,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "268:7:19",
+                "src": "268:7:17",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
@@ -1480,11 +1480,11 @@
           },
           {
             "constant": false,
-            "id": 7351,
+            "id": 10897,
             "name": "totalSupply_",
             "nodeType": "VariableDeclaration",
-            "scope": 7432,
-            "src": "299:29:19",
+            "scope": 10978,
+            "src": "299:29:17",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1492,10 +1492,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 7350,
+              "id": 10896,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "299:7:19",
+              "src": "299:7:17",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1506,33 +1506,33 @@
           },
           {
             "body": {
-              "id": 7358,
+              "id": 10904,
               "nodeType": "Block",
-              "src": "442:30:19",
+              "src": "442:30:17",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7356,
+                    "id": 10902,
                     "name": "totalSupply_",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 7351,
-                    "src": "455:12:19",
+                    "referencedDeclaration": 10897,
+                    "src": "455:12:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7355,
-                  "id": 7357,
+                  "functionReturnParameters": 10901,
+                  "id": 10903,
                   "nodeType": "Return",
-                  "src": "448:19:19"
+                  "src": "448:19:17"
                 }
               ]
             },
             "documentation": "@dev Total number of tokens in existence",
-            "id": 7359,
+            "id": 10905,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1540,23 +1540,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7352,
+              "id": 10898,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "409:2:19"
+              "src": "409:2:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7355,
+              "id": 10901,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7354,
+                  "id": 10900,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7359,
-                  "src": "433:7:19",
+                  "scope": 10905,
+                  "src": "433:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1564,10 +1564,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7353,
+                    "id": 10899,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "433:7:19",
+                    "src": "433:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1577,19 +1577,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "432:9:19"
+              "src": "432:9:17"
             },
-            "scope": 7432,
-            "src": "389:83:19",
+            "scope": 10978,
+            "src": "389:83:17",
             "stateMutability": "view",
-            "superFunction": 7482,
+            "superFunction": 11028,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7418,
+              "id": 10964,
               "nodeType": "Block",
-              "src": "695:252:19",
+              "src": "695:252:17",
               "statements": [
                 {
                   "expression": {
@@ -1601,19 +1601,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7374,
+                        "id": 10920,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7369,
+                          "id": 10915,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "709:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "709:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1625,34 +1625,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7370,
+                            "id": 10916,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "719:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "719:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7373,
+                          "id": 10919,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7371,
+                              "id": 10917,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "728:3:19",
+                              "referencedDeclaration": 11315,
+                              "src": "728:3:17",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7372,
+                            "id": 10918,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1660,7 +1660,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "728:10:19",
+                            "src": "728:10:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1671,13 +1671,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "719:20:19",
+                          "src": "719:20:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "709:30:19",
+                        "src": "709:30:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1691,21 +1691,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7368,
+                      "id": 10914,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "701:7:19",
+                      "referencedDeclaration": 11318,
+                      "src": "701:7:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7375,
+                    "id": 10921,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1713,15 +1713,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "701:39:19",
+                    "src": "701:39:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7376,
+                  "id": 10922,
                   "nodeType": "ExpressionStatement",
-                  "src": "701:39:19"
+                  "src": "701:39:17"
                 },
                 {
                   "expression": {
@@ -1733,19 +1733,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 7382,
+                        "id": 10928,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7378,
+                          "id": 10924,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7361,
-                          "src": "754:3:19",
+                          "referencedDeclaration": 10907,
+                          "src": "754:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1759,14 +1759,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 7380,
+                              "id": 10926,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "769:1:19",
+                              "src": "769:1:17",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1782,20 +1782,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 7379,
+                            "id": 10925,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "761:7:19",
+                            "src": "761:7:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 7381,
+                          "id": 10927,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1803,13 +1803,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "761:10:19",
+                          "src": "761:10:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "754:17:19",
+                        "src": "754:17:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1823,21 +1823,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7377,
+                      "id": 10923,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "746:7:19",
+                      "referencedDeclaration": 11318,
+                      "src": "746:7:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7383,
+                    "id": 10929,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1845,20 +1845,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "746:26:19",
+                    "src": "746:26:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7384,
+                  "id": 10930,
                   "nodeType": "ExpressionStatement",
-                  "src": "746:26:19"
+                  "src": "746:26:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7396,
+                    "id": 10942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1867,34 +1867,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7385,
+                        "id": 10931,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "779:8:19",
+                        "referencedDeclaration": 10895,
+                        "src": "779:8:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7388,
+                      "id": 10934,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7386,
+                          "id": 10932,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "788:3:19",
+                          "referencedDeclaration": 11315,
+                          "src": "788:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7387,
+                        "id": 10933,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1902,7 +1902,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "788:10:19",
+                        "src": "788:10:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1913,7 +1913,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "779:20:19",
+                      "src": "779:20:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1926,12 +1926,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7394,
+                          "id": 10940,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "827:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "827:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1949,34 +1949,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7389,
+                            "id": 10935,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "802:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "802:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7392,
+                          "id": 10938,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7390,
+                              "id": 10936,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "811:3:19",
+                              "referencedDeclaration": 11315,
+                              "src": "811:3:17",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7391,
+                            "id": 10937,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1984,7 +1984,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "811:10:19",
+                            "src": "811:10:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1995,27 +1995,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "802:20:19",
+                          "src": "802:20:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7393,
+                        "id": 10939,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "802:24:19",
+                        "referencedDeclaration": 10771,
+                        "src": "802:24:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7395,
+                      "id": 10941,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2023,26 +2023,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "802:32:19",
+                      "src": "802:32:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "779:55:19",
+                    "src": "779:55:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7397,
+                  "id": 10943,
                   "nodeType": "ExpressionStatement",
-                  "src": "779:55:19"
+                  "src": "779:55:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7407,
+                    "id": 10953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2051,26 +2051,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7398,
+                        "id": 10944,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "840:8:19",
+                        "referencedDeclaration": 10895,
+                        "src": "840:8:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7400,
+                      "id": 10946,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7399,
+                        "id": 10945,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7361,
-                        "src": "849:3:19",
+                        "referencedDeclaration": 10907,
+                        "src": "849:3:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2081,7 +2081,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "840:13:19",
+                      "src": "840:13:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2094,12 +2094,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7405,
+                          "id": 10951,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7363,
-                          "src": "874:6:19",
+                          "referencedDeclaration": 10909,
+                          "src": "874:6:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2117,26 +2117,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7401,
+                            "id": 10947,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "856:8:19",
+                            "referencedDeclaration": 10895,
+                            "src": "856:8:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7403,
+                          "id": 10949,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7402,
+                            "id": 10948,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7361,
-                            "src": "865:3:19",
+                            "referencedDeclaration": 10907,
+                            "src": "865:3:17",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2147,27 +2147,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "856:13:19",
+                          "src": "856:13:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7404,
+                        "id": 10950,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "856:17:19",
+                        "referencedDeclaration": 10795,
+                        "src": "856:17:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7406,
+                      "id": 10952,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2175,21 +2175,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "856:25:19",
+                      "src": "856:25:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "840:41:19",
+                    "src": "840:41:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7408,
+                  "id": 10954,
                   "nodeType": "ExpressionStatement",
-                  "src": "840:41:19"
+                  "src": "840:41:17"
                 },
                 {
                   "eventCall": {
@@ -2199,18 +2199,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7410,
+                          "id": 10956,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "901:3:19",
+                          "referencedDeclaration": 11315,
+                          "src": "901:3:17",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7411,
+                        "id": 10957,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2218,7 +2218,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "901:10:19",
+                        "src": "901:10:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2226,12 +2226,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7412,
+                        "id": 10958,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7361,
-                        "src": "913:3:19",
+                        "referencedDeclaration": 10907,
+                        "src": "913:3:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2239,12 +2239,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7413,
+                        "id": 10959,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7363,
-                        "src": "918:6:19",
+                        "referencedDeclaration": 10909,
+                        "src": "918:6:17",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2266,18 +2266,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7409,
+                      "id": 10955,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7506,
-                      "src": "892:8:19",
+                      "referencedDeclaration": 11052,
+                      "src": "892:8:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7414,
+                    "id": 10960,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2285,28 +2285,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "892:33:19",
+                    "src": "892:33:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7415,
+                  "id": 10961,
                   "nodeType": "EmitStatement",
-                  "src": "887:38:19"
+                  "src": "887:38:17"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7416,
+                    "id": 10962,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "938:4:19",
+                    "src": "938:4:17",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2314,15 +2314,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7367,
-                  "id": 7417,
+                  "functionReturnParameters": 10913,
+                  "id": 10963,
                   "nodeType": "Return",
-                  "src": "931:11:19"
+                  "src": "931:11:17"
                 }
               ]
             },
             "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.",
-            "id": 7419,
+            "id": 10965,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2330,16 +2330,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7364,
+              "id": 10910,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7361,
+                  "id": 10907,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "644:11:19",
+                  "scope": 10965,
+                  "src": "644:11:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2347,10 +2347,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7360,
+                    "id": 10906,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "644:7:19",
+                    "src": "644:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2361,11 +2361,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7363,
+                  "id": 10909,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "657:14:19",
+                  "scope": 10965,
+                  "src": "657:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2373,10 +2373,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7362,
+                    "id": 10908,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "657:7:19",
+                    "src": "657:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2386,20 +2386,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "643:29:19"
+              "src": "643:29:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7367,
+              "id": 10913,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7366,
+                  "id": 10912,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7419,
-                  "src": "689:4:19",
+                  "scope": 10965,
+                  "src": "689:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2407,10 +2407,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7365,
+                    "id": 10911,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "689:4:19",
+                    "src": "689:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2420,45 +2420,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "688:6:19"
+              "src": "688:6:17"
             },
-            "scope": 7432,
-            "src": "626:321:19",
+            "scope": 10978,
+            "src": "626:321:17",
             "stateMutability": "nonpayable",
-            "superFunction": 7498,
+            "superFunction": 11044,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7430,
+              "id": 10976,
               "nodeType": "Block",
-              "src": "1214:34:19",
+              "src": "1214:34:17",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 7426,
+                      "id": 10972,
                       "name": "balances",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7349,
-                      "src": "1227:8:19",
+                      "referencedDeclaration": 10895,
+                      "src": "1227:8:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7428,
+                    "id": 10974,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7427,
+                      "id": 10973,
                       "name": "_owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7421,
-                      "src": "1236:6:19",
+                      "referencedDeclaration": 10967,
+                      "src": "1236:6:17",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2469,21 +2469,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1227:16:19",
+                    "src": "1227:16:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7425,
-                  "id": 7429,
+                  "functionReturnParameters": 10971,
+                  "id": 10975,
                   "nodeType": "Return",
-                  "src": "1220:23:19"
+                  "src": "1220:23:17"
                 }
               ]
             },
             "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.",
-            "id": 7431,
+            "id": 10977,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2491,16 +2491,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7422,
+              "id": 10968,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7421,
+                  "id": 10967,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7431,
-                  "src": "1168:14:19",
+                  "scope": 10977,
+                  "src": "1168:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2508,10 +2508,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7420,
+                    "id": 10966,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1168:7:19",
+                    "src": "1168:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2521,20 +2521,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1167:16:19"
+              "src": "1167:16:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7425,
+              "id": 10971,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7424,
+                  "id": 10970,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7431,
-                  "src": "1205:7:19",
+                  "scope": 10977,
+                  "src": "1205:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2542,10 +2542,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7423,
+                    "id": 10969,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1205:7:19",
+                    "src": "1205:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2555,20 +2555,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1204:9:19"
+              "src": "1204:9:17"
             },
-            "scope": 7432,
-            "src": "1149:99:19",
+            "scope": 10978,
+            "src": "1149:99:17",
             "stateMutability": "view",
-            "superFunction": 7489,
+            "superFunction": 11035,
             "visibility": "public"
           }
         ],
-        "scope": 7433,
-        "src": "180:1071:19"
+        "scope": 10979,
+        "src": "180:1071:17"
       }
     ],
-    "src": "0:1252:19"
+    "src": "0:1252:17"
   },
   "compiler": {
     "name": "solc",
@@ -2576,5 +2576,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.162Z"
+  "updatedAt": "2019-01-10T13:57:39.955Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Blacklist.json b/blockchain/source/migration_artifacts/contracts/Blacklist.json
index f8206d9d6..91a47c8ea 100644
--- a/blockchain/source/migration_artifacts/contracts/Blacklist.json
+++ b/blockchain/source/migration_artifacts/contracts/Blacklist.json
@@ -246,22 +246,22 @@
   ],
   "bytecode": "0x608060405260038054600160a060020a031916905534801561002057600080fd5b5060008054600160a060020a0319908116339081179091161790556105e68061004a6000396000f3006080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663473b736f81146100a8578063584720f5146100e3578063715018a61461010457806377d58a151461011b57806380f556051461013c5780638a1051f81461016d5780638da5cb5b1461018e578063968f600c146101a3578063be7c7ac3146101ca578063f2fde38b146101eb575b600080fd5b3480156100b457600080fd5b506100cf600160a060020a036004358116906024351661020c565b604080519115158252519081900360200190f35b3480156100ef57600080fd5b506100cf600160a060020a03600435166102bc565b34801561011057600080fd5b50610119610323565b005b34801561012757600080fd5b506100cf600160a060020a036004351661038f565b34801561014857600080fd5b506101516103d9565b60408051600160a060020a039092168252519081900360200190f35b34801561017957600080fd5b506100cf600160a060020a03600435166103e8565b34801561019a57600080fd5b5061015161044f565b3480156101af57600080fd5b506100cf600160a060020a036004358116906024351661045e565b3480156101d657600080fd5b506100cf600160a060020a036004351661048c565b3480156101f757600080fd5b50610119600160a060020a036004351661051a565b600354600090600160a060020a0316151561022657600080fd5b600354600160a060020a031633148061024e57503360009081526002602052604090205460ff165b151561025957600080fd5b600160a060020a03808416600081815260016020818152604080842095881680855295909152808320805460ff1916909217909155517f708802ac7da0a63d9f6b2df693b53345ad263e42d74c245110e1ec1e03a1567e9190a350600192915050565b60008054600160a060020a031633146102d457600080fd5b600160a060020a03821660009081526002602052604090205460ff1615156001146102fe57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600054600160a060020a0316331461033a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008054600160a060020a031633146103a757600080fd5b5060038054600160a060020a03831673ffffffffffffffffffffffffffffffffffffffff199091161790556001919050565b600354600160a060020a031681565b60008054600160a060020a0316331461040057600080fd5b600160a060020a03821660009081526002602052604090205460ff161561042657600080fd5b50600160a060020a03166000908152600260205260409020805460ff1916600190811790915590565b600054600160a060020a031681565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205460ff1690565b336000908152600160208181526040808420600160a060020a038616855290915282205460ff161515146104bf57600080fd5b336000818152600160209081526040808320600160a060020a0387168085529252808320805460ff19169055519092917f576a9aef294e1b4baf3617fde4cbc80ba5344d5eb508222f29e558981704a45791a3506001919050565b600054600160a060020a0316331461053157600080fd5b61053a8161053d565b50565b600160a060020a038116151561055257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820464d7612eb697c84e91586dcfd1cadb3322d3aa9c03146de08040a490ef5fd2b0029",
   "deployedBytecode": "0x6080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663473b736f81146100a8578063584720f5146100e3578063715018a61461010457806377d58a151461011b57806380f556051461013c5780638a1051f81461016d5780638da5cb5b1461018e578063968f600c146101a3578063be7c7ac3146101ca578063f2fde38b146101eb575b600080fd5b3480156100b457600080fd5b506100cf600160a060020a036004358116906024351661020c565b604080519115158252519081900360200190f35b3480156100ef57600080fd5b506100cf600160a060020a03600435166102bc565b34801561011057600080fd5b50610119610323565b005b34801561012757600080fd5b506100cf600160a060020a036004351661038f565b34801561014857600080fd5b506101516103d9565b60408051600160a060020a039092168252519081900360200190f35b34801561017957600080fd5b506100cf600160a060020a03600435166103e8565b34801561019a57600080fd5b5061015161044f565b3480156101af57600080fd5b506100cf600160a060020a036004358116906024351661045e565b3480156101d657600080fd5b506100cf600160a060020a036004351661048c565b3480156101f757600080fd5b50610119600160a060020a036004351661051a565b600354600090600160a060020a0316151561022657600080fd5b600354600160a060020a031633148061024e57503360009081526002602052604090205460ff165b151561025957600080fd5b600160a060020a03808416600081815260016020818152604080842095881680855295909152808320805460ff1916909217909155517f708802ac7da0a63d9f6b2df693b53345ad263e42d74c245110e1ec1e03a1567e9190a350600192915050565b60008054600160a060020a031633146102d457600080fd5b600160a060020a03821660009081526002602052604090205460ff1615156001146102fe57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600054600160a060020a0316331461033a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008054600160a060020a031633146103a757600080fd5b5060038054600160a060020a03831673ffffffffffffffffffffffffffffffffffffffff199091161790556001919050565b600354600160a060020a031681565b60008054600160a060020a0316331461040057600080fd5b600160a060020a03821660009081526002602052604090205460ff161561042657600080fd5b50600160a060020a03166000908152600260205260409020805460ff1916600190811790915590565b600054600160a060020a031681565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205460ff1690565b336000908152600160208181526040808420600160a060020a038616855290915282205460ff161515146104bf57600080fd5b336000818152600160209081526040808320600160a060020a0387168085529252808320805460ff19169055519092917f576a9aef294e1b4baf3617fde4cbc80ba5344d5eb508222f29e558981704a45791a3506001919050565b600054600160a060020a0316331461053157600080fd5b61053a8161053d565b50565b600160a060020a038116151561055257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820464d7612eb697c84e91586dcfd1cadb3322d3aa9c03146de08040a490ef5fd2b0029",
-  "sourceMap": "89:1574:3:-;;;524:27;;;-1:-1:-1;;;;;;524:27:3;;;558:56;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:18;:18;;-1:-1:-1;;;;;;567:18:18;;;575:10;567:18;;;589::3;;;;;;89:1574;;;;;;",
-  "deployedSourceMap": "89:1574:3:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;745:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;745:190:3;-1:-1:-1;;;;;745:190:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;1358:168;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1358:168:3;-1:-1:-1;;;;;1358:168:3;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;;;1532:129:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1532:129:3;-1:-1:-1;;;;;1532:129:3;;;;;524:27;;8:9:-1;5:2;;;30:1;27;20:12;5:2;524:27:3;;;;;;;;-1:-1:-1;;;;;524:27:3;;;;;;;;;;;;;;1187:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1187:165:3;-1:-1:-1;;;;;1187:165:3;;;;;238:20:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;620:119:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;620:119:3;-1:-1:-1;;;;;620:119:3;;;;;;;;;;941:240;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;941:240:3;-1:-1:-1;;;;;941:240:3;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;745:190:3;166:6;;816:4;;-1:-1:-1;;;;;166:6:3;:13;;158:22;;;;;;212:6;;-1:-1:-1;;;;;212:6:3;198:10;:20;;:42;;-1:-1:-1;229:10:3;222:18;;;;:6;:18;;;;;;;;198:42;190:51;;;;;;;;-1:-1:-1;;;;;832:17:3;;;;;;;859:4;832:17;;;;;;;;:24;;;;;;;;;;;;;:31;;-1:-1:-1;;832:31:3;;;;;;;878:29;;;832:17;878:29;-1:-1:-1;924:4:3;745:190;;;;:::o;1358:168::-;1421:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1445:13:3;;;;;;:6;:13;;;;;;;;:21;;:13;:21;1437:30;;;;;;-1:-1:-1;;;;;;1477:13:3;1493:5;1477:13;;;:6;:13;;;;;:21;;-1:-1:-1;;1477:21:3;;;-1:-1:-1;;1358:168:3:o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;1532:129:3:-;1601:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;1617:6:3;:16;;-1:-1:-1;;;;;1617:16:3;;-1:-1:-1;;1617:16:3;;;;;;;1532:129;;;:::o;524:27::-;;;-1:-1:-1;;;;;524:27:3;;:::o;1187:165::-;1247:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1271:13:3;;;;;;:6;:13;;;;;;;;:22;1263:31;;;;;;-1:-1:-1;;;;;;1304:13:3;;;;;:6;:13;;;;;:20;;-1:-1:-1;;1304:20:3;1320:4;1304:20;;;;;;1320:4;1187:165::o;238:20:18:-;;;-1:-1:-1;;;;;238:20:18;;:::o;620:119:3:-;-1:-1:-1;;;;;708:17:3;;;685:4;708:17;;;:11;:17;;;;;;;;:24;;;;;;;;;;;;;;;620:119::o;941:240::-;1024:10;988:4;1012:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1012:30:3;;;;;;;;;;;;:38;;;1004:47;;;;;;1073:10;1094:5;1061:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1061:30:3;;;;;;;;;;:38;;-1:-1:-1;;1061:38:3;;;1114:39;1061:30;;1073:10;1114:39;;;-1:-1:-1;1170:4:3;941:240;;;:::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o",
+  "sourceMap": "89:1574:4:-;;;524:27;;;-1:-1:-1;;;;;;524:27:4;;;558:56;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;589::4;;;;;;89:1574;;;;;;",
+  "deployedSourceMap": "89:1574:4:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;745:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;745:190:4;-1:-1:-1;;;;;745:190:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;1358:168;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1358:168:4;-1:-1:-1;;;;;1358:168:4;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;1532:129:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1532:129:4;-1:-1:-1;;;;;1532:129:4;;;;;524:27;;8:9:-1;5:2;;;30:1;27;20:12;5:2;524:27:4;;;;;;;;-1:-1:-1;;;;;524:27:4;;;;;;;;;;;;;;1187:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1187:165:4;-1:-1:-1;;;;;1187:165:4;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;620:119:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;620:119:4;-1:-1:-1;;;;;620:119:4;;;;;;;;;;941:240;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;941:240:4;-1:-1:-1;;;;;941:240:4;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;745:190:4;166:6;;816:4;;-1:-1:-1;;;;;166:6:4;:13;;158:22;;;;;;212:6;;-1:-1:-1;;;;;212:6:4;198:10;:20;;:42;;-1:-1:-1;229:10:4;222:18;;;;:6;:18;;;;;;;;198:42;190:51;;;;;;;;-1:-1:-1;;;;;832:17:4;;;;;;;859:4;832:17;;;;;;;;:24;;;;;;;;;;;;;:31;;-1:-1:-1;;832:31:4;;;;;;;878:29;;;832:17;878:29;-1:-1:-1;924:4:4;745:190;;;;:::o;1358:168::-;1421:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1445:13:4;;;;;;:6;:13;;;;;;;;:21;;:13;:21;1437:30;;;;;;-1:-1:-1;;;;;;1477:13:4;1493:5;1477:13;;;:6;:13;;;;;:21;;-1:-1:-1;;1477:21:4;;;-1:-1:-1;;1358:168:4:o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;1532:129:4:-;1601:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;1617:6:4;:16;;-1:-1:-1;;;;;1617:16:4;;-1:-1:-1;;1617:16:4;;;;;;;1532:129;;;:::o;524:27::-;;;-1:-1:-1;;;;;524:27:4;;:::o;1187:165::-;1247:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1271:13:4;;;;;;:6;:13;;;;;;;;:22;1263:31;;;;;;-1:-1:-1;;;;;;1304:13:4;;;;;:6;:13;;;;;:20;;-1:-1:-1;;1304:20:4;1320:4;1304:20;;;;;;1320:4;1187:165::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;620:119:4:-;-1:-1:-1;;;;;708:17:4;;;685:4;708:17;;;:11;:17;;;;;;;;:24;;;;;;;;;;;;;;;620:119::o;941:240::-;1024:10;988:4;1012:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1012:30:4;;;;;;;;;;;;:38;;;1004:47;;;;;;1073:10;1094:5;1061:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1061:30:4;;;;;;;;;;:38;;-1:-1:-1;;1061:38:4;;;1114:39;1061:30;;1073:10;1114:39;;;-1:-1:-1;1170:4:4;941:240;;;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract Blacklist is Ownable {\n\n    modifier OnlyMarket() {\n        require(market != 0x0);\n        require(msg.sender == market || master[msg.sender]);\n        _;\n    }\n\n    event AddedToBlacklist(address indexed adder, address indexed addee);\n\n    event RemovedFromBlacklist(address indexed remover, address indexed removee);\n\n    mapping(address => mapping(address => bool)) blacklisted;\n\n    mapping(address => bool) master;\n\n    address public market = 0x0;\n\n    constructor() public {\n        owner = msg.sender;\n    }\n\n    function Check(address _who, address _whom) public view returns (bool) {\n        return blacklisted[_who][_whom];\n    }\n\n    function Add(address _who, address _whom) external OnlyMarket returns (bool) {\n        blacklisted[_who][_whom] = true;\n        emit AddedToBlacklist(_who, _whom);\n        return true;\n    }\n\n    function Remove(address _whom) public returns (bool) {\n        require(blacklisted[msg.sender][_whom] == true);\n        blacklisted[msg.sender][_whom] = false;\n        emit RemovedFromBlacklist(msg.sender, _whom);\n        return true;\n    }\n\n    function AddMaster(address _root) public onlyOwner returns (bool) {\n        require(master[_root] == false);\n        master[_root] = true;\n        return true;\n    }\n\n    function RemoveMaster(address _root) public onlyOwner returns (bool) {\n        require(master[_root] == true);\n        master[_root] = false;\n        return true;\n    }\n\n    function SetMarketAddress(address _market) public onlyOwner returns (bool) {\n        market = _market;\n        return true;\n    }\n}\n",
   "sourcePath": "contracts/Blacklist.sol",
   "ast": {
     "absolutePath": "contracts/Blacklist.sol",
     "exportedSymbols": {
       "Blacklist": [
-        592
+        1161
       ]
     },
-    "id": 593,
+    "id": 1162,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 385,
+        "id": 954,
         "literals": [
           "solidity",
           "^",
@@ -269,16 +269,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:3"
+        "src": "0:24:4"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 386,
+        "id": 955,
         "nodeType": "ImportDirective",
-        "scope": 593,
-        "sourceUnit": 7337,
-        "src": "27:59:3",
+        "scope": 1162,
+        "sourceUnit": 10883,
+        "src": "27:59:4",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -288,40 +288,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 387,
+              "id": 956,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "111:7:3",
+              "referencedDeclaration": 10882,
+              "src": "111:7:4",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 388,
+            "id": 957,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:3"
+            "src": "111:7:4"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 592,
+        "id": 1161,
         "linearizedBaseContracts": [
-          592,
-          7336
+          1161,
+          10882
         ],
         "name": "Blacklist",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 409,
+              "id": 978,
               "nodeType": "Block",
-              "src": "148:111:3",
+              "src": "148:111:4",
               "statements": [
                 {
                   "expression": {
@@ -333,19 +333,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 393,
+                        "id": 962,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 391,
+                          "id": 960,
                           "name": "market",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 435,
-                          "src": "166:6:3",
+                          "referencedDeclaration": 1004,
+                          "src": "166:6:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -356,14 +356,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "307830",
-                          "id": 392,
+                          "id": 961,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "176:3:3",
+                          "src": "176:3:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -371,7 +371,7 @@
                           },
                           "value": "0x0"
                         },
-                        "src": "166:13:3",
+                        "src": "166:13:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -385,21 +385,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 390,
+                      "id": 959,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "158:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "158:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 394,
+                    "id": 963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -407,15 +407,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "158:22:3",
+                    "src": "158:22:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 395,
+                  "id": 964,
                   "nodeType": "ExpressionStatement",
-                  "src": "158:22:3"
+                  "src": "158:22:4"
                 },
                 {
                   "expression": {
@@ -427,7 +427,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 405,
+                        "id": 974,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -438,7 +438,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 400,
+                          "id": 969,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -447,18 +447,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 397,
+                              "id": 966,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "198:3:3",
+                              "referencedDeclaration": 11315,
+                              "src": "198:3:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 398,
+                            "id": 967,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -466,7 +466,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "198:10:3",
+                            "src": "198:10:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -476,18 +476,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 399,
+                            "id": 968,
                             "name": "market",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 435,
-                            "src": "212:6:3",
+                            "referencedDeclaration": 1004,
+                            "src": "212:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "198:20:3",
+                          "src": "198:20:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -499,34 +499,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 401,
+                            "id": 970,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "222:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "222:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 404,
+                          "id": 973,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 402,
+                              "id": 971,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "229:3:3",
+                              "referencedDeclaration": 11315,
+                              "src": "229:3:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 403,
+                            "id": 972,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -534,7 +534,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "229:10:3",
+                            "src": "229:10:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -545,13 +545,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "222:18:3",
+                          "src": "222:18:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "198:42:3",
+                        "src": "198:42:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -565,21 +565,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 396,
+                      "id": 965,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "190:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "190:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 406,
+                    "id": 975,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -587,54 +587,54 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "190:51:3",
+                    "src": "190:51:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 407,
+                  "id": 976,
                   "nodeType": "ExpressionStatement",
-                  "src": "190:51:3"
+                  "src": "190:51:4"
                 },
                 {
-                  "id": 408,
+                  "id": 977,
                   "nodeType": "PlaceholderStatement",
-                  "src": "251:1:3"
+                  "src": "251:1:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 410,
+            "id": 979,
             "name": "OnlyMarket",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 389,
+              "id": 958,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "145:2:3"
+              "src": "145:2:4"
             },
-            "src": "126:133:3",
+            "src": "126:133:4",
             "visibility": "internal"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 416,
+            "id": 985,
             "name": "AddedToBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 415,
+              "id": 984,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 412,
+                  "id": 981,
                   "indexed": true,
                   "name": "adder",
                   "nodeType": "VariableDeclaration",
-                  "scope": 416,
-                  "src": "288:21:3",
+                  "scope": 985,
+                  "src": "288:21:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -642,10 +642,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 411,
+                    "id": 980,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "288:7:3",
+                    "src": "288:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -656,12 +656,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 414,
+                  "id": 983,
                   "indexed": true,
                   "name": "addee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 416,
-                  "src": "311:21:3",
+                  "scope": 985,
+                  "src": "311:21:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -669,10 +669,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 413,
+                    "id": 982,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "311:7:3",
+                    "src": "311:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -682,28 +682,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "287:46:3"
+              "src": "287:46:4"
             },
-            "src": "265:69:3"
+            "src": "265:69:4"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 422,
+            "id": 991,
             "name": "RemovedFromBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 421,
+              "id": 990,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 418,
+                  "id": 987,
                   "indexed": true,
                   "name": "remover",
                   "nodeType": "VariableDeclaration",
-                  "scope": 422,
-                  "src": "367:23:3",
+                  "scope": 991,
+                  "src": "367:23:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -711,10 +711,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 417,
+                    "id": 986,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "367:7:3",
+                    "src": "367:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -725,12 +725,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 420,
+                  "id": 989,
                   "indexed": true,
                   "name": "removee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 422,
-                  "src": "392:23:3",
+                  "scope": 991,
+                  "src": "392:23:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -738,10 +738,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 419,
+                    "id": 988,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "392:7:3",
+                    "src": "392:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -751,17 +751,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "366:50:3"
+              "src": "366:50:4"
             },
-            "src": "340:77:3"
+            "src": "340:77:4"
           },
           {
             "constant": false,
-            "id": 428,
+            "id": 997,
             "name": "blacklisted",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "423:56:3",
+            "scope": 1161,
+            "src": "423:56:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -769,46 +769,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 427,
+              "id": 996,
               "keyType": {
-                "id": 423,
+                "id": 992,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "431:7:3",
+                "src": "431:7:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "423:44:3",
+              "src": "423:44:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 426,
+                "id": 995,
                 "keyType": {
-                  "id": 424,
+                  "id": 993,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "450:7:3",
+                  "src": "450:7:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "442:24:3",
+                "src": "442:24:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 425,
+                  "id": 994,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "461:4:3",
+                  "src": "461:4:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -821,11 +821,11 @@
           },
           {
             "constant": false,
-            "id": 432,
+            "id": 1001,
             "name": "master",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "486:31:3",
+            "scope": 1161,
+            "src": "486:31:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -833,28 +833,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 431,
+              "id": 1000,
               "keyType": {
-                "id": 429,
+                "id": 998,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "494:7:3",
+                "src": "494:7:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "486:24:3",
+              "src": "486:24:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 430,
+                "id": 999,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "505:4:3",
+                "src": "505:4:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -866,11 +866,11 @@
           },
           {
             "constant": false,
-            "id": 435,
+            "id": 1004,
             "name": "market",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "524:27:3",
+            "scope": 1161,
+            "src": "524:27:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -878,10 +878,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 433,
+              "id": 1002,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "524:7:3",
+              "src": "524:7:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -890,14 +890,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "307830",
-              "id": 434,
+              "id": 1003,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "548:3:3",
+              "src": "548:3:4",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -909,26 +909,26 @@
           },
           {
             "body": {
-              "id": 443,
+              "id": 1012,
               "nodeType": "Block",
-              "src": "579:35:3",
+              "src": "579:35:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 441,
+                    "id": 1010,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 438,
+                      "id": 1007,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "589:5:3",
+                      "referencedDeclaration": 10800,
+                      "src": "589:5:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -940,18 +940,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 439,
+                        "id": 1008,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "597:3:3",
+                        "referencedDeclaration": 11315,
+                        "src": "597:3:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 440,
+                      "id": 1009,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -959,26 +959,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "597:10:3",
+                      "src": "597:10:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "589:18:3",
+                    "src": "589:18:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 442,
+                  "id": 1011,
                   "nodeType": "ExpressionStatement",
-                  "src": "589:18:3"
+                  "src": "589:18:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 444,
+            "id": 1013,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -986,29 +986,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 436,
+              "id": 1005,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "569:2:3"
+              "src": "569:2:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 437,
+              "id": 1006,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "579:0:3"
+              "src": "579:0:4"
             },
-            "scope": 592,
-            "src": "558:56:3",
+            "scope": 1161,
+            "src": "558:56:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 459,
+              "id": 1028,
               "nodeType": "Block",
-              "src": "691:48:3",
+              "src": "691:48:4",
               "statements": [
                 {
                   "expression": {
@@ -1017,26 +1017,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 453,
+                        "id": 1022,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 428,
-                        "src": "708:11:3",
+                        "referencedDeclaration": 997,
+                        "src": "708:11:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                           "typeString": "mapping(address => mapping(address => bool))"
                         }
                       },
-                      "id": 455,
+                      "id": 1024,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 454,
+                        "id": 1023,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 446,
-                        "src": "720:4:3",
+                        "referencedDeclaration": 1015,
+                        "src": "720:4:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1047,21 +1047,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "708:17:3",
+                      "src": "708:17:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                         "typeString": "mapping(address => bool)"
                       }
                     },
-                    "id": 457,
+                    "id": 1026,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 456,
+                      "id": 1025,
                       "name": "_whom",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 448,
-                      "src": "726:5:3",
+                      "referencedDeclaration": 1017,
+                      "src": "726:5:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1072,21 +1072,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "708:24:3",
+                    "src": "708:24:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 452,
-                  "id": 458,
+                  "functionReturnParameters": 1021,
+                  "id": 1027,
                   "nodeType": "Return",
-                  "src": "701:31:3"
+                  "src": "701:31:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 460,
+            "id": 1029,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1094,16 +1094,16 @@
             "name": "Check",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 449,
+              "id": 1018,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 446,
+                  "id": 1015,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "635:12:3",
+                  "scope": 1029,
+                  "src": "635:12:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1111,10 +1111,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 445,
+                    "id": 1014,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "635:7:3",
+                    "src": "635:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1125,11 +1125,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 448,
+                  "id": 1017,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "649:13:3",
+                  "scope": 1029,
+                  "src": "649:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1137,10 +1137,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 447,
+                    "id": 1016,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "649:7:3",
+                    "src": "649:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1150,20 +1150,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "634:29:3"
+              "src": "634:29:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 452,
+              "id": 1021,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 451,
+                  "id": 1020,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "685:4:3",
+                  "scope": 1029,
+                  "src": "685:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1171,10 +1171,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 450,
+                    "id": 1019,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "685:4:3",
+                    "src": "685:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1184,24 +1184,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "684:6:3"
+              "src": "684:6:4"
             },
-            "scope": 592,
-            "src": "620:119:3",
+            "scope": 1161,
+            "src": "620:119:4",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 486,
+              "id": 1055,
               "nodeType": "Block",
-              "src": "822:113:3",
+              "src": "822:113:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 477,
+                    "id": 1046,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1212,26 +1212,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 471,
+                          "id": 1040,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 428,
-                          "src": "832:11:3",
+                          "referencedDeclaration": 997,
+                          "src": "832:11:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 474,
+                        "id": 1043,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 472,
+                          "id": 1041,
                           "name": "_who",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 462,
-                          "src": "844:4:3",
+                          "referencedDeclaration": 1031,
+                          "src": "844:4:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1242,21 +1242,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "832:17:3",
+                        "src": "832:17:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 475,
+                      "id": 1044,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 473,
+                        "id": 1042,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 464,
-                        "src": "850:5:3",
+                        "referencedDeclaration": 1033,
+                        "src": "850:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1267,7 +1267,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "832:24:3",
+                      "src": "832:24:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1278,14 +1278,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 476,
+                      "id": 1045,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "859:4:3",
+                      "src": "859:4:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1293,15 +1293,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "832:31:3",
+                    "src": "832:31:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 478,
+                  "id": 1047,
                   "nodeType": "ExpressionStatement",
-                  "src": "832:31:3"
+                  "src": "832:31:4"
                 },
                 {
                   "eventCall": {
@@ -1309,12 +1309,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 480,
+                        "id": 1049,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 462,
-                        "src": "895:4:3",
+                        "referencedDeclaration": 1031,
+                        "src": "895:4:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1322,12 +1322,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 481,
+                        "id": 1050,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 464,
-                        "src": "901:5:3",
+                        "referencedDeclaration": 1033,
+                        "src": "901:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1345,18 +1345,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 479,
+                      "id": 1048,
                       "name": "AddedToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 416,
-                      "src": "878:16:3",
+                      "referencedDeclaration": 985,
+                      "src": "878:16:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 482,
+                    "id": 1051,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1364,28 +1364,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "878:29:3",
+                    "src": "878:29:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 483,
+                  "id": 1052,
                   "nodeType": "EmitStatement",
-                  "src": "873:34:3"
+                  "src": "873:34:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 484,
+                    "id": 1053,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "924:4:3",
+                    "src": "924:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1393,52 +1393,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 470,
-                  "id": 485,
+                  "functionReturnParameters": 1039,
+                  "id": 1054,
                   "nodeType": "Return",
-                  "src": "917:11:3"
+                  "src": "917:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 487,
+            "id": 1056,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 467,
+                "id": 1036,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 466,
+                  "id": 1035,
                   "name": "OnlyMarket",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 410,
-                  "src": "796:10:3",
+                  "referencedDeclaration": 979,
+                  "src": "796:10:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "796:10:3"
+                "src": "796:10:4"
               }
             ],
             "name": "Add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 465,
+              "id": 1034,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 462,
+                  "id": 1031,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "758:12:3",
+                  "scope": 1056,
+                  "src": "758:12:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1446,10 +1446,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 461,
+                    "id": 1030,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "758:7:3",
+                    "src": "758:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1460,11 +1460,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 464,
+                  "id": 1033,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "772:13:3",
+                  "scope": 1056,
+                  "src": "772:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1472,10 +1472,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 463,
+                    "id": 1032,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:3",
+                    "src": "772:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1485,20 +1485,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "757:29:3"
+              "src": "757:29:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 470,
+              "id": 1039,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 469,
+                  "id": 1038,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "816:4:3",
+                  "scope": 1056,
+                  "src": "816:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1506,10 +1506,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 468,
+                    "id": 1037,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "816:4:3",
+                    "src": "816:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1519,19 +1519,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "815:6:3"
+              "src": "815:6:4"
             },
-            "scope": 592,
-            "src": "745:190:3",
+            "scope": 1161,
+            "src": "745:190:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "external"
           },
           {
             "body": {
-              "id": 522,
+              "id": 1091,
               "nodeType": "Block",
-              "src": "994:187:3",
+              "src": "994:187:4",
               "statements": [
                 {
                   "expression": {
@@ -1543,7 +1543,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 502,
+                        "id": 1071,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1554,34 +1554,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 495,
+                              "id": 1064,
                               "name": "blacklisted",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 428,
-                              "src": "1012:11:3",
+                              "referencedDeclaration": 997,
+                              "src": "1012:11:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 498,
+                            "id": 1067,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 496,
+                                "id": 1065,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "1024:3:3",
+                                "referencedDeclaration": 11315,
+                                "src": "1024:3:4",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 497,
+                              "id": 1066,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -1589,7 +1589,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1024:10:3",
+                              "src": "1024:10:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1600,21 +1600,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1012:23:3",
+                            "src": "1012:23:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 500,
+                          "id": 1069,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 499,
+                            "id": 1068,
                             "name": "_whom",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 489,
-                            "src": "1036:5:3",
+                            "referencedDeclaration": 1058,
+                            "src": "1036:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1625,7 +1625,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1012:30:3",
+                          "src": "1012:30:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -1636,14 +1636,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 501,
+                          "id": 1070,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1046:4:3",
+                          "src": "1046:4:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -1651,7 +1651,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1012:38:3",
+                        "src": "1012:38:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1665,21 +1665,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 494,
+                      "id": 1063,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1004:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1004:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 503,
+                    "id": 1072,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1687,20 +1687,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1004:47:3",
+                    "src": "1004:47:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 504,
+                  "id": 1073,
                   "nodeType": "ExpressionStatement",
-                  "src": "1004:47:3"
+                  "src": "1004:47:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 512,
+                    "id": 1081,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1711,34 +1711,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 505,
+                          "id": 1074,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 428,
-                          "src": "1061:11:3",
+                          "referencedDeclaration": 997,
+                          "src": "1061:11:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 509,
+                        "id": 1078,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 506,
+                            "id": 1075,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1073:3:3",
+                            "referencedDeclaration": 11315,
+                            "src": "1073:3:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 507,
+                          "id": 1076,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1746,7 +1746,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1073:10:3",
+                          "src": "1073:10:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1757,21 +1757,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1061:23:3",
+                        "src": "1061:23:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 510,
+                      "id": 1079,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 508,
+                        "id": 1077,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 489,
-                        "src": "1085:5:3",
+                        "referencedDeclaration": 1058,
+                        "src": "1085:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1782,7 +1782,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1061:30:3",
+                      "src": "1061:30:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1793,14 +1793,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 511,
+                      "id": 1080,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1094:5:3",
+                      "src": "1094:5:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1808,15 +1808,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "1061:38:3",
+                    "src": "1061:38:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 513,
+                  "id": 1082,
                   "nodeType": "ExpressionStatement",
-                  "src": "1061:38:3"
+                  "src": "1061:38:4"
                 },
                 {
                   "eventCall": {
@@ -1826,18 +1826,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 515,
+                          "id": 1084,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1135:3:3",
+                          "referencedDeclaration": 11315,
+                          "src": "1135:3:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 516,
+                        "id": 1085,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1845,7 +1845,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1135:10:3",
+                        "src": "1135:10:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1853,12 +1853,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 517,
+                        "id": 1086,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 489,
-                        "src": "1147:5:3",
+                        "referencedDeclaration": 1058,
+                        "src": "1147:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1876,18 +1876,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 514,
+                      "id": 1083,
                       "name": "RemovedFromBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 422,
-                      "src": "1114:20:3",
+                      "referencedDeclaration": 991,
+                      "src": "1114:20:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 518,
+                    "id": 1087,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1895,28 +1895,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1114:39:3",
+                    "src": "1114:39:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 519,
+                  "id": 1088,
                   "nodeType": "EmitStatement",
-                  "src": "1109:44:3"
+                  "src": "1109:44:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 520,
+                    "id": 1089,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1170:4:3",
+                    "src": "1170:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1924,15 +1924,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 493,
-                  "id": 521,
+                  "functionReturnParameters": 1062,
+                  "id": 1090,
                   "nodeType": "Return",
-                  "src": "1163:11:3"
+                  "src": "1163:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 523,
+            "id": 1092,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1940,16 +1940,16 @@
             "name": "Remove",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 490,
+              "id": 1059,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 489,
+                  "id": 1058,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 523,
-                  "src": "957:13:3",
+                  "scope": 1092,
+                  "src": "957:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1957,10 +1957,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 488,
+                    "id": 1057,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "957:7:3",
+                    "src": "957:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1970,20 +1970,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "956:15:3"
+              "src": "956:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 493,
+              "id": 1062,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 492,
+                  "id": 1061,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 523,
-                  "src": "988:4:3",
+                  "scope": 1092,
+                  "src": "988:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1991,10 +1991,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 491,
+                    "id": 1060,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "988:4:3",
+                    "src": "988:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2004,19 +2004,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "987:6:3"
+              "src": "987:6:4"
             },
-            "scope": 592,
-            "src": "941:240:3",
+            "scope": 1161,
+            "src": "941:240:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 548,
+              "id": 1117,
               "nodeType": "Block",
-              "src": "1253:99:3",
+              "src": "1253:99:4",
               "statements": [
                 {
                   "expression": {
@@ -2028,7 +2028,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 537,
+                        "id": 1106,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2037,26 +2037,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 533,
+                            "id": 1102,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "1271:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "1271:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 535,
+                          "id": 1104,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 534,
+                            "id": 1103,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 525,
-                            "src": "1278:5:3",
+                            "referencedDeclaration": 1094,
+                            "src": "1278:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2067,7 +2067,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1271:13:3",
+                          "src": "1271:13:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2078,14 +2078,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 536,
+                          "id": 1105,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1288:5:3",
+                          "src": "1288:5:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2093,7 +2093,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "1271:22:3",
+                        "src": "1271:22:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2107,21 +2107,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 532,
+                      "id": 1101,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1263:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1263:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 538,
+                    "id": 1107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2129,20 +2129,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1263:31:3",
+                    "src": "1263:31:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 539,
+                  "id": 1108,
                   "nodeType": "ExpressionStatement",
-                  "src": "1263:31:3"
+                  "src": "1263:31:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 544,
+                    "id": 1113,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2151,26 +2151,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 540,
+                        "id": 1109,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 432,
-                        "src": "1304:6:3",
+                        "referencedDeclaration": 1001,
+                        "src": "1304:6:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 542,
+                      "id": 1111,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 541,
+                        "id": 1110,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 525,
-                        "src": "1311:5:3",
+                        "referencedDeclaration": 1094,
+                        "src": "1311:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2181,7 +2181,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1304:13:3",
+                      "src": "1304:13:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2192,14 +2192,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 543,
+                      "id": 1112,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1320:4:3",
+                      "src": "1320:4:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2207,28 +2207,28 @@
                       },
                       "value": "true"
                     },
-                    "src": "1304:20:3",
+                    "src": "1304:20:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 545,
+                  "id": 1114,
                   "nodeType": "ExpressionStatement",
-                  "src": "1304:20:3"
+                  "src": "1304:20:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 546,
+                    "id": 1115,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1341:4:3",
+                    "src": "1341:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2236,52 +2236,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 531,
-                  "id": 547,
+                  "functionReturnParameters": 1100,
+                  "id": 1116,
                   "nodeType": "Return",
-                  "src": "1334:11:3"
+                  "src": "1334:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 549,
+            "id": 1118,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 528,
+                "id": 1097,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 527,
+                  "id": 1096,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1228:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1228:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1228:9:3"
+                "src": "1228:9:4"
               }
             ],
             "name": "AddMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 526,
+              "id": 1095,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 525,
+                  "id": 1094,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 549,
-                  "src": "1206:13:3",
+                  "scope": 1118,
+                  "src": "1206:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2289,10 +2289,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 524,
+                    "id": 1093,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1206:7:3",
+                    "src": "1206:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2302,20 +2302,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1205:15:3"
+              "src": "1205:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 531,
+              "id": 1100,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 530,
+                  "id": 1099,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 549,
-                  "src": "1247:4:3",
+                  "scope": 1118,
+                  "src": "1247:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2323,10 +2323,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 529,
+                    "id": 1098,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1247:4:3",
+                    "src": "1247:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2336,19 +2336,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1246:6:3"
+              "src": "1246:6:4"
             },
-            "scope": 592,
-            "src": "1187:165:3",
+            "scope": 1161,
+            "src": "1187:165:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 574,
+              "id": 1143,
               "nodeType": "Block",
-              "src": "1427:99:3",
+              "src": "1427:99:4",
               "statements": [
                 {
                   "expression": {
@@ -2360,7 +2360,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 563,
+                        "id": 1132,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2369,26 +2369,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 559,
+                            "id": 1128,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "1445:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "1445:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 561,
+                          "id": 1130,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 560,
+                            "id": 1129,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 551,
-                            "src": "1452:5:3",
+                            "referencedDeclaration": 1120,
+                            "src": "1452:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2399,7 +2399,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1445:13:3",
+                          "src": "1445:13:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2410,14 +2410,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 562,
+                          "id": 1131,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1462:4:3",
+                          "src": "1462:4:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2425,7 +2425,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1445:21:3",
+                        "src": "1445:21:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2439,21 +2439,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 558,
+                      "id": 1127,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1437:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1437:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 564,
+                    "id": 1133,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2461,20 +2461,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1437:30:3",
+                    "src": "1437:30:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 565,
+                  "id": 1134,
                   "nodeType": "ExpressionStatement",
-                  "src": "1437:30:3"
+                  "src": "1437:30:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 570,
+                    "id": 1139,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2483,26 +2483,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 566,
+                        "id": 1135,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 432,
-                        "src": "1477:6:3",
+                        "referencedDeclaration": 1001,
+                        "src": "1477:6:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 568,
+                      "id": 1137,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 567,
+                        "id": 1136,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 551,
-                        "src": "1484:5:3",
+                        "referencedDeclaration": 1120,
+                        "src": "1484:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2513,7 +2513,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1477:13:3",
+                      "src": "1477:13:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2524,14 +2524,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 569,
+                      "id": 1138,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1493:5:3",
+                      "src": "1493:5:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2539,28 +2539,28 @@
                       },
                       "value": "false"
                     },
-                    "src": "1477:21:3",
+                    "src": "1477:21:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 571,
+                  "id": 1140,
                   "nodeType": "ExpressionStatement",
-                  "src": "1477:21:3"
+                  "src": "1477:21:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 572,
+                    "id": 1141,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1515:4:3",
+                    "src": "1515:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2568,52 +2568,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 557,
-                  "id": 573,
+                  "functionReturnParameters": 1126,
+                  "id": 1142,
                   "nodeType": "Return",
-                  "src": "1508:11:3"
+                  "src": "1508:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 575,
+            "id": 1144,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 554,
+                "id": 1123,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 553,
+                  "id": 1122,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1402:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1402:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1402:9:3"
+                "src": "1402:9:4"
               }
             ],
             "name": "RemoveMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 552,
+              "id": 1121,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 551,
+                  "id": 1120,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 575,
-                  "src": "1380:13:3",
+                  "scope": 1144,
+                  "src": "1380:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2621,10 +2621,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 550,
+                    "id": 1119,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1380:7:3",
+                    "src": "1380:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2634,20 +2634,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1379:15:3"
+              "src": "1379:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 557,
+              "id": 1126,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 556,
+                  "id": 1125,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 575,
-                  "src": "1421:4:3",
+                  "scope": 1144,
+                  "src": "1421:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2655,10 +2655,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 555,
+                    "id": 1124,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1421:4:3",
+                    "src": "1421:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2668,36 +2668,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1420:6:3"
+              "src": "1420:6:4"
             },
-            "scope": 592,
-            "src": "1358:168:3",
+            "scope": 1161,
+            "src": "1358:168:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 590,
+              "id": 1159,
               "nodeType": "Block",
-              "src": "1607:54:3",
+              "src": "1607:54:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 586,
+                    "id": 1155,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 584,
+                      "id": 1153,
                       "name": "market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 435,
-                      "src": "1617:6:3",
+                      "referencedDeclaration": 1004,
+                      "src": "1617:6:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2707,39 +2707,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 585,
+                      "id": 1154,
                       "name": "_market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 577,
-                      "src": "1626:7:3",
+                      "referencedDeclaration": 1146,
+                      "src": "1626:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1617:16:3",
+                    "src": "1617:16:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 587,
+                  "id": 1156,
                   "nodeType": "ExpressionStatement",
-                  "src": "1617:16:3"
+                  "src": "1617:16:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 588,
+                    "id": 1157,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1650:4:3",
+                    "src": "1650:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2747,52 +2747,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 583,
-                  "id": 589,
+                  "functionReturnParameters": 1152,
+                  "id": 1158,
                   "nodeType": "Return",
-                  "src": "1643:11:3"
+                  "src": "1643:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 591,
+            "id": 1160,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 580,
+                "id": 1149,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 579,
+                  "id": 1148,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1582:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1582:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1582:9:3"
+                "src": "1582:9:4"
               }
             ],
             "name": "SetMarketAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 578,
+              "id": 1147,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 577,
+                  "id": 1146,
                   "name": "_market",
                   "nodeType": "VariableDeclaration",
-                  "scope": 591,
-                  "src": "1558:15:3",
+                  "scope": 1160,
+                  "src": "1558:15:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2800,10 +2800,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 576,
+                    "id": 1145,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1558:7:3",
+                    "src": "1558:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2813,20 +2813,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1557:17:3"
+              "src": "1557:17:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 583,
+              "id": 1152,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 582,
+                  "id": 1151,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 591,
-                  "src": "1601:4:3",
+                  "scope": 1160,
+                  "src": "1601:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2834,10 +2834,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 581,
+                    "id": 1150,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1601:4:3",
+                    "src": "1601:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2847,33 +2847,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1600:6:3"
+              "src": "1600:6:4"
             },
-            "scope": 592,
-            "src": "1532:129:3",
+            "scope": 1161,
+            "src": "1532:129:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 593,
-        "src": "89:1574:3"
+        "scope": 1162,
+        "src": "89:1574:4"
       }
     ],
-    "src": "0:1664:3"
+    "src": "0:1664:4"
   },
   "legacyAST": {
     "absolutePath": "contracts/Blacklist.sol",
     "exportedSymbols": {
       "Blacklist": [
-        592
+        1161
       ]
     },
-    "id": 593,
+    "id": 1162,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 385,
+        "id": 954,
         "literals": [
           "solidity",
           "^",
@@ -2881,16 +2881,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:3"
+        "src": "0:24:4"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 386,
+        "id": 955,
         "nodeType": "ImportDirective",
-        "scope": 593,
-        "sourceUnit": 7337,
-        "src": "27:59:3",
+        "scope": 1162,
+        "sourceUnit": 10883,
+        "src": "27:59:4",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -2900,40 +2900,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 387,
+              "id": 956,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "111:7:3",
+              "referencedDeclaration": 10882,
+              "src": "111:7:4",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 388,
+            "id": 957,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:3"
+            "src": "111:7:4"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 592,
+        "id": 1161,
         "linearizedBaseContracts": [
-          592,
-          7336
+          1161,
+          10882
         ],
         "name": "Blacklist",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 409,
+              "id": 978,
               "nodeType": "Block",
-              "src": "148:111:3",
+              "src": "148:111:4",
               "statements": [
                 {
                   "expression": {
@@ -2945,19 +2945,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 393,
+                        "id": 962,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 391,
+                          "id": 960,
                           "name": "market",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 435,
-                          "src": "166:6:3",
+                          "referencedDeclaration": 1004,
+                          "src": "166:6:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2968,14 +2968,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "307830",
-                          "id": 392,
+                          "id": 961,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "176:3:3",
+                          "src": "176:3:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2983,7 +2983,7 @@
                           },
                           "value": "0x0"
                         },
-                        "src": "166:13:3",
+                        "src": "166:13:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2997,21 +2997,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 390,
+                      "id": 959,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "158:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "158:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 394,
+                    "id": 963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3019,15 +3019,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "158:22:3",
+                    "src": "158:22:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 395,
+                  "id": 964,
                   "nodeType": "ExpressionStatement",
-                  "src": "158:22:3"
+                  "src": "158:22:4"
                 },
                 {
                   "expression": {
@@ -3039,7 +3039,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 405,
+                        "id": 974,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3050,7 +3050,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 400,
+                          "id": 969,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3059,18 +3059,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 397,
+                              "id": 966,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "198:3:3",
+                              "referencedDeclaration": 11315,
+                              "src": "198:3:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 398,
+                            "id": 967,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3078,7 +3078,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "198:10:3",
+                            "src": "198:10:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3088,18 +3088,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 399,
+                            "id": 968,
                             "name": "market",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 435,
-                            "src": "212:6:3",
+                            "referencedDeclaration": 1004,
+                            "src": "212:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "198:20:3",
+                          "src": "198:20:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -3111,34 +3111,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 401,
+                            "id": 970,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "222:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "222:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 404,
+                          "id": 973,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 402,
+                              "id": 971,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "229:3:3",
+                              "referencedDeclaration": 11315,
+                              "src": "229:3:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 403,
+                            "id": 972,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3146,7 +3146,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "229:10:3",
+                            "src": "229:10:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3157,13 +3157,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "222:18:3",
+                          "src": "222:18:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "198:42:3",
+                        "src": "198:42:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3177,21 +3177,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 396,
+                      "id": 965,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "190:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "190:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 406,
+                    "id": 975,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3199,54 +3199,54 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "190:51:3",
+                    "src": "190:51:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 407,
+                  "id": 976,
                   "nodeType": "ExpressionStatement",
-                  "src": "190:51:3"
+                  "src": "190:51:4"
                 },
                 {
-                  "id": 408,
+                  "id": 977,
                   "nodeType": "PlaceholderStatement",
-                  "src": "251:1:3"
+                  "src": "251:1:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 410,
+            "id": 979,
             "name": "OnlyMarket",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 389,
+              "id": 958,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "145:2:3"
+              "src": "145:2:4"
             },
-            "src": "126:133:3",
+            "src": "126:133:4",
             "visibility": "internal"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 416,
+            "id": 985,
             "name": "AddedToBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 415,
+              "id": 984,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 412,
+                  "id": 981,
                   "indexed": true,
                   "name": "adder",
                   "nodeType": "VariableDeclaration",
-                  "scope": 416,
-                  "src": "288:21:3",
+                  "scope": 985,
+                  "src": "288:21:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3254,10 +3254,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 411,
+                    "id": 980,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "288:7:3",
+                    "src": "288:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3268,12 +3268,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 414,
+                  "id": 983,
                   "indexed": true,
                   "name": "addee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 416,
-                  "src": "311:21:3",
+                  "scope": 985,
+                  "src": "311:21:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3281,10 +3281,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 413,
+                    "id": 982,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "311:7:3",
+                    "src": "311:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3294,28 +3294,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "287:46:3"
+              "src": "287:46:4"
             },
-            "src": "265:69:3"
+            "src": "265:69:4"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 422,
+            "id": 991,
             "name": "RemovedFromBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 421,
+              "id": 990,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 418,
+                  "id": 987,
                   "indexed": true,
                   "name": "remover",
                   "nodeType": "VariableDeclaration",
-                  "scope": 422,
-                  "src": "367:23:3",
+                  "scope": 991,
+                  "src": "367:23:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3323,10 +3323,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 417,
+                    "id": 986,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "367:7:3",
+                    "src": "367:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3337,12 +3337,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 420,
+                  "id": 989,
                   "indexed": true,
                   "name": "removee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 422,
-                  "src": "392:23:3",
+                  "scope": 991,
+                  "src": "392:23:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3350,10 +3350,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 419,
+                    "id": 988,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "392:7:3",
+                    "src": "392:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3363,17 +3363,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "366:50:3"
+              "src": "366:50:4"
             },
-            "src": "340:77:3"
+            "src": "340:77:4"
           },
           {
             "constant": false,
-            "id": 428,
+            "id": 997,
             "name": "blacklisted",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "423:56:3",
+            "scope": 1161,
+            "src": "423:56:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3381,46 +3381,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 427,
+              "id": 996,
               "keyType": {
-                "id": 423,
+                "id": 992,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "431:7:3",
+                "src": "431:7:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "423:44:3",
+              "src": "423:44:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 426,
+                "id": 995,
                 "keyType": {
-                  "id": 424,
+                  "id": 993,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "450:7:3",
+                  "src": "450:7:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "442:24:3",
+                "src": "442:24:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 425,
+                  "id": 994,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "461:4:3",
+                  "src": "461:4:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -3433,11 +3433,11 @@
           },
           {
             "constant": false,
-            "id": 432,
+            "id": 1001,
             "name": "master",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "486:31:3",
+            "scope": 1161,
+            "src": "486:31:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3445,28 +3445,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 431,
+              "id": 1000,
               "keyType": {
-                "id": 429,
+                "id": 998,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "494:7:3",
+                "src": "494:7:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "486:24:3",
+              "src": "486:24:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 430,
+                "id": 999,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "505:4:3",
+                "src": "505:4:4",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -3478,11 +3478,11 @@
           },
           {
             "constant": false,
-            "id": 435,
+            "id": 1004,
             "name": "market",
             "nodeType": "VariableDeclaration",
-            "scope": 592,
-            "src": "524:27:3",
+            "scope": 1161,
+            "src": "524:27:4",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3490,10 +3490,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 433,
+              "id": 1002,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "524:7:3",
+              "src": "524:7:4",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -3502,14 +3502,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "307830",
-              "id": 434,
+              "id": 1003,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "548:3:3",
+              "src": "548:3:4",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3521,26 +3521,26 @@
           },
           {
             "body": {
-              "id": 443,
+              "id": 1012,
               "nodeType": "Block",
-              "src": "579:35:3",
+              "src": "579:35:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 441,
+                    "id": 1010,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 438,
+                      "id": 1007,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "589:5:3",
+                      "referencedDeclaration": 10800,
+                      "src": "589:5:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3552,18 +3552,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 439,
+                        "id": 1008,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "597:3:3",
+                        "referencedDeclaration": 11315,
+                        "src": "597:3:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 440,
+                      "id": 1009,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3571,26 +3571,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "597:10:3",
+                      "src": "597:10:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "589:18:3",
+                    "src": "589:18:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 442,
+                  "id": 1011,
                   "nodeType": "ExpressionStatement",
-                  "src": "589:18:3"
+                  "src": "589:18:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 444,
+            "id": 1013,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -3598,29 +3598,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 436,
+              "id": 1005,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "569:2:3"
+              "src": "569:2:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 437,
+              "id": 1006,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "579:0:3"
+              "src": "579:0:4"
             },
-            "scope": 592,
-            "src": "558:56:3",
+            "scope": 1161,
+            "src": "558:56:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 459,
+              "id": 1028,
               "nodeType": "Block",
-              "src": "691:48:3",
+              "src": "691:48:4",
               "statements": [
                 {
                   "expression": {
@@ -3629,26 +3629,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 453,
+                        "id": 1022,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 428,
-                        "src": "708:11:3",
+                        "referencedDeclaration": 997,
+                        "src": "708:11:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                           "typeString": "mapping(address => mapping(address => bool))"
                         }
                       },
-                      "id": 455,
+                      "id": 1024,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 454,
+                        "id": 1023,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 446,
-                        "src": "720:4:3",
+                        "referencedDeclaration": 1015,
+                        "src": "720:4:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3659,21 +3659,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "708:17:3",
+                      "src": "708:17:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                         "typeString": "mapping(address => bool)"
                       }
                     },
-                    "id": 457,
+                    "id": 1026,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 456,
+                      "id": 1025,
                       "name": "_whom",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 448,
-                      "src": "726:5:3",
+                      "referencedDeclaration": 1017,
+                      "src": "726:5:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3684,21 +3684,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "708:24:3",
+                    "src": "708:24:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 452,
-                  "id": 458,
+                  "functionReturnParameters": 1021,
+                  "id": 1027,
                   "nodeType": "Return",
-                  "src": "701:31:3"
+                  "src": "701:31:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 460,
+            "id": 1029,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -3706,16 +3706,16 @@
             "name": "Check",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 449,
+              "id": 1018,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 446,
+                  "id": 1015,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "635:12:3",
+                  "scope": 1029,
+                  "src": "635:12:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3723,10 +3723,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 445,
+                    "id": 1014,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "635:7:3",
+                    "src": "635:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3737,11 +3737,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 448,
+                  "id": 1017,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "649:13:3",
+                  "scope": 1029,
+                  "src": "649:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3749,10 +3749,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 447,
+                    "id": 1016,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "649:7:3",
+                    "src": "649:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3762,20 +3762,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "634:29:3"
+              "src": "634:29:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 452,
+              "id": 1021,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 451,
+                  "id": 1020,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 460,
-                  "src": "685:4:3",
+                  "scope": 1029,
+                  "src": "685:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3783,10 +3783,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 450,
+                    "id": 1019,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "685:4:3",
+                    "src": "685:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -3796,24 +3796,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "684:6:3"
+              "src": "684:6:4"
             },
-            "scope": 592,
-            "src": "620:119:3",
+            "scope": 1161,
+            "src": "620:119:4",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 486,
+              "id": 1055,
               "nodeType": "Block",
-              "src": "822:113:3",
+              "src": "822:113:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 477,
+                    "id": 1046,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3824,26 +3824,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 471,
+                          "id": 1040,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 428,
-                          "src": "832:11:3",
+                          "referencedDeclaration": 997,
+                          "src": "832:11:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 474,
+                        "id": 1043,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 472,
+                          "id": 1041,
                           "name": "_who",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 462,
-                          "src": "844:4:3",
+                          "referencedDeclaration": 1031,
+                          "src": "844:4:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3854,21 +3854,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "832:17:3",
+                        "src": "832:17:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 475,
+                      "id": 1044,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 473,
+                        "id": 1042,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 464,
-                        "src": "850:5:3",
+                        "referencedDeclaration": 1033,
+                        "src": "850:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3879,7 +3879,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "832:24:3",
+                      "src": "832:24:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -3890,14 +3890,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 476,
+                      "id": 1045,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "859:4:3",
+                      "src": "859:4:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -3905,15 +3905,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "832:31:3",
+                    "src": "832:31:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 478,
+                  "id": 1047,
                   "nodeType": "ExpressionStatement",
-                  "src": "832:31:3"
+                  "src": "832:31:4"
                 },
                 {
                   "eventCall": {
@@ -3921,12 +3921,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 480,
+                        "id": 1049,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 462,
-                        "src": "895:4:3",
+                        "referencedDeclaration": 1031,
+                        "src": "895:4:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3934,12 +3934,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 481,
+                        "id": 1050,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 464,
-                        "src": "901:5:3",
+                        "referencedDeclaration": 1033,
+                        "src": "901:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3957,18 +3957,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 479,
+                      "id": 1048,
                       "name": "AddedToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 416,
-                      "src": "878:16:3",
+                      "referencedDeclaration": 985,
+                      "src": "878:16:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 482,
+                    "id": 1051,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3976,28 +3976,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "878:29:3",
+                    "src": "878:29:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 483,
+                  "id": 1052,
                   "nodeType": "EmitStatement",
-                  "src": "873:34:3"
+                  "src": "873:34:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 484,
+                    "id": 1053,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "924:4:3",
+                    "src": "924:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4005,52 +4005,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 470,
-                  "id": 485,
+                  "functionReturnParameters": 1039,
+                  "id": 1054,
                   "nodeType": "Return",
-                  "src": "917:11:3"
+                  "src": "917:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 487,
+            "id": 1056,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 467,
+                "id": 1036,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 466,
+                  "id": 1035,
                   "name": "OnlyMarket",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 410,
-                  "src": "796:10:3",
+                  "referencedDeclaration": 979,
+                  "src": "796:10:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "796:10:3"
+                "src": "796:10:4"
               }
             ],
             "name": "Add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 465,
+              "id": 1034,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 462,
+                  "id": 1031,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "758:12:3",
+                  "scope": 1056,
+                  "src": "758:12:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4058,10 +4058,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 461,
+                    "id": 1030,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "758:7:3",
+                    "src": "758:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4072,11 +4072,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 464,
+                  "id": 1033,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "772:13:3",
+                  "scope": 1056,
+                  "src": "772:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4084,10 +4084,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 463,
+                    "id": 1032,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:3",
+                    "src": "772:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4097,20 +4097,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "757:29:3"
+              "src": "757:29:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 470,
+              "id": 1039,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 469,
+                  "id": 1038,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 487,
-                  "src": "816:4:3",
+                  "scope": 1056,
+                  "src": "816:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4118,10 +4118,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 468,
+                    "id": 1037,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "816:4:3",
+                    "src": "816:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4131,19 +4131,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "815:6:3"
+              "src": "815:6:4"
             },
-            "scope": 592,
-            "src": "745:190:3",
+            "scope": 1161,
+            "src": "745:190:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "external"
           },
           {
             "body": {
-              "id": 522,
+              "id": 1091,
               "nodeType": "Block",
-              "src": "994:187:3",
+              "src": "994:187:4",
               "statements": [
                 {
                   "expression": {
@@ -4155,7 +4155,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 502,
+                        "id": 1071,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4166,34 +4166,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 495,
+                              "id": 1064,
                               "name": "blacklisted",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 428,
-                              "src": "1012:11:3",
+                              "referencedDeclaration": 997,
+                              "src": "1012:11:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 498,
+                            "id": 1067,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 496,
+                                "id": 1065,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "1024:3:3",
+                                "referencedDeclaration": 11315,
+                                "src": "1024:3:4",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 497,
+                              "id": 1066,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4201,7 +4201,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1024:10:3",
+                              "src": "1024:10:4",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4212,21 +4212,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1012:23:3",
+                            "src": "1012:23:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 500,
+                          "id": 1069,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 499,
+                            "id": 1068,
                             "name": "_whom",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 489,
-                            "src": "1036:5:3",
+                            "referencedDeclaration": 1058,
+                            "src": "1036:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4237,7 +4237,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1012:30:3",
+                          "src": "1012:30:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4248,14 +4248,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 501,
+                          "id": 1070,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1046:4:3",
+                          "src": "1046:4:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -4263,7 +4263,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1012:38:3",
+                        "src": "1012:38:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4277,21 +4277,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 494,
+                      "id": 1063,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1004:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1004:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 503,
+                    "id": 1072,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4299,20 +4299,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1004:47:3",
+                    "src": "1004:47:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 504,
+                  "id": 1073,
                   "nodeType": "ExpressionStatement",
-                  "src": "1004:47:3"
+                  "src": "1004:47:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 512,
+                    "id": 1081,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4323,34 +4323,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 505,
+                          "id": 1074,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 428,
-                          "src": "1061:11:3",
+                          "referencedDeclaration": 997,
+                          "src": "1061:11:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 509,
+                        "id": 1078,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 506,
+                            "id": 1075,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1073:3:3",
+                            "referencedDeclaration": 11315,
+                            "src": "1073:3:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 507,
+                          "id": 1076,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4358,7 +4358,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1073:10:3",
+                          "src": "1073:10:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4369,21 +4369,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1061:23:3",
+                        "src": "1061:23:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 510,
+                      "id": 1079,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 508,
+                        "id": 1077,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 489,
-                        "src": "1085:5:3",
+                        "referencedDeclaration": 1058,
+                        "src": "1085:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4394,7 +4394,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1061:30:3",
+                      "src": "1061:30:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4405,14 +4405,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 511,
+                      "id": 1080,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1094:5:3",
+                      "src": "1094:5:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4420,15 +4420,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "1061:38:3",
+                    "src": "1061:38:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 513,
+                  "id": 1082,
                   "nodeType": "ExpressionStatement",
-                  "src": "1061:38:3"
+                  "src": "1061:38:4"
                 },
                 {
                   "eventCall": {
@@ -4438,18 +4438,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 515,
+                          "id": 1084,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1135:3:3",
+                          "referencedDeclaration": 11315,
+                          "src": "1135:3:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 516,
+                        "id": 1085,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4457,7 +4457,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1135:10:3",
+                        "src": "1135:10:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4465,12 +4465,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 517,
+                        "id": 1086,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 489,
-                        "src": "1147:5:3",
+                        "referencedDeclaration": 1058,
+                        "src": "1147:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4488,18 +4488,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 514,
+                      "id": 1083,
                       "name": "RemovedFromBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 422,
-                      "src": "1114:20:3",
+                      "referencedDeclaration": 991,
+                      "src": "1114:20:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 518,
+                    "id": 1087,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4507,28 +4507,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1114:39:3",
+                    "src": "1114:39:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 519,
+                  "id": 1088,
                   "nodeType": "EmitStatement",
-                  "src": "1109:44:3"
+                  "src": "1109:44:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 520,
+                    "id": 1089,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1170:4:3",
+                    "src": "1170:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4536,15 +4536,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 493,
-                  "id": 521,
+                  "functionReturnParameters": 1062,
+                  "id": 1090,
                   "nodeType": "Return",
-                  "src": "1163:11:3"
+                  "src": "1163:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 523,
+            "id": 1092,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4552,16 +4552,16 @@
             "name": "Remove",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 490,
+              "id": 1059,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 489,
+                  "id": 1058,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 523,
-                  "src": "957:13:3",
+                  "scope": 1092,
+                  "src": "957:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4569,10 +4569,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 488,
+                    "id": 1057,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "957:7:3",
+                    "src": "957:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4582,20 +4582,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "956:15:3"
+              "src": "956:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 493,
+              "id": 1062,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 492,
+                  "id": 1061,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 523,
-                  "src": "988:4:3",
+                  "scope": 1092,
+                  "src": "988:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4603,10 +4603,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 491,
+                    "id": 1060,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "988:4:3",
+                    "src": "988:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4616,19 +4616,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "987:6:3"
+              "src": "987:6:4"
             },
-            "scope": 592,
-            "src": "941:240:3",
+            "scope": 1161,
+            "src": "941:240:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 548,
+              "id": 1117,
               "nodeType": "Block",
-              "src": "1253:99:3",
+              "src": "1253:99:4",
               "statements": [
                 {
                   "expression": {
@@ -4640,7 +4640,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 537,
+                        "id": 1106,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4649,26 +4649,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 533,
+                            "id": 1102,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "1271:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "1271:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 535,
+                          "id": 1104,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 534,
+                            "id": 1103,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 525,
-                            "src": "1278:5:3",
+                            "referencedDeclaration": 1094,
+                            "src": "1278:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4679,7 +4679,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1271:13:3",
+                          "src": "1271:13:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4690,14 +4690,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 536,
+                          "id": 1105,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1288:5:3",
+                          "src": "1288:5:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -4705,7 +4705,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "1271:22:3",
+                        "src": "1271:22:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4719,21 +4719,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 532,
+                      "id": 1101,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1263:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1263:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 538,
+                    "id": 1107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4741,20 +4741,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1263:31:3",
+                    "src": "1263:31:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 539,
+                  "id": 1108,
                   "nodeType": "ExpressionStatement",
-                  "src": "1263:31:3"
+                  "src": "1263:31:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 544,
+                    "id": 1113,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4763,26 +4763,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 540,
+                        "id": 1109,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 432,
-                        "src": "1304:6:3",
+                        "referencedDeclaration": 1001,
+                        "src": "1304:6:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 542,
+                      "id": 1111,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 541,
+                        "id": 1110,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 525,
-                        "src": "1311:5:3",
+                        "referencedDeclaration": 1094,
+                        "src": "1311:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4793,7 +4793,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1304:13:3",
+                      "src": "1304:13:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4804,14 +4804,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 543,
+                      "id": 1112,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1320:4:3",
+                      "src": "1320:4:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4819,28 +4819,28 @@
                       },
                       "value": "true"
                     },
-                    "src": "1304:20:3",
+                    "src": "1304:20:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 545,
+                  "id": 1114,
                   "nodeType": "ExpressionStatement",
-                  "src": "1304:20:3"
+                  "src": "1304:20:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 546,
+                    "id": 1115,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1341:4:3",
+                    "src": "1341:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4848,52 +4848,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 531,
-                  "id": 547,
+                  "functionReturnParameters": 1100,
+                  "id": 1116,
                   "nodeType": "Return",
-                  "src": "1334:11:3"
+                  "src": "1334:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 549,
+            "id": 1118,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 528,
+                "id": 1097,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 527,
+                  "id": 1096,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1228:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1228:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1228:9:3"
+                "src": "1228:9:4"
               }
             ],
             "name": "AddMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 526,
+              "id": 1095,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 525,
+                  "id": 1094,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 549,
-                  "src": "1206:13:3",
+                  "scope": 1118,
+                  "src": "1206:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4901,10 +4901,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 524,
+                    "id": 1093,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1206:7:3",
+                    "src": "1206:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4914,20 +4914,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1205:15:3"
+              "src": "1205:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 531,
+              "id": 1100,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 530,
+                  "id": 1099,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 549,
-                  "src": "1247:4:3",
+                  "scope": 1118,
+                  "src": "1247:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4935,10 +4935,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 529,
+                    "id": 1098,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1247:4:3",
+                    "src": "1247:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4948,19 +4948,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1246:6:3"
+              "src": "1246:6:4"
             },
-            "scope": 592,
-            "src": "1187:165:3",
+            "scope": 1161,
+            "src": "1187:165:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 574,
+              "id": 1143,
               "nodeType": "Block",
-              "src": "1427:99:3",
+              "src": "1427:99:4",
               "statements": [
                 {
                   "expression": {
@@ -4972,7 +4972,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 563,
+                        "id": 1132,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4981,26 +4981,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 559,
+                            "id": 1128,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 432,
-                            "src": "1445:6:3",
+                            "referencedDeclaration": 1001,
+                            "src": "1445:6:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 561,
+                          "id": 1130,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 560,
+                            "id": 1129,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 551,
-                            "src": "1452:5:3",
+                            "referencedDeclaration": 1120,
+                            "src": "1452:5:4",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5011,7 +5011,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1445:13:3",
+                          "src": "1445:13:4",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -5022,14 +5022,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 562,
+                          "id": 1131,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1462:4:3",
+                          "src": "1462:4:4",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -5037,7 +5037,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1445:21:3",
+                        "src": "1445:21:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -5051,21 +5051,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 558,
+                      "id": 1127,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1437:7:3",
+                      "referencedDeclaration": 11318,
+                      "src": "1437:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 564,
+                    "id": 1133,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5073,20 +5073,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1437:30:3",
+                    "src": "1437:30:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 565,
+                  "id": 1134,
                   "nodeType": "ExpressionStatement",
-                  "src": "1437:30:3"
+                  "src": "1437:30:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 570,
+                    "id": 1139,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5095,26 +5095,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 566,
+                        "id": 1135,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 432,
-                        "src": "1477:6:3",
+                        "referencedDeclaration": 1001,
+                        "src": "1477:6:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 568,
+                      "id": 1137,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 567,
+                        "id": 1136,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 551,
-                        "src": "1484:5:3",
+                        "referencedDeclaration": 1120,
+                        "src": "1484:5:4",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5125,7 +5125,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1477:13:3",
+                      "src": "1477:13:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -5136,14 +5136,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 569,
+                      "id": 1138,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1493:5:3",
+                      "src": "1493:5:4",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -5151,28 +5151,28 @@
                       },
                       "value": "false"
                     },
-                    "src": "1477:21:3",
+                    "src": "1477:21:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 571,
+                  "id": 1140,
                   "nodeType": "ExpressionStatement",
-                  "src": "1477:21:3"
+                  "src": "1477:21:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 572,
+                    "id": 1141,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1515:4:3",
+                    "src": "1515:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5180,52 +5180,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 557,
-                  "id": 573,
+                  "functionReturnParameters": 1126,
+                  "id": 1142,
                   "nodeType": "Return",
-                  "src": "1508:11:3"
+                  "src": "1508:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 575,
+            "id": 1144,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 554,
+                "id": 1123,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 553,
+                  "id": 1122,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1402:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1402:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1402:9:3"
+                "src": "1402:9:4"
               }
             ],
             "name": "RemoveMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 552,
+              "id": 1121,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 551,
+                  "id": 1120,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 575,
-                  "src": "1380:13:3",
+                  "scope": 1144,
+                  "src": "1380:13:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5233,10 +5233,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 550,
+                    "id": 1119,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1380:7:3",
+                    "src": "1380:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5246,20 +5246,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1379:15:3"
+              "src": "1379:15:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 557,
+              "id": 1126,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 556,
+                  "id": 1125,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 575,
-                  "src": "1421:4:3",
+                  "scope": 1144,
+                  "src": "1421:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5267,10 +5267,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 555,
+                    "id": 1124,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1421:4:3",
+                    "src": "1421:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5280,36 +5280,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1420:6:3"
+              "src": "1420:6:4"
             },
-            "scope": 592,
-            "src": "1358:168:3",
+            "scope": 1161,
+            "src": "1358:168:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 590,
+              "id": 1159,
               "nodeType": "Block",
-              "src": "1607:54:3",
+              "src": "1607:54:4",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 586,
+                    "id": 1155,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 584,
+                      "id": 1153,
                       "name": "market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 435,
-                      "src": "1617:6:3",
+                      "referencedDeclaration": 1004,
+                      "src": "1617:6:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -5319,39 +5319,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 585,
+                      "id": 1154,
                       "name": "_market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 577,
-                      "src": "1626:7:3",
+                      "referencedDeclaration": 1146,
+                      "src": "1626:7:4",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1617:16:3",
+                    "src": "1617:16:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 587,
+                  "id": 1156,
                   "nodeType": "ExpressionStatement",
-                  "src": "1617:16:3"
+                  "src": "1617:16:4"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 588,
+                    "id": 1157,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1650:4:3",
+                    "src": "1650:4:4",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5359,52 +5359,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 583,
-                  "id": 589,
+                  "functionReturnParameters": 1152,
+                  "id": 1158,
                   "nodeType": "Return",
-                  "src": "1643:11:3"
+                  "src": "1643:11:4"
                 }
               ]
             },
             "documentation": null,
-            "id": 591,
+            "id": 1160,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 580,
+                "id": 1149,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 579,
+                  "id": 1148,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1582:9:3",
+                  "referencedDeclaration": 10830,
+                  "src": "1582:9:4",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1582:9:3"
+                "src": "1582:9:4"
               }
             ],
             "name": "SetMarketAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 578,
+              "id": 1147,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 577,
+                  "id": 1146,
                   "name": "_market",
                   "nodeType": "VariableDeclaration",
-                  "scope": 591,
-                  "src": "1558:15:3",
+                  "scope": 1160,
+                  "src": "1558:15:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5412,10 +5412,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 576,
+                    "id": 1145,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1558:7:3",
+                    "src": "1558:7:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5425,20 +5425,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1557:17:3"
+              "src": "1557:17:4"
             },
             "payable": false,
             "returnParameters": {
-              "id": 583,
+              "id": 1152,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 582,
+                  "id": 1151,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 591,
-                  "src": "1601:4:3",
+                  "scope": 1160,
+                  "src": "1601:4:4",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5446,10 +5446,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 581,
+                    "id": 1150,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1601:4:3",
+                    "src": "1601:4:4",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5459,20 +5459,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1600:6:3"
+              "src": "1600:6:4"
             },
-            "scope": 592,
-            "src": "1532:129:3",
+            "scope": 1161,
+            "src": "1532:129:4",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 593,
-        "src": "89:1574:3"
+        "scope": 1162,
+        "src": "89:1574:4"
       }
     ],
-    "src": "0:1664:3"
+    "src": "0:1664:4"
   },
   "compiler": {
     "name": "solc",
@@ -5551,5 +5551,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.335Z"
-}
+  "updatedAt": "2019-01-10T14:00:11.066Z"
+}
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ERC20.json b/blockchain/source/migration_artifacts/contracts/ERC20.json
index dadca90e3..3eb3c7f12 100644
--- a/blockchain/source/migration_artifacts/contracts/ERC20.json
+++ b/blockchain/source/migration_artifacts/contracts/ERC20.json
@@ -185,14 +185,14 @@
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
     "exportedSymbols": {
       "ERC20": [
-        7475
+        11021
       ]
     },
-    "id": 7476,
+    "id": 11022,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7434,
+        "id": 10980,
         "literals": [
           "solidity",
           "^",
@@ -200,16 +200,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:20"
+        "src": "0:24:18"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 7435,
+        "id": 10981,
         "nodeType": "ImportDirective",
-        "scope": 7476,
-        "sourceUnit": 7508,
-        "src": "26:26:20",
+        "scope": 11022,
+        "sourceUnit": 11054,
+        "src": "26:26:18",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -219,31 +219,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7436,
+              "id": 10982,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7507,
-              "src": "162:10:20",
+              "referencedDeclaration": 11053,
+              "src": "162:10:18",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$7507",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 7437,
+            "id": 10983,
             "nodeType": "InheritanceSpecifier",
-            "src": "162:10:20"
+            "src": "162:10:18"
           }
         ],
         "contractDependencies": [
-          7507
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20",
         "fullyImplemented": false,
-        "id": 7475,
+        "id": 11021,
         "linearizedBaseContracts": [
-          7475,
-          7507
+          11021,
+          11053
         ],
         "name": "ERC20",
         "nodeType": "ContractDefinition",
@@ -251,7 +251,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7446,
+            "id": 10992,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -259,16 +259,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7442,
+              "id": 10988,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7439,
+                  "id": 10985,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "196:14:20",
+                  "scope": 10992,
+                  "src": "196:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -276,10 +276,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7438,
+                    "id": 10984,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "196:7:20",
+                    "src": "196:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -290,11 +290,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7441,
+                  "id": 10987,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "212:16:20",
+                  "scope": 10992,
+                  "src": "212:16:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -302,10 +302,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7440,
+                    "id": 10986,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "212:7:20",
+                    "src": "212:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -315,20 +315,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "195:34:20"
+              "src": "195:34:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7445,
+              "id": 10991,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7444,
+                  "id": 10990,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "255:7:20",
+                  "scope": 10992,
+                  "src": "255:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -336,10 +336,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7443,
+                    "id": 10989,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "255:7:20",
+                    "src": "255:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -349,10 +349,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "254:9:20"
+              "src": "254:9:18"
             },
-            "scope": 7475,
-            "src": "177:87:20",
+            "scope": 11021,
+            "src": "177:87:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -360,7 +360,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7457,
+            "id": 11003,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -368,16 +368,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7453,
+              "id": 10999,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7448,
+                  "id": 10994,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "290:13:20",
+                  "scope": 11003,
+                  "src": "290:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -385,10 +385,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7447,
+                    "id": 10993,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "290:7:20",
+                    "src": "290:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -399,11 +399,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7450,
+                  "id": 10996,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "305:11:20",
+                  "scope": 11003,
+                  "src": "305:11:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -411,10 +411,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7449,
+                    "id": 10995,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "305:7:20",
+                    "src": "305:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -425,11 +425,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7452,
+                  "id": 10998,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "318:14:20",
+                  "scope": 11003,
+                  "src": "318:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -437,10 +437,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7451,
+                    "id": 10997,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "318:7:20",
+                    "src": "318:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -450,20 +450,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "289:44:20"
+              "src": "289:44:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7456,
+              "id": 11002,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7455,
+                  "id": 11001,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "354:4:20",
+                  "scope": 11003,
+                  "src": "354:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -471,10 +471,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7454,
+                    "id": 11000,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "354:4:20",
+                    "src": "354:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -484,10 +484,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "353:6:20"
+              "src": "353:6:18"
             },
-            "scope": 7475,
-            "src": "268:92:20",
+            "scope": 11021,
+            "src": "268:92:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -495,7 +495,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7466,
+            "id": 11012,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -503,16 +503,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7462,
+              "id": 11008,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7459,
+                  "id": 11005,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "381:16:20",
+                  "scope": 11012,
+                  "src": "381:16:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -520,10 +520,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7458,
+                    "id": 11004,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "381:7:20",
+                    "src": "381:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -534,11 +534,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7461,
+                  "id": 11007,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "399:14:20",
+                  "scope": 11012,
+                  "src": "399:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -546,10 +546,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7460,
+                    "id": 11006,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "399:7:20",
+                    "src": "399:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -559,20 +559,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "380:34:20"
+              "src": "380:34:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7465,
+              "id": 11011,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7464,
+                  "id": 11010,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "431:4:20",
+                  "scope": 11012,
+                  "src": "431:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -580,10 +580,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7463,
+                    "id": 11009,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "431:4:20",
+                    "src": "431:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -593,10 +593,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "430:6:20"
+              "src": "430:6:18"
             },
-            "scope": 7475,
-            "src": "364:73:20",
+            "scope": 11021,
+            "src": "364:73:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -604,21 +604,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7474,
+            "id": 11020,
             "name": "Approval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7473,
+              "id": 11019,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7468,
+                  "id": 11014,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "460:21:20",
+                  "scope": 11020,
+                  "src": "460:21:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -626,10 +626,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7467,
+                    "id": 11013,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "460:7:20",
+                    "src": "460:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -640,12 +640,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7470,
+                  "id": 11016,
                   "indexed": true,
                   "name": "spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "487:23:20",
+                  "scope": 11020,
+                  "src": "487:23:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -653,10 +653,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7469,
+                    "id": 11015,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "487:7:20",
+                    "src": "487:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -667,12 +667,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7472,
+                  "id": 11018,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "516:13:20",
+                  "scope": 11020,
+                  "src": "516:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -680,10 +680,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7471,
+                    "id": 11017,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "516:7:20",
+                    "src": "516:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -693,29 +693,29 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "454:79:20"
+              "src": "454:79:18"
             },
-            "src": "440:94:20"
+            "src": "440:94:18"
           }
         ],
-        "scope": 7476,
-        "src": "144:392:20"
+        "scope": 11022,
+        "src": "144:392:18"
       }
     ],
-    "src": "0:537:20"
+    "src": "0:537:18"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
     "exportedSymbols": {
       "ERC20": [
-        7475
+        11021
       ]
     },
-    "id": 7476,
+    "id": 11022,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7434,
+        "id": 10980,
         "literals": [
           "solidity",
           "^",
@@ -723,16 +723,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:20"
+        "src": "0:24:18"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 7435,
+        "id": 10981,
         "nodeType": "ImportDirective",
-        "scope": 7476,
-        "sourceUnit": 7508,
-        "src": "26:26:20",
+        "scope": 11022,
+        "sourceUnit": 11054,
+        "src": "26:26:18",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -742,31 +742,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7436,
+              "id": 10982,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7507,
-              "src": "162:10:20",
+              "referencedDeclaration": 11053,
+              "src": "162:10:18",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$7507",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 7437,
+            "id": 10983,
             "nodeType": "InheritanceSpecifier",
-            "src": "162:10:20"
+            "src": "162:10:18"
           }
         ],
         "contractDependencies": [
-          7507
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20",
         "fullyImplemented": false,
-        "id": 7475,
+        "id": 11021,
         "linearizedBaseContracts": [
-          7475,
-          7507
+          11021,
+          11053
         ],
         "name": "ERC20",
         "nodeType": "ContractDefinition",
@@ -774,7 +774,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7446,
+            "id": 10992,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -782,16 +782,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7442,
+              "id": 10988,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7439,
+                  "id": 10985,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "196:14:20",
+                  "scope": 10992,
+                  "src": "196:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -799,10 +799,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7438,
+                    "id": 10984,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "196:7:20",
+                    "src": "196:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -813,11 +813,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7441,
+                  "id": 10987,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "212:16:20",
+                  "scope": 10992,
+                  "src": "212:16:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -825,10 +825,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7440,
+                    "id": 10986,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "212:7:20",
+                    "src": "212:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -838,20 +838,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "195:34:20"
+              "src": "195:34:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7445,
+              "id": 10991,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7444,
+                  "id": 10990,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7446,
-                  "src": "255:7:20",
+                  "scope": 10992,
+                  "src": "255:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -859,10 +859,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7443,
+                    "id": 10989,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "255:7:20",
+                    "src": "255:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -872,10 +872,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "254:9:20"
+              "src": "254:9:18"
             },
-            "scope": 7475,
-            "src": "177:87:20",
+            "scope": 11021,
+            "src": "177:87:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -883,7 +883,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7457,
+            "id": 11003,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -891,16 +891,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7453,
+              "id": 10999,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7448,
+                  "id": 10994,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "290:13:20",
+                  "scope": 11003,
+                  "src": "290:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -908,10 +908,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7447,
+                    "id": 10993,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "290:7:20",
+                    "src": "290:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -922,11 +922,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7450,
+                  "id": 10996,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "305:11:20",
+                  "scope": 11003,
+                  "src": "305:11:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -934,10 +934,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7449,
+                    "id": 10995,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "305:7:20",
+                    "src": "305:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -948,11 +948,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7452,
+                  "id": 10998,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "318:14:20",
+                  "scope": 11003,
+                  "src": "318:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -960,10 +960,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7451,
+                    "id": 10997,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "318:7:20",
+                    "src": "318:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -973,20 +973,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "289:44:20"
+              "src": "289:44:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7456,
+              "id": 11002,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7455,
+                  "id": 11001,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7457,
-                  "src": "354:4:20",
+                  "scope": 11003,
+                  "src": "354:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -994,10 +994,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7454,
+                    "id": 11000,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "354:4:20",
+                    "src": "354:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1007,10 +1007,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "353:6:20"
+              "src": "353:6:18"
             },
-            "scope": 7475,
-            "src": "268:92:20",
+            "scope": 11021,
+            "src": "268:92:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -1018,7 +1018,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7466,
+            "id": 11012,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1026,16 +1026,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7462,
+              "id": 11008,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7459,
+                  "id": 11005,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "381:16:20",
+                  "scope": 11012,
+                  "src": "381:16:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1043,10 +1043,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7458,
+                    "id": 11004,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "381:7:20",
+                    "src": "381:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1057,11 +1057,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7461,
+                  "id": 11007,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "399:14:20",
+                  "scope": 11012,
+                  "src": "399:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1069,10 +1069,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7460,
+                    "id": 11006,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "399:7:20",
+                    "src": "399:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1082,20 +1082,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "380:34:20"
+              "src": "380:34:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7465,
+              "id": 11011,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7464,
+                  "id": 11010,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7466,
-                  "src": "431:4:20",
+                  "scope": 11012,
+                  "src": "431:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1103,10 +1103,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7463,
+                    "id": 11009,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "431:4:20",
+                    "src": "431:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1116,10 +1116,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "430:6:20"
+              "src": "430:6:18"
             },
-            "scope": 7475,
-            "src": "364:73:20",
+            "scope": 11021,
+            "src": "364:73:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -1127,21 +1127,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7474,
+            "id": 11020,
             "name": "Approval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7473,
+              "id": 11019,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7468,
+                  "id": 11014,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "460:21:20",
+                  "scope": 11020,
+                  "src": "460:21:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1149,10 +1149,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7467,
+                    "id": 11013,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "460:7:20",
+                    "src": "460:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1163,12 +1163,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7470,
+                  "id": 11016,
                   "indexed": true,
                   "name": "spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "487:23:20",
+                  "scope": 11020,
+                  "src": "487:23:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1176,10 +1176,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7469,
+                    "id": 11015,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "487:7:20",
+                    "src": "487:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1190,12 +1190,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7472,
+                  "id": 11018,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7474,
-                  "src": "516:13:20",
+                  "scope": 11020,
+                  "src": "516:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1203,10 +1203,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7471,
+                    "id": 11017,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "516:7:20",
+                    "src": "516:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1216,16 +1216,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "454:79:20"
+              "src": "454:79:18"
             },
-            "src": "440:94:20"
+            "src": "440:94:18"
           }
         ],
-        "scope": 7476,
-        "src": "144:392:20"
+        "scope": 11022,
+        "src": "144:392:18"
       }
     ],
-    "src": "0:537:20"
+    "src": "0:537:18"
   },
   "compiler": {
     "name": "solc",
@@ -1233,5 +1233,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.162Z"
+  "updatedAt": "2019-01-10T13:57:39.946Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ERC20Basic.json b/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
index fa724b4e4..beca5eabf 100644
--- a/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
+++ b/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
@@ -90,14 +90,14 @@
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
     "exportedSymbols": {
       "ERC20Basic": [
-        7507
+        11053
       ]
     },
-    "id": 7508,
+    "id": 11054,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7477,
+        "id": 11023,
         "literals": [
           "solidity",
           "^",
@@ -105,7 +105,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:21"
+        "src": "0:24:19"
       },
       {
         "baseContracts": [],
@@ -113,9 +113,9 @@
         "contractKind": "contract",
         "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179",
         "fullyImplemented": false,
-        "id": 7507,
+        "id": 11053,
         "linearizedBaseContracts": [
-          7507
+          11053
         ],
         "name": "ERC20Basic",
         "nodeType": "ContractDefinition",
@@ -123,7 +123,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7482,
+            "id": 11028,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -131,23 +131,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7478,
+              "id": 11024,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "194:2:21"
+              "src": "194:2:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7481,
+              "id": 11027,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7480,
+                  "id": 11026,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7482,
-                  "src": "218:7:21",
+                  "scope": 11028,
+                  "src": "218:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -155,10 +155,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7479,
+                    "id": 11025,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "218:7:21",
+                    "src": "218:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -168,10 +168,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "217:9:21"
+              "src": "217:9:19"
             },
-            "scope": 7507,
-            "src": "174:53:21",
+            "scope": 11053,
+            "src": "174:53:19",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -179,7 +179,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7489,
+            "id": 11035,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -187,16 +187,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7485,
+              "id": 11031,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7484,
+                  "id": 11030,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7489,
-                  "src": "249:12:21",
+                  "scope": 11035,
+                  "src": "249:12:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -204,10 +204,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7483,
+                    "id": 11029,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "249:7:21",
+                    "src": "249:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -217,20 +217,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "248:14:21"
+              "src": "248:14:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7488,
+              "id": 11034,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7487,
+                  "id": 11033,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7489,
-                  "src": "284:7:21",
+                  "scope": 11035,
+                  "src": "284:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -238,10 +238,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7486,
+                    "id": 11032,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "284:7:21",
+                    "src": "284:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -251,10 +251,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "283:9:21"
+              "src": "283:9:19"
             },
-            "scope": 7507,
-            "src": "230:63:21",
+            "scope": 11053,
+            "src": "230:63:19",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -262,7 +262,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7498,
+            "id": 11044,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -270,16 +270,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7494,
+              "id": 11040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7491,
+                  "id": 11037,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "314:11:21",
+                  "scope": 11044,
+                  "src": "314:11:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -287,10 +287,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7490,
+                    "id": 11036,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "314:7:21",
+                    "src": "314:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -301,11 +301,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7493,
+                  "id": 11039,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "327:14:21",
+                  "scope": 11044,
+                  "src": "327:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -313,10 +313,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7492,
+                    "id": 11038,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "327:7:21",
+                    "src": "327:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -326,20 +326,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "313:29:21"
+              "src": "313:29:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7497,
+              "id": 11043,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7496,
+                  "id": 11042,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "359:4:21",
+                  "scope": 11044,
+                  "src": "359:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -347,10 +347,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7495,
+                    "id": 11041,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "359:4:21",
+                    "src": "359:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -360,10 +360,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "358:6:21"
+              "src": "358:6:19"
             },
-            "scope": 7507,
-            "src": "296:69:21",
+            "scope": 11053,
+            "src": "296:69:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -371,21 +371,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7506,
+            "id": 11052,
             "name": "Transfer",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7505,
+              "id": 11051,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7500,
+                  "id": 11046,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "383:20:21",
+                  "scope": 11052,
+                  "src": "383:20:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -393,10 +393,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7499,
+                    "id": 11045,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "383:7:21",
+                    "src": "383:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -407,12 +407,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7502,
+                  "id": 11048,
                   "indexed": true,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "405:18:21",
+                  "scope": 11052,
+                  "src": "405:18:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -420,10 +420,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7501,
+                    "id": 11047,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "405:7:21",
+                    "src": "405:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -434,12 +434,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7504,
+                  "id": 11050,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "425:13:21",
+                  "scope": 11052,
+                  "src": "425:13:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -447,10 +447,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7503,
+                    "id": 11049,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "425:7:21",
+                    "src": "425:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -460,29 +460,29 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "382:57:21"
+              "src": "382:57:19"
             },
-            "src": "368:72:21"
+            "src": "368:72:19"
           }
         ],
-        "scope": 7508,
-        "src": "150:292:21"
+        "scope": 11054,
+        "src": "150:292:19"
       }
     ],
-    "src": "0:443:21"
+    "src": "0:443:19"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
     "exportedSymbols": {
       "ERC20Basic": [
-        7507
+        11053
       ]
     },
-    "id": 7508,
+    "id": 11054,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7477,
+        "id": 11023,
         "literals": [
           "solidity",
           "^",
@@ -490,7 +490,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:21"
+        "src": "0:24:19"
       },
       {
         "baseContracts": [],
@@ -498,9 +498,9 @@
         "contractKind": "contract",
         "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179",
         "fullyImplemented": false,
-        "id": 7507,
+        "id": 11053,
         "linearizedBaseContracts": [
-          7507
+          11053
         ],
         "name": "ERC20Basic",
         "nodeType": "ContractDefinition",
@@ -508,7 +508,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7482,
+            "id": 11028,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -516,23 +516,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7478,
+              "id": 11024,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "194:2:21"
+              "src": "194:2:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7481,
+              "id": 11027,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7480,
+                  "id": 11026,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7482,
-                  "src": "218:7:21",
+                  "scope": 11028,
+                  "src": "218:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -540,10 +540,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7479,
+                    "id": 11025,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "218:7:21",
+                    "src": "218:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -553,10 +553,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "217:9:21"
+              "src": "217:9:19"
             },
-            "scope": 7507,
-            "src": "174:53:21",
+            "scope": 11053,
+            "src": "174:53:19",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -564,7 +564,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7489,
+            "id": 11035,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -572,16 +572,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7485,
+              "id": 11031,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7484,
+                  "id": 11030,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7489,
-                  "src": "249:12:21",
+                  "scope": 11035,
+                  "src": "249:12:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -589,10 +589,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7483,
+                    "id": 11029,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "249:7:21",
+                    "src": "249:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -602,20 +602,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "248:14:21"
+              "src": "248:14:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7488,
+              "id": 11034,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7487,
+                  "id": 11033,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7489,
-                  "src": "284:7:21",
+                  "scope": 11035,
+                  "src": "284:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -623,10 +623,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7486,
+                    "id": 11032,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "284:7:21",
+                    "src": "284:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -636,10 +636,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "283:9:21"
+              "src": "283:9:19"
             },
-            "scope": 7507,
-            "src": "230:63:21",
+            "scope": 11053,
+            "src": "230:63:19",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -647,7 +647,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 7498,
+            "id": 11044,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -655,16 +655,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7494,
+              "id": 11040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7491,
+                  "id": 11037,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "314:11:21",
+                  "scope": 11044,
+                  "src": "314:11:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -672,10 +672,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7490,
+                    "id": 11036,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "314:7:21",
+                    "src": "314:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -686,11 +686,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7493,
+                  "id": 11039,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "327:14:21",
+                  "scope": 11044,
+                  "src": "327:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -698,10 +698,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7492,
+                    "id": 11038,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "327:7:21",
+                    "src": "327:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -711,20 +711,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "313:29:21"
+              "src": "313:29:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7497,
+              "id": 11043,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7496,
+                  "id": 11042,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7498,
-                  "src": "359:4:21",
+                  "scope": 11044,
+                  "src": "359:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -732,10 +732,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7495,
+                    "id": 11041,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "359:4:21",
+                    "src": "359:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -745,10 +745,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "358:6:21"
+              "src": "358:6:19"
             },
-            "scope": 7507,
-            "src": "296:69:21",
+            "scope": 11053,
+            "src": "296:69:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -756,21 +756,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7506,
+            "id": 11052,
             "name": "Transfer",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7505,
+              "id": 11051,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7500,
+                  "id": 11046,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "383:20:21",
+                  "scope": 11052,
+                  "src": "383:20:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -778,10 +778,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7499,
+                    "id": 11045,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "383:7:21",
+                    "src": "383:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -792,12 +792,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7502,
+                  "id": 11048,
                   "indexed": true,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "405:18:21",
+                  "scope": 11052,
+                  "src": "405:18:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -805,10 +805,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7501,
+                    "id": 11047,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "405:7:21",
+                    "src": "405:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -819,12 +819,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 7504,
+                  "id": 11050,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7506,
-                  "src": "425:13:21",
+                  "scope": 11052,
+                  "src": "425:13:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -832,10 +832,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7503,
+                    "id": 11049,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "425:7:21",
+                    "src": "425:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -845,16 +845,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "382:57:21"
+              "src": "382:57:19"
             },
-            "src": "368:72:21"
+            "src": "368:72:19"
           }
         ],
-        "scope": 7508,
-        "src": "150:292:21"
+        "scope": 11054,
+        "src": "150:292:19"
       }
     ],
-    "src": "0:443:21"
+    "src": "0:443:19"
   },
   "compiler": {
     "name": "solc",
@@ -862,5 +862,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.163Z"
+  "updatedAt": "2019-01-10T13:57:39.945Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Market.json b/blockchain/source/migration_artifacts/contracts/Market.json
index f14f2ddea..08f9b3ac2 100644
--- a/blockchain/source/migration_artifacts/contracts/Market.json
+++ b/blockchain/source/migration_artifacts/contracts/Market.json
@@ -1084,24 +1084,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153ce83398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a0396871690831617905560028054968616968216969096179095556003805493851693861693909317909255600480549390911692909316919091179091556008919091556009556152fc806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a72305820408bfacbeecd1fc4ca7528f2c7ac1eb0ff6868c895f4511b583e9f0b0cb030580029",
-  "deployedBytecode": "0x6080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a72305820408bfacbeecd1fc4ca7528f2c7ac1eb0ff6868c895f4511b583e9f0b0cb030580029",
-  "sourceMap": "254:26781:5:-;;;268:5:16;247:26;;-1:-1:-1;;;;;;247:26:16;;;2700:21:5;;;;2728:19;;;;2754:23;;3290:401;5:2:-1;;;;30:1;27;20:12;5:2;3290:401:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;567:5:18;:18;;-1:-1:-1;;;;;;567:18:18;;;575:10;567:18;;;;;3448:19:5;;-1:-1:-1;;;;;3448:19:5;;;;;;;;;3477:2;:26;;;;;;;;;;;;;;;3513:6;:27;;;;;;;;;;;;;;;3550:2;:38;;;;;;;;;;;;;;;;;3598:18;:40;;;;3648:16;:36;254:26781;;;;;;",
-  "deployedSourceMap": "254:26781:5:-;;;;;;;;;-1:-1:-1;;;254:26781:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2955:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2955:34:5;;;;;;;;;;-1:-1:-1;;;;;2955:34:5;-1:-1:-1;;;;;2955:34:5;;;;;;-1:-1:-1;;;;;2955:34:5;-1:-1:-1;;;;;2955:34:5;;;;;;-1:-1:-1;;;;;2955:34:5;-1:-1:-1;;;;;2955:34:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;26168:209;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26168:209:5;-1:-1:-1;;;;;26168:209:5;;;;;;;;;;;;;;;;;;;;;;;16399:344;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16399:344:5;-1:-1:-1;;;;;16399:344:5;;;;;19066:249;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19066:249:5;-1:-1:-1;;;;;19066:249:5;;;;;;;;;-1:-1:-1;;;;;19066:249:5;;;;;;;;;;;;;;20076:102;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20076:102:5;;;;;;;;;;;;;;;;;;;;17797:251;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17797:251:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10614:4087;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10614:4087:5;;;;;;;;;838:92:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:16;;;;;;18559:501:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18559:501:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18054:499:5;;;;;;;;;;;;;-1:-1:-1;;;;;18054:499:5;-1:-1:-1;;;;;18054:499:5;;;;;;-1:-1:-1;;;;;18054:499:5;-1:-1:-1;;;;;18054:499:5;;;;;;-1:-1:-1;;;;;18054:499:5;-1:-1:-1;;;;;18054:499:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;18054:499:5;;;;;;;;;;;;;;;;;;;;;;;247:26:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:16;;;;19321:457:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19321:457:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19876:89;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19876:89:5;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;666:90:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:16;;;;5842:878:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5842:878:5;;;;;;;238:20:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;26643:246:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26643:246:5;;;;;5405:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5405:431:5;;;;;14707:1291;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;14707:1291:5;;;;;16036:357;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16036:357:5;-1:-1:-1;;;;;16036:357:5;;;;;2912:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2912:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:5;;;;;;;-1:-1:-1;2912:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2912:36:5;-1:-1:-1;;;;;;2912:36:5;6749:3046;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6749:3046:5;;;;;;;19971:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19971:99:5;;;;26895:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26895:138:5;;;;10462:146;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10462:146:5;;;;;9801:655;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;9801:655:5;;;;;;;;;16749:300;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16749:300:5;-1:-1:-1;;;;;16749:300:5;;;;;;;;;;26025:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26025:137:5;-1:-1:-1;;;;;26025:137:5;;;;;20184:98;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20184:98:5;;;;17071:719;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17071:719:5;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;19784:86;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19784:86:5;;;;3738:1661;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3738:1661:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3738:1661:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:5;;;;;;;;;-1:-1:-1;3738:1661:5;-1:-1:-1;3738:1661:5;;;;;-1:-1:-1;3738:1661:5;;-1:-1:-1;3738:1661:5;;;;;;;;;;;;;;-1:-1:-1;3738:1661:5;;-1:-1:-1;3738:1661:5;;-1:-1:-1;;;;;;;3738:1661:5;26383:254;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26383:254:5;;;;;25870:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;25870:149:5;-1:-1:-1;;;;;25870:149:5;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;2955:34:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2955:34:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;26168:209::-;26240:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;26274:10:5;-1:-1:-1;;;;;26264:37:5;;:39;;;;;-1:-1:-1;;;26264:39:5;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26264:39:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26264:39:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26264:39:5;:44;;26256:53;;;;;;-1:-1:-1;26319:6:5;:30;;-1:-1:-1;;;;;;26319:30:5;-1:-1:-1;;;;;26319:30:5;;;;;-1:-1:-1;731:1:18;26168:209:5;;;:::o;16399:344::-;16469:4;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;16507:10:5;16493:25;;;;:13;:25;;;;;;;;-1:-1:-1;;;;;16493:34:5;;;;;;;;;;;;:42;;:34;:42;16485:51;;;;;;-1:-1:-1;;;;;16546:17:5;;;;;;:8;:17;;;;;;;;:30;;-1:-1:-1;;;;;;16546:30:5;16566:10;16546:30;;;;;;16586:20;;;:8;:20;;;;;:27;;-1:-1:-1;;16586:27:5;;;16546:30;16586:27;;;;16630:13;:25;;;;;:34;;;;;;;;;16623:41;;;;;;;;16679:36;16566:10;;16546:17;16679:36;;;-1:-1:-1;16732:4:5;16399:344;;;:::o;19066:249::-;-1:-1:-1;;;;;19153:17:5;;;19123:14;19153:17;;;:8;:17;;;;;;19123:14;;19153:17;:24;;:56;;-1:-1:-1;;;;;;19181:28:5;;;:17;;;;:8;:17;;;;;;;;;:28;19153:56;19149:160;;;-1:-1:-1;19234:7:5;19149:160;;;-1:-1:-1;;;;;;19281:17:5;;;;;;;:8;:17;;;;;;;;19066:249::o;20076:102::-;20153:18;;20076:102;;:::o;17797:251::-;17869:23;17902:11;17929:18;;:::i;:::-;17950:15;;;;:6;:15;;;;;;;17929:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17929:36:5;;;-1:-1:-1;;17929:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17992:5;:17;;;18019:5;:12;;;17975:66;;;;17797:251;;;;:::o;10614:4087::-;10705:20;11075:21;11729:36;;:::i;:::-;10759:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10759:24:5;10745:10;:38;;:78;;-1:-1:-1;10801:13:5;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10801:22:5;10787:10;:36;10745:78;:120;;;-1:-1:-1;10841:13:5;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10841:24:5;10827:10;:38;10745:120;10737:129;;;;;;;;10908:26;10884:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;10876:59;;;;;;10950:14;10957:6;10950;:14::i;:::-;10946:70;;;10988:16;;10980:25;;;;;;11043:14;;:21;;11062:1;11043:21;:18;:21;:::i;:::-;11026:14;:38;11125:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11125:24:5;11111:10;:38;11107:166;;;11179:19;11165:33;;11107:166;;;11243:19;11229:33;;11107:166;11310:88;;;;;;;;;11324:6;11310:88;;;;11332:11;11310:88;;;;;;;;;;;;;;;;;;;;;;;;11368:29;11310:88;;11292:14;;11283:24;;;;:8;:24;;;;;;;;:115;;;;;;;;;;;;;;;;-1:-1:-1;;11283:115:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;11434:14:5;;11413:36;;11434:14;;-1:-1:-1;11413:36:5;;;;;11479:19;11464:11;:34;;;;;;;;;11460:1719;;;11544:22;;;;:14;:22;;;;;11567:1;11544:25;;11519:51;;-1:-1:-1;;;;;;;;;;;11519:51:5;;;;11584:35;11593:22;;;:14;:22;;;;;;;;11616:1;11593:25;;;;;11584:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;11584:75:5;11629:30;11584:75;;;;;;11701:14;;11673:42;;;11777:25;;11768:35;;;;;;11729:74;;;;;;;;;;;;;;;;;;11768:35;11729:74;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;11837:13:5;;;;:5;:13;;;;;:22;;;11729:74;;-1:-1:-1;11822:37:5;;:71;;;;-1:-1:-1;11874:13:5;;;;:5;:13;;;;;:19;;;11863:30;;11822:71;11818:1135;;;11922:14;;11913:24;;;;:8;:24;;;;;11947:30;11913:31;;;:64;;-1:-1:-1;;11913:64:5;;;;;;11995:12;12000:6;11995:4;:12::i;:::-;-1:-1:-1;12025:13:5;;;;:5;:13;;;;;;;;:19;;:30;;;12073:14;:22;;;;;12096:1;12073:25;:29;12150:14;;12125:40;;-1:-1:-1;;;;;;;;;;;12125:40:5;;;;11818:1135;;;12216:29;12190:15;:22;;;:55;;;;;;;;;:98;;;;;12277:11;12249:15;:24;;;:39;;12190:98;:135;;;;;12317:8;12292:15;:21;;;:33;;12190:135;12186:767;;;12354:14;;12345:24;;;;:8;:24;;;;;;;;12379:30;12345:31;;;:64;;-1:-1:-1;;12345:64:5;;;;;;;;12436:22;;;:14;:22;;;;;;:25;;12427:35;;;;;;;;:42;;:75;;;;;;;;;;12550:22;;;;;;:25;;12525:51;;12550:25;;-1:-1:-1;;;;;;;;;;;12525:51:5;;12622:1;12594:22;;;:14;:22;;;;;:29;;;12664:1;12641:25;:29;12688:12;12594:22;12688:4;:12::i;:::-;-1:-1:-1;12740:21:5;;;;;12718:13;;;;:5;:13;;;;;:19;;;;:43;;;;12779:22;;:36;;;12863:14;;12838:40;;-1:-1:-1;;;;;;;;;;;12838:40:5;12718:13;12838:40;12186:767;;;12924:14;;12917:21;;;;12186:767;12967:35;12976:22;;;:14;:22;;;;;;;;12999:1;12976:25;;;12967:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;12967:75:5;13012:30;12967:75;;;13086:22;;;;;;;:25;;13061:51;;13086:25;;-1:-1:-1;;;;;;;;;;;13061:51:5;;13154:14;;13126:22;;;;:14;:22;;;;;13149:1;13126:25;:42;11460:1719;13208:19;13193:11;:34;;;;;;;;;13189:1389;;;13273:22;;;;:14;:22;;;;;:25;;13248:51;;-1:-1:-1;;;;;;;;;;;13248:51:5;;;;13313:35;13322:22;;;:14;:22;;;;;;;;:25;;13313:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;13313:75:5;13358:30;13313:75;;;;;;13430:14;;13402:42;;-1:-1:-1;13485:25:5;;;;13476:35;;;;;;13458:53;;;;;;;;;;;;;;;;;;13476:35;;13458:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;13545:13:5;;;;:5;:13;;;;;:22;;;13458:53;;-1:-1:-1;13530:37:5;;:71;;;;-1:-1:-1;13582:13:5;;;;:5;:13;;;;;:19;;;13571:30;;13530:71;13526:1042;;;13630:14;;13621:24;;;;:8;:24;;;;;13655:30;13621:31;;;:64;;-1:-1:-1;;13621:64:5;;;;;;13703:12;13708:6;13703:4;:12::i;:::-;-1:-1:-1;13733:13:5;;;;:5;:13;;;;;;;;:19;;:30;;;13781:14;:22;;;;;13733:13;13781:25;:29;13858:14;;13833:40;;-1:-1:-1;;;;;;;;;;;13833:40:5;;;;13526:1042;;;13924:29;13898:15;:22;;;:55;;;;;;;;;:98;;;;;13985:11;13957:15;:24;;;:39;;13898:98;:135;;;;;14025:8;14000:15;:21;;;:33;;13898:135;13894:674;;;14062:14;;14053:24;;;;:8;:24;;;;;14087:30;14053:31;;;:64;;-1:-1:-1;;14053:64:5;;14087:30;14053:64;;;;-1:-1:-1;14165:22:5;;;;:14;:22;;;;;14188:1;14165:25;;14140:51;;-1:-1:-1;;;;;;;;;;;14140:51:5;;;;14237:1;14209:22;;;:14;:22;;;;;:29;;;14279:1;14256:25;:29;14303:12;14209:22;14303:4;:12::i;:::-;-1:-1:-1;14333:13:5;;;;:5;:13;;;;;;:19;;;;:30;;;14406:24;;;;14381:22;;;;:49;;;;14478:14;14453:40;;14478:14;;-1:-1:-1;;;;;;;;;;;14453:40:5;;13894:674;14640:13;;;;:5;:13;;;;;:22;;;;14612:23;;;;;:51;;;:27;:51;:::i;:::-;14588:13;;;;:5;:13;;;;;:21;;:75;14680:14;;;-1:-1:-1;10614:4087:5;;;;;;;;:::o;838:92:16:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;568:6:16;;-1:-1:-1;;;568:6:16;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:16;;;916:9;;;;900:5;916:9;838:92::o;18559:501:5:-;18629:13;18824;;;:5;:13;;;;;;;;:22;;;;18856:19;;;;18885:21;;;;18916:20;;;;18946:28;;;;18984:25;;;;19019:24;;;;;18824:22;;18856:19;;18885:21;;18916:20;;;;;18946:28;;18559:501::o;18054:499::-;18151:18;18320:13;;;:5;:13;;;;;;;;18354:24;;;;18388;;;;18422:22;;;;18454:19;;;;18483;;;;18512:23;;;;18303:243;;;;;;;;;;;;;;;;;18122:19;;18151:18;;;;;;;;;;;18320:13;;-1:-1:-1;;;;;18354:24:5;;;;18388;;;;18422:22;;;;;18454:19;;18483;;18303:243;18320:13;;18303:243;;18320:13;18303:243;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;;;;;;;;:::o;247:26:16:-;;;-1:-1:-1;;;247:26:16;;;;;:::o;19321:457:5:-;19407:11;19555:25;;;:8;:25;;;;;:32;;19597:37;;;;19644:31;;;;19685:34;;;;19729:32;;;;;19555;;19597:37;;;;;19644:31;;19685:34;;19729:32;;;;19321:457::o;19876:89::-;19946:12;;19876:89;:::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;;;;;1089:18:18;;;1001:111::o;666:90:16:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:16;-1:-1:-1;;;720:13:16;;;744:7;;;;720:6;744:7;666:90::o;5842:878:5:-;5924:16;;:::i;:::-;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;5943:13:5;;;;:6;:13;;;;;;;5924:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:5;;;-1:-1:-1;;5924:32:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:5;;;-1:-1:-1;;5924:32:5;;;;;;;;;;;;;;;;;;;-1:-1:-1;5991:19:5;5974:13;;:36;;;;;;;;;5966:45;;;;;;6048:24;6029:3;:15;;;:43;;;;;;;;;6021:52;;;;;;6092:12;;;;:30;-1:-1:-1;6092:30:5;6084:39;;;;;;6175:3;:17;;;6141:51;;;;;;;;:2;;;:30;;;;;;6160:10;6141:30;;;;;;;;-1:-1:-1;;;;;6141:2:5;;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;6141:30:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6141:30:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6141:30:5;:51;;;;;;;;;;6133:60;;;;;;6211:2;;6242:10;;;;-1:-1:-1;;;;;6211:2:5;;;;:8;;6220:10;;6232:21;;:9;:21::i;:::-;6211:43;;;;;-1:-1:-1;;;6211:43:5;;;;;;;-1:-1:-1;;;;;6211:43:5;-1:-1:-1;;;;;6211:43:5;;;;;;-1:-1:-1;;;;;6211:43:5;-1:-1:-1;;;;;6211:43:5;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6211:43:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6211:43:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6211:43:5;:52;;;:97;;-1:-1:-1;6267:2:5;;6276:10;;;;;6267:32;;-1:-1:-1;;;;;6267:32:5;;-1:-1:-1;;;;;6267:32:5;;;;;;;6288:10;6267:32;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;6267:32:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6267:32:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6267:32:5;:41;6211:97;6203:106;;;;;;;;6327:2;;;6336:13;;;6327:35;;;-1:-1:-1;;;;;6327:35:5;;-1:-1:-1;;;;;6327:35:5;;;;;;;6351:10;6327:35;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;6327:35:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6327:35:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6327:35:5;:44;6319:53;;;;;;6383:285;6407:19;6440:21;6450:3;:10;;;6440:9;:21::i;:::-;6475:14;6503:3;:9;;;6526:3;:12;;;6552:39;6613:1;6637;6629:10;;6653:3;:14;;;6383:10;:285::i;:::-;;6679:34;6688:5;6695:17;:15;:17::i;:::-;6679:8;:34::i;:::-;5842:878;;;:::o;238:20:18:-;;;-1:-1:-1;;;;;238:20:18;;:::o;26643:246:5:-;26717:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;26756:16:5;;26741:31;;26733:40;;;;;;26788:32;;26807:12;;26788:32;;;;;-1:-1:-1;26830:16:5;:31;26878:4;;26643:246::o;5405:431::-;5490:12;;5456:4;;5479:23;;;5471:32;;;;;;5552:24;5521:15;;;;:6;:15;;;;;:27;;;;;;:55;;;;;;;;;5513:64;;;;;;5595:15;;;;:6;:15;;;;;:22;;;;-1:-1:-1;;;;;5595:22:5;5621:10;5595:36;5587:45;;;;;;5651:5;;;5678:15;;;:6;:15;;;;;;;;:25;;;5651:53;;-1:-1:-1;;;;;5651:53:5;;5666:10;5651:53;;;;;;;;;;;;;-1:-1:-1;;;;;5651:5:5;;;;:14;;:53;;;;;5678:15;5651:53;;;;;;;:5;:53;;;5:2:-1;;;;30:1;27;20:12;5:2;5651:53:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5651:53:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5651:53:5;5643:62;;;;;;;;5715:15;;;;:6;:15;;;;;;:56;;-1:-1:-1;;5715:56:5;;;;;5787:21;5715:15;;5787:21;;;-1:-1:-1;5825:4:5;5405:431;;;:::o;14707:1291::-;14774:4;14790:28;;:::i;:::-;14821:25;;;;:8;:25;;;;;;;;;14790:56;;;;;;;;;;;;;;;;14821:25;;14790:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;14884:14:5;;14878:21;;;;:5;:21;;;;;:32;;;14884:14;;-1:-1:-1;;;;;;14878:32:5;14864:10;:46;;:94;;-1:-1:-1;14934:14:5;;14928:21;;;;:5;:21;;;;;:30;;;-1:-1:-1;;;;;14928:30:5;14914:10;:44;14864:94;:144;;;-1:-1:-1;14982:14:5;;14976:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;14976:32:5;14962:10;:46;14864:144;14856:153;;;;;;;;15045:30;15027:7;:14;;;:48;;;;;;;;;;15019:57;;;;;;15114:19;15091:7;:19;;;:42;;;;;;;;;15087:437;;;15173:14;;15167:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15167:32:5;15153:10;:46;15149:254;;;15219:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15219:65:5;15254:30;15219:65;;;15149:254;;;15323:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15323:65:5;15358:30;15323:65;;;15149:254;15431:14;;15452:1;15416:30;;;:14;:30;;;;;;:37;;;15472:41;15497:15;;-1:-1:-1;;;;;;;;;;;15472:41:5;;15087:437;15561:19;15538:7;:19;;;:42;;;;;;;;;15534:437;;;15620:14;;15614:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15614:32:5;15600:10;:46;15596:254;;;15666:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15666:65:5;15701:30;15666:65;;;15596:254;;;15770:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15770:65:5;15805:30;15770:65;;;15596:254;15878:14;;15899:1;15863:30;;;:14;:30;;;;;15894:1;15863:33;:37;15919:41;;15944:15;;-1:-1:-1;;;;;;;;;;;15919:41:5;;;;15534:437;-1:-1:-1;15987:4:5;;14707:1291;-1:-1:-1;;14707:1291:5:o;16036:357::-;16107:4;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;16156:10:5;16131:21;16156:10;16131:9;:21::i;:::-;-1:-1:-1;;;;;16131:35:5;;16123:44;;;;;;16194:10;16185:20;;;;:8;:20;;;;;;;;:29;16177:38;;;;;;16255:7;-1:-1:-1;;;;;16233:29:5;:18;16243:7;16233:9;:18::i;:::-;-1:-1:-1;;;;;16233:29:5;;16225:38;;;;;;-1:-1:-1;;;;;16273:22:5;;;;;;:13;:22;;;;;;;;16296:10;16273:34;;;;;;;;:41;;-1:-1:-1;;16273:41:5;16310:4;16273:41;;;16329:36;16296:10;;16329:36;;;-1:-1:-1;16382:4:5;16036:357;;;:::o;2912:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:5;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6749:3046::-;6824:16;;:::i;:::-;6867;;:::i;:::-;8259:6;416::16;;8259::5;;;;;;;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;6843:14:5;;;;:6;:14;;;;;;;6824:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:5;;;-1:-1:-1;;6824:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:5;;;-1:-1:-1;;6824:33:5;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6886:14:5;;;:6;:14;;;;;;;6867:33;;;;;;;;;;6824;;-1:-1:-1;6867:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:5;;;-1:-1:-1;;6867:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:5;;;-1:-1:-1;;6867:33:5;;;;;;;;;;;;;;;;;;;-1:-1:-1;6938:24:5;6919:3;:15;;;:43;;;;;;;;;:90;;;;-1:-1:-1;6985:24:5;6966:3;:15;;;:43;;;;;;;;;6919:90;6911:99;;;;;;;;7029:16;;;;-1:-1:-1;;;;;7029:23:5;;;:68;;;7076:21;7086:3;:10;;;7076:9;:21::i;:::-;-1:-1:-1;;;;;7056:41:5;:3;:16;;;-1:-1:-1;;;;;7056:41:5;;7029:68;7028:144;;;;-1:-1:-1;7103:16:5;;;;-1:-1:-1;;;;;7103:23:5;;;:68;;;7150:21;7160:3;:10;;;7150:9;:21::i;:::-;-1:-1:-1;;;;;7130:41:5;:3;:16;;;-1:-1:-1;;;;;7130:41:5;;7103:68;7020:153;;;;;;;;7208:19;7191:13;;:36;;;;;;;;;7183:45;;;;;;7263:19;7246:13;;:36;;;;;;;;;7238:45;;;;;;7314:2;;;7323:13;;;7348:10;;;;-1:-1:-1;;;;;7314:2:5;;;;:8;;7323:13;7338:21;;:9;:21::i;:::-;7314:46;;;;;-1:-1:-1;;;7314:46:5;;;;;;;-1:-1:-1;;;;;7314:46:5;-1:-1:-1;;;;;7314:46:5;;;;;;-1:-1:-1;;;;;7314:46:5;-1:-1:-1;;;;;7314:46:5;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7314:46:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7314:46:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7314:46:5;:55;;;:115;;-1:-1:-1;7385:2:5;;;7394:13;;;7409:10;;;;;7385:35;;-1:-1:-1;;;;;7385:35:5;;-1:-1:-1;;;;;7385:35:5;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7385:35:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7385:35:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7385:35:5;:44;7314:115;:183;;;;-1:-1:-1;7445:2:5;;7454:10;;;;;7476;;;;-1:-1:-1;;;;;7445:2:5;;;;:8;;7454:10;7466:21;;:9;:21::i;:::-;7445:43;;;;;-1:-1:-1;;;7445:43:5;;;;;;;-1:-1:-1;;;;;7445:43:5;-1:-1:-1;;;;;7445:43:5;;;;;;-1:-1:-1;;;;;7445:43:5;-1:-1:-1;;;;;7445:43:5;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7445:43:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7445:43:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7445:43:5;:52;7314:183;:240;;;;-1:-1:-1;7513:2:5;;7522:10;;;;;7534;;;;7513:32;;-1:-1:-1;;;;;7513:32:5;;-1:-1:-1;;;;;7513:32:5;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7513:32:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7513:32:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7513:32:5;:41;7314:240;:300;;;;-1:-1:-1;7570:2:5;;;7579:13;;;7594:10;;;;;7570:35;;-1:-1:-1;;;;;7570:35:5;;-1:-1:-1;;;;;7570:35:5;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7570:35:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7570:35:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7570:35:5;:44;7314:300;:368;;;;-1:-1:-1;7630:2:5;;7649:10;;;;-1:-1:-1;;;;;7630:2:5;;;;:8;;7639:21;;:9;:21::i;:::-;7662:10;;;;;7630:43;;-1:-1:-1;;;7630:43:5;;;;;;-1:-1:-1;;;;;7630:43:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;7630:43:5;;;;5:2:-1;;;;30:1;27;20:12;5:2;7630:43:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7630:43:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7630:43:5;:52;7314:368;:425;;;;-1:-1:-1;7698:2:5;;7707:10;;;;;7719;;;;7698:32;;-1:-1:-1;;;;;7698:32:5;;-1:-1:-1;;;;;7698:32:5;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7698:32:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7698:32:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7698:32:5;:41;7314:425;7293:447;;;;;;;;7771:9;;;;;7758;;;;:22;;7750:31;;;;;;7815:12;;;;;7799;;;;:28;;7791:37;;;;;;7911:3;:17;;;7877:51;;;;;;;;:2;;;7896:10;;;;;7877:30;;;;;-1:-1:-1;;;;;7877:30:5;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7877:30:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7877:30:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7877:30:5;:51;;;;;;;;;;7869:60;;;;;;7981:3;:17;;;7947:51;;;;;;;;:2;;;7966:10;;;;;7947:30;;;;;-1:-1:-1;;;;;7947:30:5;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7947:30:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7947:30:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7947:30:5;:51;;;;;;;;;;7939:60;;;;;;8036:16;;8014:3;:12;;;:19;:38;8010:112;;;8083:28;8098:3;:12;;;8083:14;:28::i;:::-;8068:12;;;:43;8010:112;8158:16;;8136:3;:12;;;:19;:38;8132:112;;;8205:28;8220:3;:12;;;8205:14;:28::i;:::-;8190:12;;;:43;8132:112;8268:1;8259:10;;8254:254;8275:3;:12;;;:19;8271:1;:23;8254:254;;;8462:12;;;;:15;;8475:1;;8462:15;;;;;;;;;;;;;;8461:16;:35;;;-1:-1:-1;8481:12:5;;;;:15;;8494:1;;8481:15;;;;;;;;;;;;;;8461:35;8453:44;;;;;;;;8296:3;;;;;8254:254;;;8546:18;;8522:3;:14;;;:21;:42;8518:122;;;8597:32;8614:3;:14;;;8597:16;:32::i;:::-;8580:14;;;:49;8518:122;8678:18;;8654:3;:14;;;:21;:42;8650:122;;;8729:32;8746:3;:14;;;8729:16;:32::i;:::-;8712:14;;;:49;8650:122;8791:1;8787:5;;8782:116;8798:3;:14;;;:21;8794:1;:25;8782:116;;;8869:14;;;;:17;;8884:1;;8869:17;;;;;;;;;;;;;;8848:38;;:3;:14;;;8863:1;8848:17;;;;;;;;;;;;;;;;;;;:38;;;;8840:47;;;;;;8821:3;;;;;8782:116;;;8921:10;;:17;;8936:1;8921:17;:14;:17;:::i;:::-;8908:10;:30;8975:10;;;;8965:21;;:9;:21::i;:::-;8996:14;;;;:6;:14;;;;;;:55;;;-1:-1:-1;;8996:55:5;;;;;;;9061:14;;;;;;:55;;;;;;;;9150:10;;9126:21;;;;:34;;;9170:21;;:34;9220:20;8948:38;;-1:-1:-1;8996:14:5;;9220:20;;8996:14;9220:20;9255;;9268:6;;9255:20;;;;;9419:12;;;;9303:15;;-1:-1:-1;9343:1:5;;-1:-1:-1;9419:17:5;9415:85;;9476:12;;;;9462:27;;:9;;:27;:13;:27;:::i;:::-;9452:37;;9415:85;9531:3;:13;;;9509:35;;9574:177;;;;;;;;;9579:3;:14;;;9574:177;;;;9595:3;:10;;;-1:-1:-1;;;;;9574:177:5;;;;;9607:3;:10;;;-1:-1:-1;;;;;9574:177:5;;;;;9619:6;-1:-1:-1;;;;;9574:177:5;;;;;9627:6;9574:177;;;;9635:6;9574:177;;;;9643:3;:12;;;9574:177;;;;9657:3;:9;;;9574:177;;;;9668:9;9574:177;;;;9679:7;9574:177;;;;9688:26;9574:177;;;;;;;;;;;;9716:14;9574:177;;;;9732:1;9574:177;;;;9735:15;9574:177;;;9554:5;:17;9560:10;;9554:17;;;;;;;;;;;:197;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;9554:197:5;;;;;;;;;;-1:-1:-1;;;;;;9554:197:5;;;-1:-1:-1;;;;;9554:197:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;9554:197:5;;;;;;;;;;;;;;;;;;-1:-1:-1;9554:197:5;;;;;;;;;;;;;;;;;;;;;;;;;;9777:10;;9766:22;;;;-1:-1:-1;;9766:22:5;6749:3046;;;;;;;;;:::o;19971:99::-;20049:14;;19971:99;:::o;26895:138::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;26944:5:5;;;26959;;26966:30;;;;;;26990:4;26966:30;;;;;;-1:-1:-1;;;;;26944:5:5;;;;:14;;26959:5;;;26944;;26966:15;;:30;;;;;;;;;;;;;;;;26944:5;26966:30;;;5:2:-1;;;;30:1;27;20:12;5:2;26966:30:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26966:30:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26966:30:5;26944:53;;;-1:-1:-1;;;26944:53:5;;;;;;-1:-1:-1;;;;;26944:53:5;;;;;;;;;;;;;;;;;;;;26966:30;;26944:53;;;;;;;-1:-1:-1;26944:53:5;;;;5:2:-1;;;;30:1;27;20:12;5:2;26944:53:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26944:53:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;27020:5:5;;-1:-1:-1;;;;;27020:5:5;27007:19;10462:146;10505:4;10520:20;10533:6;10520:12;:20::i;:::-;;10550:30;10573:6;10550:22;:30::i;9801:655::-;9878:4;9926:26;9902:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;9893:61;;;;;;9986:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;9986:24:5;9972:10;:38;;:80;;-1:-1:-1;10028:13:5;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10028:24:5;10014:10;:38;9972:80;:120;;;-1:-1:-1;10070:13:5;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10070:22:5;10056:10;:36;9972:120;9964:129;;;;;;;;10155:13;;;;:5;:13;;;;;:22;;;;10127:23;;;;;:51;;;:27;:51;:::i;:::-;10108:15;:70;10104:177;;10231:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10231:24:5;10259:10;10231:38;10223:47;;;;;;10290:35;10305:6;10313:11;10290:14;:35::i;:::-;10335:20;10348:6;10335:12;:20::i;:::-;;10365:25;10383:6;10365:17;:25::i;:::-;10400:28;10421:6;10400:20;:28::i;:::-;;10445:4;10438:11;;9801:655;;;;;:::o;16749:300::-;16835:4;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;16881:7:5;-1:-1:-1;;;;;16859:29:5;:18;16869:7;16859:9;:18::i;:::-;-1:-1:-1;;;;;16859:29:5;;:81;;;;-1:-1:-1;16893:10:5;-1:-1:-1;;;;;16893:21:5;;;;:46;;-1:-1:-1;16918:10:5;-1:-1:-1;;;;;16918:21:5;;;16893:46;16851:90;;;;;;;;-1:-1:-1;;;;;16958:17:5;;;;;;;:8;:17;;;;;;16951:24;;-1:-1:-1;;;;;;16951:24:5;;;16990:31;;;;;;;16958:17;16990:31;-1:-1:-1;17038:4:5;16749:300;;;;:::o;26025:137::-;26096:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;26112:2:5;:22;;-1:-1:-1;;;;;26112:22:5;;-1:-1:-1;;;;;;26112:22:5;;;;;;;26025:137;;;:::o;20184:98::-;20259:16;;20184:98;:::o;17071:719::-;17141:19;17170:14;17194:20;17224:13;17247:10;17267:15;17292:43;17345:17;17372:11;17393:19;17422:14;17452:18;;:::i;:::-;17473:15;;;;:6;:15;;;;;;;17452:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17452:36:5;;;-1:-1:-1;;17452:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17515:5;:15;;;17540:5;:12;;;17562:5;:18;;;17590:5;:14;;;17614:5;:11;;;17635:5;:14;;;17659:5;:19;;;17688:5;:15;;;17713:5;:9;;;17732:5;:16;;;17758:5;:15;;;17498:285;;;;;;;;;;;;;;;;;;;;;;;;;;;;17071:719;;;;;;;;;;;;;;:::o;19784:86::-;19853:10;;19784:86;:::o;3738:1661::-;4063:4;416:6:16;;4063:4:5;;;;;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;4105:39:5;4087:14;:57;;;;;;;;;;4079:66;;;;;;4183:16;;4163;;:36;;4155:45;;;;;;4240:18;;4218;;:40;;4210:49;;;;;;4284:1;4275:10;;4270:117;4291:11;:18;4287:1;:22;4270:117;;;2603:7;4338:11;4350:1;4338:14;;;;;;;;;;;;;;;;;;;:37;;;4330:46;;;;;;4311:3;;;;;4270:117;;;4414:1;;-1:-1:-1;4444:19:5;4430:10;:33;;;;;;;;;4426:463;;;4483:14;;4479:291;;;4529:33;4546:6;4554:7;4529:16;:33::i;:::-;4517:45;;4479:291;;;4599:6;4587:9;:18;4583:187;;;4637:35;4654:6;4662:9;4637:16;:35::i;4583:187::-;4723:32;4740:6;4748;4723:16;:32::i;:::-;4711:44;;4583:187;4830:5;;:47;;;;;;4849:10;4830:47;;;;4861:4;4830:47;;;;;;;;;;;;-1:-1:-1;;;;;4830:5:5;;;;:18;;:47;;;;;;;;;;;;;;;:5;;:47;;;5:2:-1;;;;30:1;27;20:12;5:2;4830:47:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4830:47:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4830:47:5;4822:56;;;;;;;;4914:12;;:19;;4931:1;4914:19;:16;:19;:::i;:::-;4899:12;:34;;;5002:330;;;;;;;;;4899:34;;-1:-1:-1;5002:330:5;5021:10;5002:330;;;;;;;;;;;;5045:24;5002:330;;;;5083:10;-1:-1:-1;;;;;5002:330:5;;;;;5107:16;-1:-1:-1;;;;;5002:330:5;;;;;5137:9;5002:330;;;;5160:6;5002:330;;;;5180:9;5002:330;;;;5203:14;5002:330;;;;;;;;;;-1:-1:-1;;;;;5002:330:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5002:330:5;;;;;;;4984:15;;;:6;:15;;;;;:348;;;;:15;;-1:-1:-1;;4984:348:5;;;;;;;;;;;;;;;-1:-1:-1;4984:348:5;;;;;;;;-1:-1:-1;;4984:348:5;;;;;;;;;;;;;;;-1:-1:-1;4984:348:5;;;;;;-1:-1:-1;;4984:348:5;;-1:-1:-1;;;;;4984:348:5;;;;;;;;;;;-1:-1:-1;4984:348:5;;;;-1:-1:-1;;;;;;4984:348:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:5;;;;;;;;;-1:-1:-1;;4984:348:5;;;;;;;;;;;;;;;-1:-1:-1;4984:348:5;;;;;;;;;;-1:-1:-1;;4984:348:5;-1:-1:-1;;;;;4984:348:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:5;;;;;;;;;;;;;;;;;;5348:20;;5360:7;;5348:20;;-1:-1:-1;;5348:20:5;5385:7;3738:1661;-1:-1:-1;;;;;;;;;;;;3738:1661:5:o;26383:254::-;26459:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;26498:18:5;;26483:33;;26475:42;;;;;;26532:34;;26553:12;;26532:34;;;;;-1:-1:-1;26576:18:5;:33;26626:4;;26383:254::o;25870:149::-;25947:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;25963:2:5;:28;;-1:-1:-1;;;;;25963:28:5;;-1:-1:-1;;;;;;25963:28:5;;;;;;;25870:149;;;:::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;23965:108:5:-;24017:4;24039:13;;;:5;:13;;;;;:22;;;:27;;23965:108::o;1238:128:17:-;1319:7;;;1339;;;;1332:15;;;25576:272:5;25641:6;25659:22;25727:6;25695:16;;25684:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25684:28:5;;25659:53;;25736:1;25727:10;;25722:95;25743:9;:16;25739:1;:20;25722:95;;;25794:9;25804:1;25794:12;;;;;;;;;;;;;;;;;;25780:8;25789:1;25780:11;;;;;;;;;;:26;;;:11;;;;;;;;;;:26;25761:3;;25722:95;;;25833:8;25826:15;;25576:272;;;;;;:::o;25274:296::-;25345:8;25365:26;25441:6;25407:18;;25394:32;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25394:32:5;;25365:61;;25450:1;25441:10;;25436:101;25457:11;:18;25453:1;:22;25436:101;;;25512:11;25524:1;25512:14;;;;;;;;;;;;;;;;;;25496:10;25507:1;25496:13;;;;;;;;;;:30;;;;:13;;;;;;;;;;:30;25477:3;;25436:101;;20306:1975;20359:4;20582:16;;:::i;:::-;20625:15;20406:26;20382:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;20374:59;;;;;;20465:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20465:24:5;20451:10;:38;;:80;;-1:-1:-1;20507:13:5;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20507:24:5;20493:10;:38;20451:80;:120;;;-1:-1:-1;20549:13:5;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;20549:22:5;20535:10;:36;20451:120;20443:129;;;;;;;;20601:13;;;;:5;:13;;;;;;;;;20582:32;;;;;;;;;;;;;;;;;;;;;;;20601:13;;20582:32;;20601:13;;20582:32;;20601:13;20582:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;20582:32:5;;;-1:-1:-1;;20582:32:5;;;;-1:-1:-1;;;;;20582:32:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20656:14;20663:6;20656;:14::i;:::-;20655:15;:50;;;;;20693:4;:12;;;20674:4;:15;;;:31;;20655:50;20651:456;;;20786:4;20779:11;;;;20651:456;20812:14;20819:6;20812;:14::i;:::-;20811:15;:49;;;;;20848:4;:12;;;20830:15;:30;20811:49;:83;;;;;20882:4;:12;;;20864:4;:15;;;:30;20811:83;20807:300;;;20923:63;20940:4;:10;;;20952:33;20969:4;:15;;;20952:4;:12;;;:16;;:33;;;;:::i;:::-;20923:16;:63::i;:::-;20910:76;;20807:300;;;21030:66;21047:4;:10;;;21059:36;21079:4;:15;;;21059;:19;;:36;;;;:::i;21030:66::-;21017:79;;20807:300;21134:4;:19;;;21121:10;:32;21117:820;;;21224:19;;;;21209:35;;:10;;:35;:14;:35;:::i;:::-;21173:5;;21189:15;;;;;21173:32;;;;;-1:-1:-1;;;;;21173:32:5;;;;;;;;;:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;21173:32:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21173:32:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21173:32:5;:71;21169:758;;21272:5;;21291:15;;;;21329:19;;;;-1:-1:-1;;;;;21272:5:5;;;;:18;;21291:15;21308:4;;21314:35;;:10;;:35;:14;:35;:::i;:::-;21272:78;;;-1:-1:-1;;;21272:78:5;;;;;;-1:-1:-1;;;;;21272:78:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;21272:78:5;;;;5:2:-1;;;;30:1;27;20:12;5:2;21272:78:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21272:78:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21272:78:5;21264:87;;;;;;;;21400:69;21433:35;21448:4;:19;;;21433:10;:14;;:35;;;;:::i;:::-;21400:13;;;;:5;:13;;;;;;;;:28;;;:69;:32;:69;:::i;:::-;21369:13;;;;:5;:13;;;;;;;;:28;:100;21169:758;;;21528:13;;;;:5;:13;;;;;;;;:28;;;;21513:44;;21528:28;;21534:6;;21513:44;;21528:13;21513:44;21575:25;21593:6;21575:17;:25::i;:::-;21626:5;;21641:13;;;;21656:19;;;;21626:50;;;-1:-1:-1;;;;;21626:50:5;;-1:-1:-1;;;;;21626:50:5;;;;;;;;;;;;;;;:5;;;;;:14;;:50;;;;;;;;;;;;;;:5;;:50;;;5:2:-1;;;;30:1;27;20:12;5:2;21626:50:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21626:50:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21626:50:5;21618:59;;;;;;;;21695:13;;;;:5;:13;;;;;21722:15;21695:24;;;:42;21813:19;;;;21783:25;;;;;:50;;;:29;:50;:::i;:::-;21755:13;;;;:5;:13;;;;;;;:25;;;:78;;;;21851:28;;;;:32;-1:-1:-1;;;21901:11:5;;21169:758;21954:5;;21969:13;;;;21954:41;;;-1:-1:-1;;;;;21954:41:5;;-1:-1:-1;;;;;21954:41:5;;;;;;;;;;;;;;;:5;;;;;:14;;:41;;;;;;;;;;;;;;:5;;:41;;;5:2:-1;;;;30:1;27;20:12;5:2;21954:41:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21954:41:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21954:41:5;21946:50;;;;;;;;22037:13;;;;:5;:13;;;;;;;;:28;;:44;;22070:10;22037:44;:32;:44;:::i;:::-;22006:13;;;;:5;:13;;;;;;;;:28;;;:75;;;;22119:25;;;:41;;22149:10;22119:41;:29;:41;:::i;:::-;22091:13;;;;:5;:13;;;;;;:25;;;:69;;;;22197:15;22170:24;;;;:42;;;;22227:26;;22242:10;;22097:6;;22227:26;;22091:13;22227:26;-1:-1:-1;22270:4:5;;20306:1975;-1:-1:-1;;;20306:1975:5:o;22287:1383::-;22350:4;22366:15;22391:16;;:::i;:::-;23068:18;22410:13;;;:5;:13;;;;;;;;22391:32;;;;;;;;;;;;;;;;;;;;;;;22410:13;;22391:32;;22410:13;;22391:32;;;22410:13;22391:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;22391:32:5;;;-1:-1:-1;;22391:32:5;;;;-1:-1:-1;;;;;22391:32:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;22438:14;22445:6;22438;:14::i;:::-;22434:533;;;22487:24;22472:4;:11;;;:39;;;;;;;;;22468:89;;;22538:4;22531:11;;;;22468:89;22583:7;22570:20;;22434:533;;;22643:4;:12;;;22625:15;:30;22621:138;;;22740:4;22733:11;;;;22621:138;22776:12;;;;22812:6;;22776:33;;22793:15;22776:33;:16;:33;:::i;:::-;:42;22772:185;;;22851:12;;;;:33;;22868:15;22851:33;:16;:33;:::i;:::-;22838:46;;22772:185;;;22936:6;22923:19;;22772:185;23024:13;;;;:5;:13;;;;;;;;:28;;22998:10;;;;22981:40;;23010:10;22981:16;:40::i;:::-;:71;22977:666;;;23089:74;23134:5;:13;23140:6;23134:13;;;;;;;;;;;:28;;;23089:40;23106:4;:10;;;23118;23089:16;:40::i;:::-;:44;:74;:44;:74;:::i;:::-;23182:5;;23198:15;;;;;23182:32;;;;;-1:-1:-1;;;;;23182:32:5;;;;;;;;;23068:95;;-1:-1:-1;23068:95:5;;23182:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;23182:32:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23182:32:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23182:32:5;:49;23178:455;;23259:5;;23278:15;;;;;23259:56;;;;;-1:-1:-1;;;;;23259:56:5;;;;;;;23295:4;23259:56;;;;;;;;;;;;:5;;;:18;;:56;;;;;;;;;;;;;;;:5;;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;23259:56:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23259:56:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23259:56:5;23251:65;;;;;;;;23365:13;;;;:5;:13;;;;;;;;:28;;:47;;23398:13;23365:47;:32;:47;:::i;:::-;23334:13;;;;:5;:13;;;;;;;;:28;:78;23178:455;;;23471:13;;;;:5;:13;;;;;;;;:28;;;;23456:44;;23471:28;;23477:6;;23456:44;;23471:13;23456:44;23518:25;23536:6;23518:17;:25::i;:::-;23561:28;23582:6;23561:20;:28::i;:::-;;23614:4;23607:11;;;;23178:455;23659:4;23652:11;;22287:1383;;;;;;;:::o;24276:486::-;24415:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;24415:24:5;24401:10;:38;;:82;;-1:-1:-1;24451:32:5;24443:4;:40;;;;;;;;;24401:82;24393:91;;;;;;;;24506:32;24498:4;:40;;;;;;;;;24494:262;;;24554:2;;;;24561:13;;;:5;:13;;;;;;;;:24;;;;24554:2;24587:24;;;;24554:58;;;;;-1:-1:-1;;;;;24561:24:5;;;24554:58;;;;24587:24;;;24554:58;;;;;;:2;;;;;:6;;:58;;;;;;;;;;;;;:2;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;24554:58:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24554:58:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24494:262:5;;-1:-1:-1;24494:262:5;;24641:32;24633:4;:40;;;;;;;;;24629:127;;;24689:2;;;;24696:13;;;:5;:13;;;;;;;;:24;;;;24722:22;;;;;24689:56;;;;;-1:-1:-1;;;;;24696:24:5;;;24689:56;;;;24722:22;;;24689:56;;;;;;:2;;;;;:6;;:56;;;;;;;;;;;;;:2;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;24689:56:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24689:56:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;24629:127:5;24276:486;;:::o;24768:500::-;24855:24;24831:13;;;;:5;:13;;;;;:20;;;;;:48;;;;;;;;;24827:85;;;24895:7;;24827:85;24954:26;24930:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;24921:61;;;;;;25014:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25014:24:5;25000:10;:38;;:80;;-1:-1:-1;25056:13:5;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25056:24:5;25042:10;:38;25000:80;:120;;;-1:-1:-1;25098:13:5;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;25098:22:5;25084:10;:36;25000:120;24992:129;;;;;;;;25131:13;;;;:5;:13;;;;;;:20;;;:47;;-1:-1:-1;;25131:47:5;25154:24;25131:47;;;25212:15;25188:21;;;;:39;25242:19;25131:13;;25242:19;;;24768:500;:::o;23676:283::-;23737:4;23756:13;;;:5;:13;;;;;;;:28;;:33;23752:180;;23805:5;;;23820:13;;;:5;:13;;;;;;;;:24;;;;23846:28;;;23805:70;;-1:-1:-1;;;;;23805:70:5;;-1:-1:-1;;;;;23820:24:5;;;23805:70;;;;;;;;;;;;;:5;;;;;:14;;:70;;;;;;;;;;;;;:5;:70;;;5:2:-1;;;;30:1;27;20:12;5:2;23805:70:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23805:70:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;23920:1:5;23889:13;;;:5;23805:70;23889:13;;;;;;:28;:32;23752:180;-1:-1:-1;23948:4:5;23676:283;;;:::o;24079:191::-;24155:4;24171:9;24183:6;;;;;;;;;-1:-1:-1;;;;;24183:6:5;-1:-1:-1;;;;;24183:22:5;;:24;;;;;-1:-1:-1;;;24183:24:5;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;24183:24:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24183:24:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24183:24:5;;-1:-1:-1;24224:39:5;24258:4;24224:29;24245:7;24224:16;24183:24;24233:6;24224:16;:8;:16;:::i;:::-;:20;:29;:20;:29;:::i;:::-;:33;:39;:33;:39;:::i;:::-;24217:46;24079:191;-1:-1:-1;;;;24079:191:5:o;1512:171:18:-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;;;;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o;1060:116:17:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:17;;;1060:116::o;203:380::-;263:9;489:7;;485:36;;;-1:-1:-1;513:1:17;506:8;;485:36;-1:-1:-1;531:7:17;;;536:2;531;:7;551:6;;;;;;;;:12;544:20;;;665:283;725:7;941:2;936;:7;;;;;;;;;665:283;-1:-1:-1;;;665:283:17:o;254:26781:5:-;;;;;;;;;;;-1:-1:-1;254:26781:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;-1:-1:-1;254:26781:5;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:5;;;-1:-1:-1;254:26781:5;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:5;;;-1:-1:-1;254:26781:5;:::i;:::-;;;;;;;;;;;;;;;;-1:-1:-1;;;;;254:26781:5;;;;;;-1:-1:-1;;;;;254:26781:5;;;;;;-1:-1:-1;;;;;254:26781:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;254:26781:5;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;254:26781:5;;;;;;",
+  "bytecode": "0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153ce83398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a0396871690831617905560028054968616968216969096179095556003805493851693861693909317909255600480549390911692909316919091179091556008919091556009556152fc806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a723058204c821cd8ec0d34125017488e569263a04876edb010a9b34000b9b29c0ab3f66a0029",
+  "deployedBytecode": "0x6080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a723058204c821cd8ec0d34125017488e569263a04876edb010a9b34000b9b29c0ab3f66a0029",
+  "sourceMap": "254:26781:7:-;;;268:5:14;247:26;;-1:-1:-1;;;;;;247:26:14;;;2700:21:7;;;;2728:19;;;;2754:23;;3290:401;5:2:-1;;;;30:1;27;20:12;5:2;3290:401:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;;;3448:19:7;;-1:-1:-1;;;;;3448:19:7;;;;;;;;;3477:2;:26;;;;;;;;;;;;;;;3513:6;:27;;;;;;;;;;;;;;;3550:2;:38;;;;;;;;;;;;;;;;;3598:18;:40;;;;3648:16;:36;254:26781;;;;;;",
+  "deployedSourceMap": "254:26781:7:-;;;;;;;;;-1:-1:-1;;;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2955:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2955:34:7;;;;;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;26168:209;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26168:209:7;-1:-1:-1;;;;;26168:209:7;;;;;;;;;;;;;;;;;;;;;;;16399:344;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16399:344:7;-1:-1:-1;;;;;16399:344:7;;;;;19066:249;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19066:249:7;-1:-1:-1;;;;;19066:249:7;;;;;;;;;-1:-1:-1;;;;;19066:249:7;;;;;;;;;;;;;;20076:102;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20076:102:7;;;;;;;;;;;;;;;;;;;;17797:251;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17797:251:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10614:4087;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10614:4087:7;;;;;;;;;838:92:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;;;18559:501:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18559:501:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18054:499:7;;;;;;;;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;18054:499:7;;;;;;;;;;;;;;;;;;;;;;;247:26:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;19321:457:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19321:457:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19876:89;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19876:89:7;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;5842:878:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5842:878:7;;;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;26643:246:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26643:246:7;;;;;5405:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5405:431:7;;;;;14707:1291;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;14707:1291:7;;;;;16036:357;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16036:357:7;-1:-1:-1;;;;;16036:357:7;;;;;2912:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;-1:-1:-1;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2912:36:7;-1:-1:-1;;;;;;2912:36:7;6749:3046;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6749:3046:7;;;;;;;19971:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19971:99:7;;;;26895:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26895:138:7;;;;10462:146;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10462:146:7;;;;;9801:655;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;9801:655:7;;;;;;;;;16749:300;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16749:300:7;-1:-1:-1;;;;;16749:300:7;;;;;;;;;;26025:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26025:137:7;-1:-1:-1;;;;;26025:137:7;;;;;20184:98;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20184:98:7;;;;17071:719;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17071:719:7;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;19784:86;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19784:86:7;;;;3738:1661;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:7;;;;;;;;;-1:-1:-1;3738:1661:7;-1:-1:-1;3738:1661:7;;;;;-1:-1:-1;3738:1661:7;;-1:-1:-1;3738:1661:7;;;;;;;;;;;;;;-1:-1:-1;3738:1661:7;;-1:-1:-1;3738:1661:7;;-1:-1:-1;;;;;;;3738:1661:7;26383:254;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26383:254:7;;;;;25870:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;25870:149:7;-1:-1:-1;;;;;25870:149:7;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;26168:209::-;26240:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26274:10:7;-1:-1:-1;;;;;26264:37:7;;:39;;;;;-1:-1:-1;;;26264:39:7;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26264:39:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26264:39:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26264:39:7;:44;;26256:53;;;;;;-1:-1:-1;26319:6:7;:30;;-1:-1:-1;;;;;;26319:30:7;-1:-1:-1;;;;;26319:30:7;;;;;-1:-1:-1;731:1:16;26168:209:7;;;:::o;16399:344::-;16469:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16507:10:7;16493:25;;;;:13;:25;;;;;;;;-1:-1:-1;;;;;16493:34:7;;;;;;;;;;;;:42;;:34;:42;16485:51;;;;;;-1:-1:-1;;;;;16546:17:7;;;;;;:8;:17;;;;;;;;:30;;-1:-1:-1;;;;;;16546:30:7;16566:10;16546:30;;;;;;16586:20;;;:8;:20;;;;;:27;;-1:-1:-1;;16586:27:7;;;16546:30;16586:27;;;;16630:13;:25;;;;;:34;;;;;;;;;16623:41;;;;;;;;16679:36;16566:10;;16546:17;16679:36;;;-1:-1:-1;16732:4:7;16399:344;;;:::o;19066:249::-;-1:-1:-1;;;;;19153:17:7;;;19123:14;19153:17;;;:8;:17;;;;;;19123:14;;19153:17;:24;;:56;;-1:-1:-1;;;;;;19181:28:7;;;:17;;;;:8;:17;;;;;;;;;:28;19153:56;19149:160;;;-1:-1:-1;19234:7:7;19149:160;;;-1:-1:-1;;;;;;19281:17:7;;;;;;;:8;:17;;;;;;;;19066:249::o;20076:102::-;20153:18;;20076:102;;:::o;17797:251::-;17869:23;17902:11;17929:18;;:::i;:::-;17950:15;;;;:6;:15;;;;;;;17929:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17929:36:7;;;-1:-1:-1;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17992:5;:17;;;18019:5;:12;;;17975:66;;;;17797:251;;;;:::o;10614:4087::-;10705:20;11075:21;11729:36;;:::i;:::-;10759:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10759:24:7;10745:10;:38;;:78;;-1:-1:-1;10801:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10801:22:7;10787:10;:36;10745:78;:120;;;-1:-1:-1;10841:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10841:24:7;10827:10;:38;10745:120;10737:129;;;;;;;;10908:26;10884:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;10876:59;;;;;;10950:14;10957:6;10950;:14::i;:::-;10946:70;;;10988:16;;10980:25;;;;;;11043:14;;:21;;11062:1;11043:21;:18;:21;:::i;:::-;11026:14;:38;11125:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11125:24:7;11111:10;:38;11107:166;;;11179:19;11165:33;;11107:166;;;11243:19;11229:33;;11107:166;11310:88;;;;;;;;;11324:6;11310:88;;;;11332:11;11310:88;;;;;;;;;;;;;;;;;;;;;;;;11368:29;11310:88;;11292:14;;11283:24;;;;:8;:24;;;;;;;;:115;;;;;;;;;;;;;;;;-1:-1:-1;;11283:115:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;11434:14:7;;11413:36;;11434:14;;-1:-1:-1;11413:36:7;;;;;11479:19;11464:11;:34;;;;;;;;;11460:1719;;;11544:22;;;;:14;:22;;;;;11567:1;11544:25;;11519:51;;-1:-1:-1;;;;;;;;;;;11519:51:7;;;;11584:35;11593:22;;;:14;:22;;;;;;;;11616:1;11593:25;;;;;11584:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;11584:75:7;11629:30;11584:75;;;;;;11701:14;;11673:42;;;11777:25;;11768:35;;;;;;11729:74;;;;;;;;;;;;;;;;;;11768:35;11729:74;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;11837:13:7;;;;:5;:13;;;;;:22;;;11729:74;;-1:-1:-1;11822:37:7;;:71;;;;-1:-1:-1;11874:13:7;;;;:5;:13;;;;;:19;;;11863:30;;11822:71;11818:1135;;;11922:14;;11913:24;;;;:8;:24;;;;;11947:30;11913:31;;;:64;;-1:-1:-1;;11913:64:7;;;;;;11995:12;12000:6;11995:4;:12::i;:::-;-1:-1:-1;12025:13:7;;;;:5;:13;;;;;;;;:19;;:30;;;12073:14;:22;;;;;12096:1;12073:25;:29;12150:14;;12125:40;;-1:-1:-1;;;;;;;;;;;12125:40:7;;;;11818:1135;;;12216:29;12190:15;:22;;;:55;;;;;;;;;:98;;;;;12277:11;12249:15;:24;;;:39;;12190:98;:135;;;;;12317:8;12292:15;:21;;;:33;;12190:135;12186:767;;;12354:14;;12345:24;;;;:8;:24;;;;;;;;12379:30;12345:31;;;:64;;-1:-1:-1;;12345:64:7;;;;;;;;12436:22;;;:14;:22;;;;;;:25;;12427:35;;;;;;;;:42;;:75;;;;;;;;;;12550:22;;;;;;:25;;12525:51;;12550:25;;-1:-1:-1;;;;;;;;;;;12525:51:7;;12622:1;12594:22;;;:14;:22;;;;;:29;;;12664:1;12641:25;:29;12688:12;12594:22;12688:4;:12::i;:::-;-1:-1:-1;12740:21:7;;;;;12718:13;;;;:5;:13;;;;;:19;;;;:43;;;;12779:22;;:36;;;12863:14;;12838:40;;-1:-1:-1;;;;;;;;;;;12838:40:7;12718:13;12838:40;12186:767;;;12924:14;;12917:21;;;;12186:767;12967:35;12976:22;;;:14;:22;;;;;;;;12999:1;12976:25;;;12967:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;12967:75:7;13012:30;12967:75;;;13086:22;;;;;;;:25;;13061:51;;13086:25;;-1:-1:-1;;;;;;;;;;;13061:51:7;;13154:14;;13126:22;;;;:14;:22;;;;;13149:1;13126:25;:42;11460:1719;13208:19;13193:11;:34;;;;;;;;;13189:1389;;;13273:22;;;;:14;:22;;;;;:25;;13248:51;;-1:-1:-1;;;;;;;;;;;13248:51:7;;;;13313:35;13322:22;;;:14;:22;;;;;;;;:25;;13313:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;13313:75:7;13358:30;13313:75;;;;;;13430:14;;13402:42;;-1:-1:-1;13485:25:7;;;;13476:35;;;;;;13458:53;;;;;;;;;;;;;;;;;;13476:35;;13458:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;13545:13:7;;;;:5;:13;;;;;:22;;;13458:53;;-1:-1:-1;13530:37:7;;:71;;;;-1:-1:-1;13582:13:7;;;;:5;:13;;;;;:19;;;13571:30;;13530:71;13526:1042;;;13630:14;;13621:24;;;;:8;:24;;;;;13655:30;13621:31;;;:64;;-1:-1:-1;;13621:64:7;;;;;;13703:12;13708:6;13703:4;:12::i;:::-;-1:-1:-1;13733:13:7;;;;:5;:13;;;;;;;;:19;;:30;;;13781:14;:22;;;;;13733:13;13781:25;:29;13858:14;;13833:40;;-1:-1:-1;;;;;;;;;;;13833:40:7;;;;13526:1042;;;13924:29;13898:15;:22;;;:55;;;;;;;;;:98;;;;;13985:11;13957:15;:24;;;:39;;13898:98;:135;;;;;14025:8;14000:15;:21;;;:33;;13898:135;13894:674;;;14062:14;;14053:24;;;;:8;:24;;;;;14087:30;14053:31;;;:64;;-1:-1:-1;;14053:64:7;;14087:30;14053:64;;;;-1:-1:-1;14165:22:7;;;;:14;:22;;;;;14188:1;14165:25;;14140:51;;-1:-1:-1;;;;;;;;;;;14140:51:7;;;;14237:1;14209:22;;;:14;:22;;;;;:29;;;14279:1;14256:25;:29;14303:12;14209:22;14303:4;:12::i;:::-;-1:-1:-1;14333:13:7;;;;:5;:13;;;;;;:19;;;;:30;;;14406:24;;;;14381:22;;;;:49;;;;14478:14;14453:40;;14478:14;;-1:-1:-1;;;;;;;;;;;14453:40:7;;13894:674;14640:13;;;;:5;:13;;;;;:22;;;;14612:23;;;;;:51;;;:27;:51;:::i;:::-;14588:13;;;;:5;:13;;;;;:21;;:75;14680:14;;;-1:-1:-1;10614:4087:7;;;;;;;;:::o;838:92:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;-1:-1:-1;;;568:6:14;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;18559:501:7:-;18629:13;18824;;;:5;:13;;;;;;;;:22;;;;18856:19;;;;18885:21;;;;18916:20;;;;18946:28;;;;18984:25;;;;19019:24;;;;;18824:22;;18856:19;;18885:21;;18916:20;;;;;18946:28;;18559:501::o;18054:499::-;18151:18;18320:13;;;:5;:13;;;;;;;;18354:24;;;;18388;;;;18422:22;;;;18454:19;;;;18483;;;;18512:23;;;;18303:243;;;;;;;;;;;;;;;;;18122:19;;18151:18;;;;;;;;;;;18320:13;;-1:-1:-1;;;;;18354:24:7;;;;18388;;;;18422:22;;;;;18454:19;;18483;;18303:243;18320:13;;18303:243;;18320:13;18303:243;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;;;;;;;;:::o;247:26:14:-;;;-1:-1:-1;;;247:26:14;;;;;:::o;19321:457:7:-;19407:11;19555:25;;;:8;:25;;;;;:32;;19597:37;;;;19644:31;;;;19685:34;;;;19729:32;;;;;19555;;19597:37;;;;;19644:31;;19685:34;;19729:32;;;;19321:457::o;19876:89::-;19946:12;;19876:89;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;;;;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;-1:-1:-1;;;720:13:14;;;744:7;;;;720:6;744:7;666:90::o;5842:878:7:-;5924:16;;:::i;:::-;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;5943:13:7;;;;:6;:13;;;;;;;5924:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:7;;;-1:-1:-1;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:7;;;-1:-1:-1;;5924:32:7;;;;;;;;;;;;;;;;;;;-1:-1:-1;5991:19:7;5974:13;;:36;;;;;;;;;5966:45;;;;;;6048:24;6029:3;:15;;;:43;;;;;;;;;6021:52;;;;;;6092:12;;;;:30;-1:-1:-1;6092:30:7;6084:39;;;;;;6175:3;:17;;;6141:51;;;;;;;;:2;;;:30;;;;;;6160:10;6141:30;;;;;;;;-1:-1:-1;;;;;6141:2:7;;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;6141:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6141:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6141:30:7;:51;;;;;;;;;;6133:60;;;;;;6211:2;;6242:10;;;;-1:-1:-1;;;;;6211:2:7;;;;:8;;6220:10;;6232:21;;:9;:21::i;:::-;6211:43;;;;;-1:-1:-1;;;6211:43:7;;;;;;;-1:-1:-1;;;;;6211:43:7;-1:-1:-1;;;;;6211:43:7;;;;;;-1:-1:-1;;;;;6211:43:7;-1:-1:-1;;;;;6211:43:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6211:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6211:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6211:43:7;:52;;;:97;;-1:-1:-1;6267:2:7;;6276:10;;;;;6267:32;;-1:-1:-1;;;;;6267:32:7;;-1:-1:-1;;;;;6267:32:7;;;;;;;6288:10;6267:32;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;6267:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6267:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6267:32:7;:41;6211:97;6203:106;;;;;;;;6327:2;;;6336:13;;;6327:35;;;-1:-1:-1;;;;;6327:35:7;;-1:-1:-1;;;;;6327:35:7;;;;;;;6351:10;6327:35;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;6327:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6327:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6327:35:7;:44;6319:53;;;;;;6383:285;6407:19;6440:21;6450:3;:10;;;6440:9;:21::i;:::-;6475:14;6503:3;:9;;;6526:3;:12;;;6552:39;6613:1;6637;6629:10;;6653:3;:14;;;6383:10;:285::i;:::-;;6679:34;6688:5;6695:17;:15;:17::i;:::-;6679:8;:34::i;:::-;5842:878;;;:::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;26643:246:7:-;26717:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26756:16:7;;26741:31;;26733:40;;;;;;26788:32;;26807:12;;26788:32;;;;;-1:-1:-1;26830:16:7;:31;26878:4;;26643:246::o;5405:431::-;5490:12;;5456:4;;5479:23;;;5471:32;;;;;;5552:24;5521:15;;;;:6;:15;;;;;:27;;;;;;:55;;;;;;;;;5513:64;;;;;;5595:15;;;;:6;:15;;;;;:22;;;;-1:-1:-1;;;;;5595:22:7;5621:10;5595:36;5587:45;;;;;;5651:5;;;5678:15;;;:6;:15;;;;;;;;:25;;;5651:53;;-1:-1:-1;;;;;5651:53:7;;5666:10;5651:53;;;;;;;;;;;;;-1:-1:-1;;;;;5651:5:7;;;;:14;;:53;;;;;5678:15;5651:53;;;;;;;:5;:53;;;5:2:-1;;;;30:1;27;20:12;5:2;5651:53:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5651:53:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5651:53:7;5643:62;;;;;;;;5715:15;;;;:6;:15;;;;;;:56;;-1:-1:-1;;5715:56:7;;;;;5787:21;5715:15;;5787:21;;;-1:-1:-1;5825:4:7;5405:431;;;:::o;14707:1291::-;14774:4;14790:28;;:::i;:::-;14821:25;;;;:8;:25;;;;;;;;;14790:56;;;;;;;;;;;;;;;;14821:25;;14790:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;14884:14:7;;14878:21;;;;:5;:21;;;;;:32;;;14884:14;;-1:-1:-1;;;;;;14878:32:7;14864:10;:46;;:94;;-1:-1:-1;14934:14:7;;14928:21;;;;:5;:21;;;;;:30;;;-1:-1:-1;;;;;14928:30:7;14914:10;:44;14864:94;:144;;;-1:-1:-1;14982:14:7;;14976:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;14976:32:7;14962:10;:46;14864:144;14856:153;;;;;;;;15045:30;15027:7;:14;;;:48;;;;;;;;;;15019:57;;;;;;15114:19;15091:7;:19;;;:42;;;;;;;;;15087:437;;;15173:14;;15167:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15167:32:7;15153:10;:46;15149:254;;;15219:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15219:65:7;15254:30;15219:65;;;15149:254;;;15323:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15323:65:7;15358:30;15323:65;;;15149:254;15431:14;;15452:1;15416:30;;;:14;:30;;;;;;:37;;;15472:41;15497:15;;-1:-1:-1;;;;;;;;;;;15472:41:7;;15087:437;15561:19;15538:7;:19;;;:42;;;;;;;;;15534:437;;;15620:14;;15614:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15614:32:7;15600:10;:46;15596:254;;;15666:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15666:65:7;15701:30;15666:65;;;15596:254;;;15770:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15770:65:7;15805:30;15770:65;;;15596:254;15878:14;;15899:1;15863:30;;;:14;:30;;;;;15894:1;15863:33;:37;15919:41;;15944:15;;-1:-1:-1;;;;;;;;;;;15919:41:7;;;;15534:437;-1:-1:-1;15987:4:7;;14707:1291;-1:-1:-1;;14707:1291:7:o;16036:357::-;16107:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16156:10:7;16131:21;16156:10;16131:9;:21::i;:::-;-1:-1:-1;;;;;16131:35:7;;16123:44;;;;;;16194:10;16185:20;;;;:8;:20;;;;;;;;:29;16177:38;;;;;;16255:7;-1:-1:-1;;;;;16233:29:7;:18;16243:7;16233:9;:18::i;:::-;-1:-1:-1;;;;;16233:29:7;;16225:38;;;;;;-1:-1:-1;;;;;16273:22:7;;;;;;:13;:22;;;;;;;;16296:10;16273:34;;;;;;;;:41;;-1:-1:-1;;16273:41:7;16310:4;16273:41;;;16329:36;16296:10;;16329:36;;;-1:-1:-1;16382:4:7;16036:357;;;:::o;2912:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6749:3046::-;6824:16;;:::i;:::-;6867;;:::i;:::-;8259:6;416::14;;8259::7;;;;;;;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;6843:14:7;;;;:6;:14;;;;;;;6824:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:7;;;-1:-1:-1;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:7;;;-1:-1:-1;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6886:14:7;;;:6;:14;;;;;;;6867:33;;;;;;;;;;6824;;-1:-1:-1;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:7;;;-1:-1:-1;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:7;;;-1:-1:-1;;6867:33:7;;;;;;;;;;;;;;;;;;;-1:-1:-1;6938:24:7;6919:3;:15;;;:43;;;;;;;;;:90;;;;-1:-1:-1;6985:24:7;6966:3;:15;;;:43;;;;;;;;;6919:90;6911:99;;;;;;;;7029:16;;;;-1:-1:-1;;;;;7029:23:7;;;:68;;;7076:21;7086:3;:10;;;7076:9;:21::i;:::-;-1:-1:-1;;;;;7056:41:7;:3;:16;;;-1:-1:-1;;;;;7056:41:7;;7029:68;7028:144;;;;-1:-1:-1;7103:16:7;;;;-1:-1:-1;;;;;7103:23:7;;;:68;;;7150:21;7160:3;:10;;;7150:9;:21::i;:::-;-1:-1:-1;;;;;7130:41:7;:3;:16;;;-1:-1:-1;;;;;7130:41:7;;7103:68;7020:153;;;;;;;;7208:19;7191:13;;:36;;;;;;;;;7183:45;;;;;;7263:19;7246:13;;:36;;;;;;;;;7238:45;;;;;;7314:2;;;7323:13;;;7348:10;;;;-1:-1:-1;;;;;7314:2:7;;;;:8;;7323:13;7338:21;;:9;:21::i;:::-;7314:46;;;;;-1:-1:-1;;;7314:46:7;;;;;;;-1:-1:-1;;;;;7314:46:7;-1:-1:-1;;;;;7314:46:7;;;;;;-1:-1:-1;;;;;7314:46:7;-1:-1:-1;;;;;7314:46:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7314:46:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7314:46:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7314:46:7;:55;;;:115;;-1:-1:-1;7385:2:7;;;7394:13;;;7409:10;;;;;7385:35;;-1:-1:-1;;;;;7385:35:7;;-1:-1:-1;;;;;7385:35:7;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7385:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7385:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7385:35:7;:44;7314:115;:183;;;;-1:-1:-1;7445:2:7;;7454:10;;;;;7476;;;;-1:-1:-1;;;;;7445:2:7;;;;:8;;7454:10;7466:21;;:9;:21::i;:::-;7445:43;;;;;-1:-1:-1;;;7445:43:7;;;;;;;-1:-1:-1;;;;;7445:43:7;-1:-1:-1;;;;;7445:43:7;;;;;;-1:-1:-1;;;;;7445:43:7;-1:-1:-1;;;;;7445:43:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7445:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7445:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7445:43:7;:52;7314:183;:240;;;;-1:-1:-1;7513:2:7;;7522:10;;;;;7534;;;;7513:32;;-1:-1:-1;;;;;7513:32:7;;-1:-1:-1;;;;;7513:32:7;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7513:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7513:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7513:32:7;:41;7314:240;:300;;;;-1:-1:-1;7570:2:7;;;7579:13;;;7594:10;;;;;7570:35;;-1:-1:-1;;;;;7570:35:7;;-1:-1:-1;;;;;7570:35:7;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7570:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7570:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7570:35:7;:44;7314:300;:368;;;;-1:-1:-1;7630:2:7;;7649:10;;;;-1:-1:-1;;;;;7630:2:7;;;;:8;;7639:21;;:9;:21::i;:::-;7662:10;;;;;7630:43;;-1:-1:-1;;;7630:43:7;;;;;;-1:-1:-1;;;;;7630:43:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;7630:43:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;7630:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7630:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7630:43:7;:52;7314:368;:425;;;;-1:-1:-1;7698:2:7;;7707:10;;;;;7719;;;;7698:32;;-1:-1:-1;;;;;7698:32:7;;-1:-1:-1;;;;;7698:32:7;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7698:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7698:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7698:32:7;:41;7314:425;7293:447;;;;;;;;7771:9;;;;;7758;;;;:22;;7750:31;;;;;;7815:12;;;;;7799;;;;:28;;7791:37;;;;;;7911:3;:17;;;7877:51;;;;;;;;:2;;;7896:10;;;;;7877:30;;;;;-1:-1:-1;;;;;7877:30:7;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7877:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7877:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7877:30:7;:51;;;;;;;;;;7869:60;;;;;;7981:3;:17;;;7947:51;;;;;;;;:2;;;7966:10;;;;;7947:30;;;;;-1:-1:-1;;;;;7947:30:7;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7947:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7947:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7947:30:7;:51;;;;;;;;;;7939:60;;;;;;8036:16;;8014:3;:12;;;:19;:38;8010:112;;;8083:28;8098:3;:12;;;8083:14;:28::i;:::-;8068:12;;;:43;8010:112;8158:16;;8136:3;:12;;;:19;:38;8132:112;;;8205:28;8220:3;:12;;;8205:14;:28::i;:::-;8190:12;;;:43;8132:112;8268:1;8259:10;;8254:254;8275:3;:12;;;:19;8271:1;:23;8254:254;;;8462:12;;;;:15;;8475:1;;8462:15;;;;;;;;;;;;;;8461:16;:35;;;-1:-1:-1;8481:12:7;;;;:15;;8494:1;;8481:15;;;;;;;;;;;;;;8461:35;8453:44;;;;;;;;8296:3;;;;;8254:254;;;8546:18;;8522:3;:14;;;:21;:42;8518:122;;;8597:32;8614:3;:14;;;8597:16;:32::i;:::-;8580:14;;;:49;8518:122;8678:18;;8654:3;:14;;;:21;:42;8650:122;;;8729:32;8746:3;:14;;;8729:16;:32::i;:::-;8712:14;;;:49;8650:122;8791:1;8787:5;;8782:116;8798:3;:14;;;:21;8794:1;:25;8782:116;;;8869:14;;;;:17;;8884:1;;8869:17;;;;;;;;;;;;;;8848:38;;:3;:14;;;8863:1;8848:17;;;;;;;;;;;;;;;;;;;:38;;;;8840:47;;;;;;8821:3;;;;;8782:116;;;8921:10;;:17;;8936:1;8921:17;:14;:17;:::i;:::-;8908:10;:30;8975:10;;;;8965:21;;:9;:21::i;:::-;8996:14;;;;:6;:14;;;;;;:55;;;-1:-1:-1;;8996:55:7;;;;;;;9061:14;;;;;;:55;;;;;;;;9150:10;;9126:21;;;;:34;;;9170:21;;:34;9220:20;8948:38;;-1:-1:-1;8996:14:7;;9220:20;;8996:14;9220:20;9255;;9268:6;;9255:20;;;;;9419:12;;;;9303:15;;-1:-1:-1;9343:1:7;;-1:-1:-1;9419:17:7;9415:85;;9476:12;;;;9462:27;;:9;;:27;:13;:27;:::i;:::-;9452:37;;9415:85;9531:3;:13;;;9509:35;;9574:177;;;;;;;;;9579:3;:14;;;9574:177;;;;9595:3;:10;;;-1:-1:-1;;;;;9574:177:7;;;;;9607:3;:10;;;-1:-1:-1;;;;;9574:177:7;;;;;9619:6;-1:-1:-1;;;;;9574:177:7;;;;;9627:6;9574:177;;;;9635:6;9574:177;;;;9643:3;:12;;;9574:177;;;;9657:3;:9;;;9574:177;;;;9668:9;9574:177;;;;9679:7;9574:177;;;;9688:26;9574:177;;;;;;;;;;;;9716:14;9574:177;;;;9732:1;9574:177;;;;9735:15;9574:177;;;9554:5;:17;9560:10;;9554:17;;;;;;;;;;;:197;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;9554:197:7;;;;;;;;;;-1:-1:-1;;;;;;9554:197:7;;;-1:-1:-1;;;;;9554:197:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;9554:197:7;;;;;;;;;;;;;;;;;;-1:-1:-1;9554:197:7;;;;;;;;;;;;;;;;;;;;;;;;;;9777:10;;9766:22;;;;-1:-1:-1;;9766:22:7;6749:3046;;;;;;;;;:::o;19971:99::-;20049:14;;19971:99;:::o;26895:138::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26944:5:7;;;26959;;26966:30;;;;;;26990:4;26966:30;;;;;;-1:-1:-1;;;;;26944:5:7;;;;:14;;26959:5;;;26944;;26966:15;;:30;;;;;;;;;;;;;;;;26944:5;26966:30;;;5:2:-1;;;;30:1;27;20:12;5:2;26966:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26966:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26966:30:7;26944:53;;;-1:-1:-1;;;26944:53:7;;;;;;-1:-1:-1;;;;;26944:53:7;;;;;;;;;;;;;;;;;;;;26966:30;;26944:53;;;;;;;-1:-1:-1;26944:53:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;26944:53:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26944:53:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;27020:5:7;;-1:-1:-1;;;;;27020:5:7;27007:19;10462:146;10505:4;10520:20;10533:6;10520:12;:20::i;:::-;;10550:30;10573:6;10550:22;:30::i;9801:655::-;9878:4;9926:26;9902:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;9893:61;;;;;;9986:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;9986:24:7;9972:10;:38;;:80;;-1:-1:-1;10028:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10028:24:7;10014:10;:38;9972:80;:120;;;-1:-1:-1;10070:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10070:22:7;10056:10;:36;9972:120;9964:129;;;;;;;;10155:13;;;;:5;:13;;;;;:22;;;;10127:23;;;;;:51;;;:27;:51;:::i;:::-;10108:15;:70;10104:177;;10231:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10231:24:7;10259:10;10231:38;10223:47;;;;;;10290:35;10305:6;10313:11;10290:14;:35::i;:::-;10335:20;10348:6;10335:12;:20::i;:::-;;10365:25;10383:6;10365:17;:25::i;:::-;10400:28;10421:6;10400:20;:28::i;:::-;;10445:4;10438:11;;9801:655;;;;;:::o;16749:300::-;16835:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16881:7:7;-1:-1:-1;;;;;16859:29:7;:18;16869:7;16859:9;:18::i;:::-;-1:-1:-1;;;;;16859:29:7;;:81;;;;-1:-1:-1;16893:10:7;-1:-1:-1;;;;;16893:21:7;;;;:46;;-1:-1:-1;16918:10:7;-1:-1:-1;;;;;16918:21:7;;;16893:46;16851:90;;;;;;;;-1:-1:-1;;;;;16958:17:7;;;;;;;:8;:17;;;;;;16951:24;;-1:-1:-1;;;;;;16951:24:7;;;16990:31;;;;;;;16958:17;16990:31;-1:-1:-1;17038:4:7;16749:300;;;;:::o;26025:137::-;26096:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;26112:2:7;:22;;-1:-1:-1;;;;;26112:22:7;;-1:-1:-1;;;;;;26112:22:7;;;;;;;26025:137;;;:::o;20184:98::-;20259:16;;20184:98;:::o;17071:719::-;17141:19;17170:14;17194:20;17224:13;17247:10;17267:15;17292:43;17345:17;17372:11;17393:19;17422:14;17452:18;;:::i;:::-;17473:15;;;;:6;:15;;;;;;;17452:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17452:36:7;;;-1:-1:-1;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17515:5;:15;;;17540:5;:12;;;17562:5;:18;;;17590:5;:14;;;17614:5;:11;;;17635:5;:14;;;17659:5;:19;;;17688:5;:15;;;17713:5;:9;;;17732:5;:16;;;17758:5;:15;;;17498:285;;;;;;;;;;;;;;;;;;;;;;;;;;;;17071:719;;;;;;;;;;;;;;:::o;19784:86::-;19853:10;;19784:86;:::o;3738:1661::-;4063:4;416:6:14;;4063:4:7;;;;;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;4105:39:7;4087:14;:57;;;;;;;;;;4079:66;;;;;;4183:16;;4163;;:36;;4155:45;;;;;;4240:18;;4218;;:40;;4210:49;;;;;;4284:1;4275:10;;4270:117;4291:11;:18;4287:1;:22;4270:117;;;2603:7;4338:11;4350:1;4338:14;;;;;;;;;;;;;;;;;;;:37;;;4330:46;;;;;;4311:3;;;;;4270:117;;;4414:1;;-1:-1:-1;4444:19:7;4430:10;:33;;;;;;;;;4426:463;;;4483:14;;4479:291;;;4529:33;4546:6;4554:7;4529:16;:33::i;:::-;4517:45;;4479:291;;;4599:6;4587:9;:18;4583:187;;;4637:35;4654:6;4662:9;4637:16;:35::i;4583:187::-;4723:32;4740:6;4748;4723:16;:32::i;:::-;4711:44;;4583:187;4830:5;;:47;;;;;;4849:10;4830:47;;;;4861:4;4830:47;;;;;;;;;;;;-1:-1:-1;;;;;4830:5:7;;;;:18;;:47;;;;;;;;;;;;;;;:5;;:47;;;5:2:-1;;;;30:1;27;20:12;5:2;4830:47:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4830:47:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4830:47:7;4822:56;;;;;;;;4914:12;;:19;;4931:1;4914:19;:16;:19;:::i;:::-;4899:12;:34;;;5002:330;;;;;;;;;4899:34;;-1:-1:-1;5002:330:7;5021:10;5002:330;;;;;;;;;;;;5045:24;5002:330;;;;5083:10;-1:-1:-1;;;;;5002:330:7;;;;;5107:16;-1:-1:-1;;;;;5002:330:7;;;;;5137:9;5002:330;;;;5160:6;5002:330;;;;5180:9;5002:330;;;;5203:14;5002:330;;;;;;;;;;-1:-1:-1;;;;;5002:330:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5002:330:7;;;;;;;4984:15;;;:6;:15;;;;;:348;;;;:15;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;-1:-1:-1;;4984:348:7;;-1:-1:-1;;;;;4984:348:7;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;-1:-1:-1;;;;;;4984:348:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:7;;;;;;;;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;;;;;-1:-1:-1;;4984:348:7;-1:-1:-1;;;;;4984:348:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:7;;;;;;;;;;;;;;;;;;5348:20;;5360:7;;5348:20;;-1:-1:-1;;5348:20:7;5385:7;3738:1661;-1:-1:-1;;;;;;;;;;;;3738:1661:7:o;26383:254::-;26459:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26498:18:7;;26483:33;;26475:42;;;;;;26532:34;;26553:12;;26532:34;;;;;-1:-1:-1;26576:18:7;:33;26626:4;;26383:254::o;25870:149::-;25947:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;25963:2:7;:28;;-1:-1:-1;;;;;25963:28:7;;-1:-1:-1;;;;;;25963:28:7;;;;;;;25870:149;;;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;23965:108:7:-;24017:4;24039:13;;;:5;:13;;;;;:22;;;:27;;23965:108::o;1238:128:15:-;1319:7;;;1339;;;;1332:15;;;25576:272:7;25641:6;25659:22;25727:6;25695:16;;25684:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25684:28:7;;25659:53;;25736:1;25727:10;;25722:95;25743:9;:16;25739:1;:20;25722:95;;;25794:9;25804:1;25794:12;;;;;;;;;;;;;;;;;;25780:8;25789:1;25780:11;;;;;;;;;;:26;;;:11;;;;;;;;;;:26;25761:3;;25722:95;;;25833:8;25826:15;;25576:272;;;;;;:::o;25274:296::-;25345:8;25365:26;25441:6;25407:18;;25394:32;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25394:32:7;;25365:61;;25450:1;25441:10;;25436:101;25457:11;:18;25453:1;:22;25436:101;;;25512:11;25524:1;25512:14;;;;;;;;;;;;;;;;;;25496:10;25507:1;25496:13;;;;;;;;;;:30;;;;:13;;;;;;;;;;:30;25477:3;;25436:101;;20306:1975;20359:4;20582:16;;:::i;:::-;20625:15;20406:26;20382:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;20374:59;;;;;;20465:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20465:24:7;20451:10;:38;;:80;;-1:-1:-1;20507:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20507:24:7;20493:10;:38;20451:80;:120;;;-1:-1:-1;20549:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;20549:22:7;20535:10;:36;20451:120;20443:129;;;;;;;;20601:13;;;;:5;:13;;;;;;;;;20582:32;;;;;;;;;;;;;;;;;;;;;;;20601:13;;20582:32;;20601:13;;20582:32;;20601:13;20582:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;20582:32:7;;;-1:-1:-1;;20582:32:7;;;;-1:-1:-1;;;;;20582:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20656:14;20663:6;20656;:14::i;:::-;20655:15;:50;;;;;20693:4;:12;;;20674:4;:15;;;:31;;20655:50;20651:456;;;20786:4;20779:11;;;;20651:456;20812:14;20819:6;20812;:14::i;:::-;20811:15;:49;;;;;20848:4;:12;;;20830:15;:30;20811:49;:83;;;;;20882:4;:12;;;20864:4;:15;;;:30;20811:83;20807:300;;;20923:63;20940:4;:10;;;20952:33;20969:4;:15;;;20952:4;:12;;;:16;;:33;;;;:::i;:::-;20923:16;:63::i;:::-;20910:76;;20807:300;;;21030:66;21047:4;:10;;;21059:36;21079:4;:15;;;21059;:19;;:36;;;;:::i;21030:66::-;21017:79;;20807:300;21134:4;:19;;;21121:10;:32;21117:820;;;21224:19;;;;21209:35;;:10;;:35;:14;:35;:::i;:::-;21173:5;;21189:15;;;;;21173:32;;;;;-1:-1:-1;;;;;21173:32:7;;;;;;;;;:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;21173:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21173:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21173:32:7;:71;21169:758;;21272:5;;21291:15;;;;21329:19;;;;-1:-1:-1;;;;;21272:5:7;;;;:18;;21291:15;21308:4;;21314:35;;:10;;:35;:14;:35;:::i;:::-;21272:78;;;-1:-1:-1;;;21272:78:7;;;;;;-1:-1:-1;;;;;21272:78:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;21272:78:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;21272:78:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21272:78:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21272:78:7;21264:87;;;;;;;;21400:69;21433:35;21448:4;:19;;;21433:10;:14;;:35;;;;:::i;:::-;21400:13;;;;:5;:13;;;;;;;;:28;;;:69;:32;:69;:::i;:::-;21369:13;;;;:5;:13;;;;;;;;:28;:100;21169:758;;;21528:13;;;;:5;:13;;;;;;;;:28;;;;21513:44;;21528:28;;21534:6;;21513:44;;21528:13;21513:44;21575:25;21593:6;21575:17;:25::i;:::-;21626:5;;21641:13;;;;21656:19;;;;21626:50;;;-1:-1:-1;;;;;21626:50:7;;-1:-1:-1;;;;;21626:50:7;;;;;;;;;;;;;;;:5;;;;;:14;;:50;;;;;;;;;;;;;;:5;;:50;;;5:2:-1;;;;30:1;27;20:12;5:2;21626:50:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21626:50:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21626:50:7;21618:59;;;;;;;;21695:13;;;;:5;:13;;;;;21722:15;21695:24;;;:42;21813:19;;;;21783:25;;;;;:50;;;:29;:50;:::i;:::-;21755:13;;;;:5;:13;;;;;;;:25;;;:78;;;;21851:28;;;;:32;-1:-1:-1;;;21901:11:7;;21169:758;21954:5;;21969:13;;;;21954:41;;;-1:-1:-1;;;;;21954:41:7;;-1:-1:-1;;;;;21954:41:7;;;;;;;;;;;;;;;:5;;;;;:14;;:41;;;;;;;;;;;;;;:5;;:41;;;5:2:-1;;;;30:1;27;20:12;5:2;21954:41:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21954:41:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21954:41:7;21946:50;;;;;;;;22037:13;;;;:5;:13;;;;;;;;:28;;:44;;22070:10;22037:44;:32;:44;:::i;:::-;22006:13;;;;:5;:13;;;;;;;;:28;;;:75;;;;22119:25;;;:41;;22149:10;22119:41;:29;:41;:::i;:::-;22091:13;;;;:5;:13;;;;;;:25;;;:69;;;;22197:15;22170:24;;;;:42;;;;22227:26;;22242:10;;22097:6;;22227:26;;22091:13;22227:26;-1:-1:-1;22270:4:7;;20306:1975;-1:-1:-1;;;20306:1975:7:o;22287:1383::-;22350:4;22366:15;22391:16;;:::i;:::-;23068:18;22410:13;;;:5;:13;;;;;;;;22391:32;;;;;;;;;;;;;;;;;;;;;;;22410:13;;22391:32;;22410:13;;22391:32;;;22410:13;22391:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;22391:32:7;;;-1:-1:-1;;22391:32:7;;;;-1:-1:-1;;;;;22391:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;22438:14;22445:6;22438;:14::i;:::-;22434:533;;;22487:24;22472:4;:11;;;:39;;;;;;;;;22468:89;;;22538:4;22531:11;;;;22468:89;22583:7;22570:20;;22434:533;;;22643:4;:12;;;22625:15;:30;22621:138;;;22740:4;22733:11;;;;22621:138;22776:12;;;;22812:6;;22776:33;;22793:15;22776:33;:16;:33;:::i;:::-;:42;22772:185;;;22851:12;;;;:33;;22868:15;22851:33;:16;:33;:::i;:::-;22838:46;;22772:185;;;22936:6;22923:19;;22772:185;23024:13;;;;:5;:13;;;;;;;;:28;;22998:10;;;;22981:40;;23010:10;22981:16;:40::i;:::-;:71;22977:666;;;23089:74;23134:5;:13;23140:6;23134:13;;;;;;;;;;;:28;;;23089:40;23106:4;:10;;;23118;23089:16;:40::i;:::-;:44;:74;:44;:74;:::i;:::-;23182:5;;23198:15;;;;;23182:32;;;;;-1:-1:-1;;;;;23182:32:7;;;;;;;;;23068:95;;-1:-1:-1;23068:95:7;;23182:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;23182:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23182:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23182:32:7;:49;23178:455;;23259:5;;23278:15;;;;;23259:56;;;;;-1:-1:-1;;;;;23259:56:7;;;;;;;23295:4;23259:56;;;;;;;;;;;;:5;;;:18;;:56;;;;;;;;;;;;;;;:5;;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;23259:56:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23259:56:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23259:56:7;23251:65;;;;;;;;23365:13;;;;:5;:13;;;;;;;;:28;;:47;;23398:13;23365:47;:32;:47;:::i;:::-;23334:13;;;;:5;:13;;;;;;;;:28;:78;23178:455;;;23471:13;;;;:5;:13;;;;;;;;:28;;;;23456:44;;23471:28;;23477:6;;23456:44;;23471:13;23456:44;23518:25;23536:6;23518:17;:25::i;:::-;23561:28;23582:6;23561:20;:28::i;:::-;;23614:4;23607:11;;;;23178:455;23659:4;23652:11;;22287:1383;;;;;;;:::o;24276:486::-;24415:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;24415:24:7;24401:10;:38;;:82;;-1:-1:-1;24451:32:7;24443:4;:40;;;;;;;;;24401:82;24393:91;;;;;;;;24506:32;24498:4;:40;;;;;;;;;24494:262;;;24554:2;;;;24561:13;;;:5;:13;;;;;;;;:24;;;;24554:2;24587:24;;;;24554:58;;;;;-1:-1:-1;;;;;24561:24:7;;;24554:58;;;;24587:24;;;24554:58;;;;;;:2;;;;;:6;;:58;;;;;;;;;;;;;:2;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;24554:58:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24554:58:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24494:262:7;;-1:-1:-1;24494:262:7;;24641:32;24633:4;:40;;;;;;;;;24629:127;;;24689:2;;;;24696:13;;;:5;:13;;;;;;;;:24;;;;24722:22;;;;;24689:56;;;;;-1:-1:-1;;;;;24696:24:7;;;24689:56;;;;24722:22;;;24689:56;;;;;;:2;;;;;:6;;:56;;;;;;;;;;;;;:2;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;24689:56:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24689:56:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;24629:127:7;24276:486;;:::o;24768:500::-;24855:24;24831:13;;;;:5;:13;;;;;:20;;;;;:48;;;;;;;;;24827:85;;;24895:7;;24827:85;24954:26;24930:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;24921:61;;;;;;25014:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25014:24:7;25000:10;:38;;:80;;-1:-1:-1;25056:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25056:24:7;25042:10;:38;25000:80;:120;;;-1:-1:-1;25098:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;25098:22:7;25084:10;:36;25000:120;24992:129;;;;;;;;25131:13;;;;:5;:13;;;;;;:20;;;:47;;-1:-1:-1;;25131:47:7;25154:24;25131:47;;;25212:15;25188:21;;;;:39;25242:19;25131:13;;25242:19;;;24768:500;:::o;23676:283::-;23737:4;23756:13;;;:5;:13;;;;;;;:28;;:33;23752:180;;23805:5;;;23820:13;;;:5;:13;;;;;;;;:24;;;;23846:28;;;23805:70;;-1:-1:-1;;;;;23805:70:7;;-1:-1:-1;;;;;23820:24:7;;;23805:70;;;;;;;;;;;;;:5;;;;;:14;;:70;;;;;;;;;;;;;:5;:70;;;5:2:-1;;;;30:1;27;20:12;5:2;23805:70:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23805:70:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;23920:1:7;23889:13;;;:5;23805:70;23889:13;;;;;;:28;:32;23752:180;-1:-1:-1;23948:4:7;23676:283;;;:::o;24079:191::-;24155:4;24171:9;24183:6;;;;;;;;;-1:-1:-1;;;;;24183:6:7;-1:-1:-1;;;;;24183:22:7;;:24;;;;;-1:-1:-1;;;24183:24:7;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;24183:24:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24183:24:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24183:24:7;;-1:-1:-1;24224:39:7;24258:4;24224:29;24245:7;24224:16;24183:24;24233:6;24224:16;:8;:16;:::i;:::-;:20;:29;:20;:29;:::i;:::-;:33;:39;:33;:39;:::i;:::-;24217:46;24079:191;-1:-1:-1;;;;24079:191:7:o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;;;;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;203:380::-;263:9;489:7;;485:36;;;-1:-1:-1;513:1:15;506:8;;485:36;-1:-1:-1;531:7:15;;;536:2;531;:7;551:6;;;;;;;;:12;544:20;;;665:283;725:7;941:2;936;:7;;;;;;;;;665:283;-1:-1:-1;;;665:283:15:o;254:26781:7:-;;;;;;;;;;;-1:-1:-1;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;-1:-1:-1;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:7;;;-1:-1:-1;254:26781:7;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:7;;;-1:-1:-1;254:26781:7;:::i;:::-;;;;;;;;;;;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;254:26781:7;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;254:26781:7;;;;;;",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"zeppelin-solidity/contracts/lifecycle/Pausable.sol\";\nimport \"./SNM.sol\";\nimport \"./Blacklist.sol\";\nimport \"./OracleUSD.sol\";\nimport \"./ProfileRegistry.sol\";\n\n\ncontract Market is Ownable, Pausable {\n\n    using SafeMath for uint256;\n\n    // DECLARATIONS\n\n    enum DealStatus{\n        STATUS_UNKNOWN,\n        STATUS_ACCEPTED,\n        STATUS_CLOSED\n    }\n\n    enum OrderType {\n        ORDER_UNKNOWN,\n        ORDER_BID,\n        ORDER_ASK\n    }\n\n    enum OrderStatus {\n        UNKNOWN,\n        ORDER_INACTIVE,\n        ORDER_ACTIVE\n    }\n\n    enum RequestStatus {\n        REQUEST_UNKNOWN,\n        REQUEST_CREATED,\n        REQUEST_CANCELED,\n        REQUEST_REJECTED,\n        REQUEST_ACCEPTED\n    }\n\n    enum BlacklistPerson {\n        BLACKLIST_NOBODY,\n        BLACKLIST_WORKER,\n        BLACKLIST_MASTER\n    }\n\n    struct Deal {\n        uint64[] benchmarks;\n        address supplierID;\n        address consumerID;\n        address masterID;\n        uint askID;\n        uint bidID;\n        uint duration;\n        uint price; //usd * 10^-18\n        uint startTime;\n        uint endTime;\n        DealStatus status;\n        uint blockedBalance;\n        uint totalPayout;\n        uint lastBillTS;\n    }\n\n    struct Order {\n        OrderType orderType;\n        OrderStatus orderStatus;\n        address author;\n        address counterparty;\n        uint duration;\n        uint256 price;\n        bool[] netflags;\n        ProfileRegistry.IdentityLevel identityLevel;\n        address blacklist;\n        bytes32 tag;\n        uint64[] benchmarks;\n        uint frozenSum;\n        uint dealID;\n    }\n\n    struct ChangeRequest {\n        uint dealID;\n        OrderType requestType;\n        uint price;\n        uint duration;\n        RequestStatus status;\n    }\n\n    // EVENTS\n\n    event OrderPlaced(uint indexed orderID);\n    event OrderUpdated(uint indexed orderID);\n\n    event DealOpened(uint indexed dealID);\n    event DealUpdated(uint indexed dealID);\n\n    event Billed(uint indexed dealID, uint indexed paidAmount);\n\n    event DealChangeRequestSet(uint indexed changeRequestID);\n    event DealChangeRequestUpdated(uint indexed changeRequestID);\n\n    event WorkerAnnounced(address indexed worker, address indexed master);\n    event WorkerConfirmed(address indexed worker, address indexed master);\n    event WorkerRemoved(address indexed worker, address indexed master);\n\n    event NumBenchmarksUpdated(uint indexed newNum);\n    event NumNetflagsUpdated(uint indexed newNum);\n\n    // VARS\n\n    uint constant MAX_BENCHMARKS_VALUE = 2 ** 63;\n\n    SNM token;\n\n    Blacklist bl;\n\n    OracleUSD oracle;\n\n    ProfileRegistry pr;\n\n    uint ordersAmount = 0;\n\n    uint dealAmount = 0;\n\n    uint requestsAmount = 0;\n\n    // current length of benchmarks\n    uint benchmarksQuantity;\n\n    // current length of netflags\n    uint netflagsQuantity;\n\n    mapping(uint => Order) public orders;\n\n    mapping(uint => Deal) public deals;\n\n    mapping(address => uint[]) dealsID;\n\n    mapping(uint => ChangeRequest) requests;\n\n    mapping(uint => uint[2]) actualRequests;\n\n    mapping(address => address) masterOf;\n\n    mapping(address => bool) isMaster;\n\n    mapping(address => mapping(address => bool)) masterRequest;\n\n    // INIT\n\n    constructor(address _token, address _blacklist, address _oracle, address _profileRegistry, uint _benchmarksQuantity, uint _netflagsQuantity) public {\n        token = SNM(_token);\n        bl = Blacklist(_blacklist);\n        oracle = OracleUSD(_oracle);\n        pr = ProfileRegistry(_profileRegistry);\n        benchmarksQuantity = _benchmarksQuantity;\n        netflagsQuantity = _netflagsQuantity;\n    }\n\n    // EXTERNAL\n\n    // Order functions\n\n    function PlaceOrder(\n        OrderType _orderType,\n        address _id_counterparty,\n        uint _duration,\n        uint _price,\n        bool[] _netflags,\n        ProfileRegistry.IdentityLevel _identityLevel,\n        address _blacklist,\n        bytes32 _tag,\n        uint64[] _benchmarks\n    ) whenNotPaused public returns (uint){\n\n        require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);\n        require(_netflags.length <= netflagsQuantity);\n        require(_benchmarks.length <= benchmarksQuantity);\n\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            require(_benchmarks[i] < MAX_BENCHMARKS_VALUE);\n        }\n\n        uint lockedSum = 0;\n\n        if (_orderType == OrderType.ORDER_BID) {\n            if (_duration == 0) {\n                lockedSum = CalculatePayment(_price, 1 hours);\n            } else if (_duration < 1 days) {\n                lockedSum = CalculatePayment(_price, _duration);\n            } else {\n                lockedSum = CalculatePayment(_price, 1 days);\n            }\n            // this line contains err.\n            require(token.transferFrom(msg.sender, this, lockedSum));\n        }\n\n        ordersAmount = ordersAmount.add(1);\n        uint256 orderId = ordersAmount;\n\n        orders[orderId] = Order(\n            _orderType,\n            OrderStatus.ORDER_ACTIVE,\n            msg.sender,\n            _id_counterparty,\n            _duration,\n            _price,\n            _netflags,\n            _identityLevel,\n            _blacklist,\n            _tag,\n            _benchmarks,\n            lockedSum,\n            0\n        );\n\n        emit OrderPlaced(orderId);\n        return orderId;\n    }\n\n    function CancelOrder(uint orderID) public returns (bool){\n        require(orderID <= ordersAmount);\n        require(orders[orderID].orderStatus == OrderStatus.ORDER_ACTIVE);\n        require(orders[orderID].author == msg.sender);\n\n        require(token.transfer(msg.sender, orders[orderID].frozenSum));\n        orders[orderID].orderStatus = OrderStatus.ORDER_INACTIVE;\n\n        emit OrderUpdated(orderID);\n        return true;\n    }\n\n    function QuickBuy(uint askID, uint buyoutDuration) public whenNotPaused {\n        Order memory ask = orders[askID];\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE);\n\n        require(ask.duration >= buyoutDuration);\n        require(pr.GetProfileLevel(msg.sender) >= ask.identityLevel);\n        require(bl.Check(msg.sender, GetMaster(ask.author)) == false && bl.Check(ask.author, msg.sender) == false);\n        require(bl.Check(ask.blacklist, msg.sender) == false);\n\n        PlaceOrder(\n            OrderType.ORDER_BID,\n            GetMaster(ask.author),\n            buyoutDuration,\n            ask.price,\n            ask.netflags,\n            ProfileRegistry.IdentityLevel.ANONYMOUS,\n            address(0),\n            bytes32(0),\n            ask.benchmarks);\n\n        OpenDeal(askID, GetOrdersAmount());\n    }\n\n    // Deal functions\n\n    function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {\n        Order memory ask = orders[_askID];\n        Order memory bid = orders[_bidID];\n\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);\n        require((ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author)) && (bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author)));\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(bid.orderType == OrderType.ORDER_BID);\n        require(\n            bl.Check(bid.blacklist, GetMaster(ask.author)) == false\n            && bl.Check(bid.blacklist, ask.author) == false\n            && bl.Check(bid.author, GetMaster(ask.author)) == false\n            && bl.Check(bid.author, ask.author) == false\n            && bl.Check(ask.blacklist, bid.author) == false\n            && bl.Check(GetMaster(ask.author), bid.author) == false\n            && bl.Check(ask.author, bid.author) == false);\n        require(ask.price <= bid.price);\n        require(ask.duration >= bid.duration);\n        // profile level check\n        require(pr.GetProfileLevel(bid.author) >= ask.identityLevel);\n        require(pr.GetProfileLevel(ask.author) >= bid.identityLevel);\n\n        if (ask.netflags.length < netflagsQuantity) {\n            ask.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        if (bid.netflags.length < netflagsQuantity) {\n            bid.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        for (uint i = 0; i < ask.netflags.length; i++) {\n            // implementation: when bid contains requirement, ask necessary needs to have this\n            // if ask have this one - pass\n            require(!bid.netflags[i] || ask.netflags[i]);\n        }\n\n        if (ask.benchmarks.length < benchmarksQuantity) {\n            ask.benchmarks = ResizeBenchmarks(ask.benchmarks);\n        }\n\n        if (bid.benchmarks.length < benchmarksQuantity) {\n            bid.benchmarks = ResizeBenchmarks(bid.benchmarks);\n        }\n\n        for (i = 0; i < ask.benchmarks.length; i++) {\n            require(ask.benchmarks[i] >= bid.benchmarks[i]);\n        }\n\n        dealAmount = dealAmount.add(1);\n        address master = GetMaster(ask.author);\n        orders[_askID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_bidID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_askID].dealID = dealAmount;\n        orders[_bidID].dealID = dealAmount;\n\n        emit OrderUpdated(_askID);\n        emit OrderUpdated(_bidID);\n\n        uint startTime = block.timestamp;\n        uint endTime = 0;\n        // `0` - for spot deal\n\n        // if deal is normal\n        if (ask.duration != 0) {\n            endTime = startTime.add(bid.duration);\n        }\n        uint blockedBalance = bid.frozenSum;\n        deals[dealAmount] = Deal(ask.benchmarks, ask.author, bid.author, master, _askID, _bidID, bid.duration, ask.price, startTime, endTime, DealStatus.STATUS_ACCEPTED, blockedBalance, 0, block.timestamp);\n        emit DealOpened(dealAmount);\n    }\n\n    function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n\n        if (block.timestamp <= deals[dealID].startTime.add(deals[dealID].duration)) {\n            // after endTime\n            require(deals[dealID].consumerID == msg.sender);\n        }\n        AddToBlacklist(dealID, blacklisted);\n        InternalBill(dealID);\n        InternalCloseDeal(dealID);\n        RefundRemainingFunds(dealID);\n        return true;\n    }\n\n    function Bill(uint dealID) public returns (bool){\n        InternalBill(dealID);\n        ReserveNextPeriodFunds(dealID);\n        return true;\n    }\n\n    function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID || msg.sender == deals[dealID].supplierID);\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n\n        if (IsSpot(dealID)) {\n            require(newDuration == 0);\n        }\n\n        requestsAmount = requestsAmount.add(1);\n\n        OrderType requestType;\n\n        if (msg.sender == deals[dealID].consumerID) {\n            requestType = OrderType.ORDER_BID;\n        } else {\n            requestType = OrderType.ORDER_ASK;\n        }\n\n        requests[requestsAmount] = ChangeRequest(dealID, requestType, newPrice, newDuration, RequestStatus.REQUEST_CREATED);\n        emit DealChangeRequestSet(requestsAmount);\n\n        if (requestType == OrderType.ORDER_BID) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][1] = requestsAmount;\n            ChangeRequest memory matchingRequest = requests[actualRequests[dealID][0]];\n\n            if (newDuration == deals[dealID].duration && newPrice > deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][1] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration >= newDuration && matchingRequest.price <= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = matchingRequest.price;\n                deals[dealID].duration = newDuration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            actualRequests[dealID][1] = requestsAmount;\n        }\n\n        if (requestType == OrderType.ORDER_ASK) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n            requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][0] = requestsAmount;\n            matchingRequest = requests[actualRequests[dealID][1]];\n\n            if (newDuration == deals[dealID].duration && newPrice < deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][0] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration <= newDuration && matchingRequest.price >= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                deals[dealID].duration = matchingRequest.duration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n        }\n\n        deals[dealID].endTime = deals[dealID].startTime.add(deals[dealID].duration);\n        return requestsAmount;\n    }\n\n    function CancelChangeRequest(uint changeRequestID) public returns (bool) {\n        ChangeRequest memory request = requests[changeRequestID];\n        require(msg.sender == deals[request.dealID].supplierID || msg.sender == deals[request.dealID].masterID || msg.sender == deals[request.dealID].consumerID);\n        require(request.status != RequestStatus.REQUEST_ACCEPTED);\n\n        if (request.requestType == OrderType.ORDER_ASK) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            }\n            actualRequests[request.dealID][0] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n\n        if (request.requestType == OrderType.ORDER_BID) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            }\n            actualRequests[request.dealID][1] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n        return true;\n    }\n\n    // Master-worker functions\n\n    function RegisterWorker(address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(msg.sender) == msg.sender);\n        require(isMaster[msg.sender] == false);\n        require(GetMaster(_master) == _master);\n        masterRequest[_master][msg.sender] = true;\n        emit WorkerAnnounced(msg.sender, _master);\n        return true;\n    }\n\n    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {\n        require(masterRequest[msg.sender][_worker] == true);\n        masterOf[_worker] = msg.sender;\n        isMaster[msg.sender] = true;\n        delete masterRequest[msg.sender][_worker];\n        emit WorkerConfirmed(_worker, msg.sender);\n        return true;\n    }\n\n    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));\n        delete masterOf[_worker];\n        emit WorkerRemoved(_worker, _master);\n        return true;\n    }\n\n    // GETTERS\n\n    function GetOrderInfo(uint orderID) view public\n    returns (\n        OrderType orderType,\n        address author,\n        address counterparty,\n        uint duration,\n        uint price,\n        bool[] netflags,\n        ProfileRegistry.IdentityLevel identityLevel,\n        address blacklist,\n        bytes32 tag,\n        uint64[] benchmarks,\n        uint frozenSum\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderType,\n        order.author,\n        order.counterparty,\n        order.duration,\n        order.price,\n        order.netflags,\n        order.identityLevel,\n        order.blacklist,\n        order.tag,\n        order.benchmarks,\n        order.frozenSum\n        );\n    }\n\n\n    function GetOrderParams(uint orderID) view public\n    returns (\n        OrderStatus orderStatus,\n        uint dealID\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderStatus,\n        order.dealID\n        );\n    }\n\n    function GetDealInfo(uint dealID) view public\n    returns (\n        uint64[] benchmarks,\n        address supplierID,\n        address consumerID,\n        address masterID,\n        uint askID,\n        uint bidID,\n        uint startTime\n    ){\n        return (\n        deals[dealID].benchmarks,\n        deals[dealID].supplierID,\n        deals[dealID].consumerID,\n        deals[dealID].masterID,\n        deals[dealID].askID,\n        deals[dealID].bidID,\n        deals[dealID].startTime\n\n        );\n    }\n\n    function GetDealParams(uint dealID) view public\n    returns (\n        uint duration,\n        uint price,\n        uint endTime,\n        DealStatus status,\n        uint blockedBalance,\n        uint totalPayout,\n        uint lastBillTS\n    ){\n        return (\n        deals[dealID].duration,\n        deals[dealID].price,\n        deals[dealID].endTime,\n        deals[dealID].status,\n        deals[dealID].blockedBalance,\n        deals[dealID].totalPayout,\n        deals[dealID].lastBillTS\n        );\n    }\n\n    function GetMaster(address _worker) view public returns (address master) {\n        if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {\n            master = _worker;\n        } else {\n            master = masterOf[_worker];\n        }\n    }\n\n    function GetChangeRequestInfo(uint changeRequestID) view public\n    returns (\n        uint dealID,\n        OrderType requestType,\n        uint price,\n        uint duration,\n        RequestStatus status\n    ){\n        return (\n        requests[changeRequestID].dealID,\n        requests[changeRequestID].requestType,\n        requests[changeRequestID].price,\n        requests[changeRequestID].duration,\n        requests[changeRequestID].status\n        );\n    }\n\n    function GetDealsAmount() public view returns (uint){\n        return dealAmount;\n    }\n\n    function GetOrdersAmount() public view returns (uint){\n        return ordersAmount;\n    }\n\n    function GetChangeRequestsAmount() public view returns (uint){\n        return requestsAmount;\n    }\n\n    function GetBenchmarksQuantity() public view returns (uint) {\n        return benchmarksQuantity;\n    }\n\n    function GetNetflagsQuantity() public view returns (uint) {\n        return netflagsQuantity;\n    }\n\n\n    // INTERNAL\n\n    function InternalBill(uint dealID) internal returns (bool){\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n        Deal memory deal = deals[dealID];\n\n        uint paidAmount;\n\n        if (!IsSpot(dealID) && deal.lastBillTS >= deal.endTime) {\n            // means we already billed deal after endTime\n            return true;\n        } else if (!IsSpot(dealID) && block.timestamp > deal.endTime && deal.lastBillTS < deal.endTime) {\n            paidAmount = CalculatePayment(deal.price, deal.endTime.sub(deal.lastBillTS));\n        } else {\n            paidAmount = CalculatePayment(deal.price, block.timestamp.sub(deal.lastBillTS));\n        }\n\n        if (paidAmount > deal.blockedBalance) {\n            if (token.balanceOf(deal.consumerID) >= paidAmount.sub(deal.blockedBalance)) {\n                require(token.transferFrom(deal.consumerID, this, paidAmount.sub(deal.blockedBalance)));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(paidAmount.sub(deal.blockedBalance));\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                require(token.transfer(deal.masterID, deal.blockedBalance));\n                deals[dealID].lastBillTS = block.timestamp;\n                deals[dealID].totalPayout = deals[dealID].totalPayout.add(deal.blockedBalance);\n                deals[dealID].blockedBalance = 0;\n                return true;\n            }\n        }\n        require(token.transfer(deal.masterID, paidAmount));\n        deals[dealID].blockedBalance = deals[dealID].blockedBalance.sub(paidAmount);\n        deals[dealID].totalPayout = deals[dealID].totalPayout.add(paidAmount);\n        deals[dealID].lastBillTS = block.timestamp;\n        emit Billed(dealID, paidAmount);\n        return true;\n    }\n\n    function ReserveNextPeriodFunds(uint dealID) internal returns (bool) {\n        uint nextPeriod;\n        Deal memory deal = deals[dealID];\n\n        if (IsSpot(dealID)) {\n            if (deal.status == DealStatus.STATUS_CLOSED) {\n                return true;\n            }\n            nextPeriod = 1 hours;\n        } else {\n            if (block.timestamp > deal.endTime) {\n                // we don't reserve funds for next period\n                return true;\n            }\n            if (deal.endTime.sub(block.timestamp) < 1 days) {\n                nextPeriod = deal.endTime.sub(block.timestamp);\n            } else {\n                nextPeriod = 1 days;\n            }\n        }\n\n        if (CalculatePayment(deal.price, nextPeriod) > deals[dealID].blockedBalance) {\n            uint nextPeriodSum = CalculatePayment(deal.price, nextPeriod).sub(deals[dealID].blockedBalance);\n\n            if (token.balanceOf(deal.consumerID) >= nextPeriodSum) {\n                require(token.transferFrom(deal.consumerID, this, nextPeriodSum));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(nextPeriodSum);\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                RefundRemainingFunds(dealID);\n                return true;\n            }\n        }\n        return true;\n    }\n\n    function RefundRemainingFunds(uint dealID) internal returns (bool){\n        if (deals[dealID].blockedBalance != 0) {\n            token.transfer(deals[dealID].consumerID, deals[dealID].blockedBalance);\n            deals[dealID].blockedBalance = 0;\n        }\n        return true;\n    }\n\n    function IsSpot(uint dealID) internal view returns (bool){\n        return deals[dealID].duration == 0;\n    }\n\n    function CalculatePayment(uint _price, uint _period) internal view returns (uint) {\n        uint rate = oracle.getCurrentPrice();\n        return rate.mul(_price).mul(_period).div(1e18);\n    }\n\n    function AddToBlacklist(uint dealID, BlacklistPerson role) internal {\n        // only consumer can blacklist\n        require(msg.sender == deals[dealID].consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);\n        if (role == BlacklistPerson.BLACKLIST_WORKER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].supplierID);\n        } else if (role == BlacklistPerson.BLACKLIST_MASTER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].masterID);\n        }\n    }\n\n    function InternalCloseDeal(uint dealID) internal {\n        if (deals[dealID].status == DealStatus.STATUS_CLOSED) {\n            return;\n        }\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].masterID);\n        deals[dealID].status = DealStatus.STATUS_CLOSED;\n        deals[dealID].endTime = block.timestamp;\n        emit DealUpdated(dealID);\n    }\n\n    function ResizeBenchmarks(uint64[] _benchmarks) internal view returns (uint64[]) {\n        uint64[] memory benchmarks = new uint64[](benchmarksQuantity);\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            benchmarks[i] = _benchmarks[i];\n        }\n        return benchmarks;\n    }\n\n    function ResizeNetflags(bool[] _netflags) internal view returns (bool[]) {\n        bool[] memory netflags = new bool[](netflagsQuantity);\n        for (uint i = 0; i < _netflags.length; i++) {\n            netflags[i] = _netflags[i];\n        }\n        return netflags;\n    }\n\n    // SETTERS\n\n    function SetProfileRegistryAddress(address _newPR) onlyOwner public returns (bool) {\n        pr = ProfileRegistry(_newPR);\n        return true;\n    }\n\n    function SetBlacklistAddress(address _newBL) onlyOwner public returns (bool) {\n        bl = Blacklist(_newBL);\n        return true;\n    }\n\n    function SetOracleAddress(address _newOracle) onlyOwner public returns (bool) {\n        require(OracleUSD(_newOracle).getCurrentPrice() != 0);\n        oracle = OracleUSD(_newOracle);\n        return true;\n    }\n\n    function SetBenchmarksQuantity(uint _newQuantity) onlyOwner public returns (bool) {\n        require(_newQuantity > benchmarksQuantity);\n        emit NumBenchmarksUpdated(_newQuantity);\n        benchmarksQuantity = _newQuantity;\n        return true;\n    }\n\n    function SetNetflagsQuantity(uint _newQuantity) onlyOwner public returns (bool) {\n        require(_newQuantity > netflagsQuantity);\n        emit NumNetflagsUpdated(_newQuantity);\n        netflagsQuantity = _newQuantity;\n        return true;\n    }\n\n    function KillMarket() onlyOwner public {\n        token.transfer(owner, token.balanceOf(address(this)));\n        selfdestruct(owner);\n    }\n}\n",
   "sourcePath": "contracts/Market.sol",
   "ast": {
     "absolutePath": "contracts/Market.sol",
     "exportedSymbols": {
       "Market": [
-        3787
+        5229
       ]
     },
-    "id": 3788,
+    "id": 5230,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 705,
+        "id": 2147,
         "literals": [
           "solidity",
           "^",
@@ -1109,71 +1109,71 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:5"
+        "src": "0:24:7"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 706,
+        "id": 2148,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 7337,
-        "src": "27:59:5",
+        "scope": 5230,
+        "sourceUnit": 10883,
+        "src": "27:59:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 707,
+        "id": 2149,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 7157,
-        "src": "87:60:5",
+        "scope": 5230,
+        "sourceUnit": 10703,
+        "src": "87:60:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 708,
+        "id": 2150,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 5515,
-        "src": "148:19:5",
+        "scope": 5230,
+        "sourceUnit": 10081,
+        "src": "148:19:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/Blacklist.sol",
         "file": "./Blacklist.sol",
-        "id": 709,
+        "id": 2151,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 593,
-        "src": "168:25:5",
+        "scope": 5230,
+        "sourceUnit": 1162,
+        "src": "168:25:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/OracleUSD.sol",
         "file": "./OracleUSD.sol",
-        "id": 710,
+        "id": 2152,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 4904,
-        "src": "194:25:5",
+        "scope": 5230,
+        "sourceUnit": 8678,
+        "src": "194:25:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/ProfileRegistry.sol",
         "file": "./ProfileRegistry.sol",
-        "id": 711,
+        "id": 2153,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 5470,
-        "src": "220:31:5",
+        "scope": 5230,
+        "sourceUnit": 10036,
+        "src": "220:31:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -1183,76 +1183,76 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 712,
+              "id": 2154,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "273:7:5",
+              "referencedDeclaration": 10882,
+              "src": "273:7:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 713,
+            "id": 2155,
             "nodeType": "InheritanceSpecifier",
-            "src": "273:7:5"
+            "src": "273:7:7"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 714,
+              "id": 2156,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7156,
-              "src": "282:8:5",
+              "referencedDeclaration": 10702,
+              "src": "282:8:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$7156",
+                "typeIdentifier": "t_contract$_Pausable_$10702",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 715,
+            "id": 2157,
             "nodeType": "InheritanceSpecifier",
-            "src": "282:8:5"
+            "src": "282:8:7"
           }
         ],
         "contractDependencies": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 3787,
+        "id": 5229,
         "linearizedBaseContracts": [
-          3787,
-          7156,
-          7336
+          5229,
+          10702,
+          10882
         ],
         "name": "Market",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 718,
+            "id": 2160,
             "libraryName": {
               "contractScope": null,
-              "id": 716,
+              "id": 2158,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "304:8:5",
+              "referencedDeclaration": 10796,
+              "src": "304:8:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "298:27:5",
+            "src": "298:27:7",
             "typeName": {
-              "id": 717,
+              "id": 2159,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "317:7:5",
+              "src": "317:7:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1261,162 +1261,162 @@
           },
           {
             "canonicalName": "Market.DealStatus",
-            "id": 722,
+            "id": 2164,
             "members": [
               {
-                "id": 719,
+                "id": 2161,
                 "name": "STATUS_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "377:14:5"
+                "src": "377:14:7"
               },
               {
-                "id": 720,
+                "id": 2162,
                 "name": "STATUS_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "401:15:5"
+                "src": "401:15:7"
               },
               {
-                "id": 721,
+                "id": 2163,
                 "name": "STATUS_CLOSED",
                 "nodeType": "EnumValue",
-                "src": "426:13:5"
+                "src": "426:13:7"
               }
             ],
             "name": "DealStatus",
             "nodeType": "EnumDefinition",
-            "src": "352:93:5"
+            "src": "352:93:7"
           },
           {
             "canonicalName": "Market.OrderType",
-            "id": 726,
+            "id": 2168,
             "members": [
               {
-                "id": 723,
+                "id": 2165,
                 "name": "ORDER_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "476:13:5"
+                "src": "476:13:7"
               },
               {
-                "id": 724,
+                "id": 2166,
                 "name": "ORDER_BID",
                 "nodeType": "EnumValue",
-                "src": "499:9:5"
+                "src": "499:9:7"
               },
               {
-                "id": 725,
+                "id": 2167,
                 "name": "ORDER_ASK",
                 "nodeType": "EnumValue",
-                "src": "518:9:5"
+                "src": "518:9:7"
               }
             ],
             "name": "OrderType",
             "nodeType": "EnumDefinition",
-            "src": "451:82:5"
+            "src": "451:82:7"
           },
           {
             "canonicalName": "Market.OrderStatus",
-            "id": 730,
+            "id": 2172,
             "members": [
               {
-                "id": 727,
+                "id": 2169,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "566:7:5"
+                "src": "566:7:7"
               },
               {
-                "id": 728,
+                "id": 2170,
                 "name": "ORDER_INACTIVE",
                 "nodeType": "EnumValue",
-                "src": "583:14:5"
+                "src": "583:14:7"
               },
               {
-                "id": 729,
+                "id": 2171,
                 "name": "ORDER_ACTIVE",
                 "nodeType": "EnumValue",
-                "src": "607:12:5"
+                "src": "607:12:7"
               }
             ],
             "name": "OrderStatus",
             "nodeType": "EnumDefinition",
-            "src": "539:86:5"
+            "src": "539:86:7"
           },
           {
             "canonicalName": "Market.RequestStatus",
-            "id": 736,
+            "id": 2178,
             "members": [
               {
-                "id": 731,
+                "id": 2173,
                 "name": "REQUEST_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "660:15:5"
+                "src": "660:15:7"
               },
               {
-                "id": 732,
+                "id": 2174,
                 "name": "REQUEST_CREATED",
                 "nodeType": "EnumValue",
-                "src": "685:15:5"
+                "src": "685:15:7"
               },
               {
-                "id": 733,
+                "id": 2175,
                 "name": "REQUEST_CANCELED",
                 "nodeType": "EnumValue",
-                "src": "710:16:5"
+                "src": "710:16:7"
               },
               {
-                "id": 734,
+                "id": 2176,
                 "name": "REQUEST_REJECTED",
                 "nodeType": "EnumValue",
-                "src": "736:16:5"
+                "src": "736:16:7"
               },
               {
-                "id": 735,
+                "id": 2177,
                 "name": "REQUEST_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "762:16:5"
+                "src": "762:16:7"
               }
             ],
             "name": "RequestStatus",
             "nodeType": "EnumDefinition",
-            "src": "631:153:5"
+            "src": "631:153:7"
           },
           {
             "canonicalName": "Market.BlacklistPerson",
-            "id": 740,
+            "id": 2182,
             "members": [
               {
-                "id": 737,
+                "id": 2179,
                 "name": "BLACKLIST_NOBODY",
                 "nodeType": "EnumValue",
-                "src": "821:16:5"
+                "src": "821:16:7"
               },
               {
-                "id": 738,
+                "id": 2180,
                 "name": "BLACKLIST_WORKER",
                 "nodeType": "EnumValue",
-                "src": "847:16:5"
+                "src": "847:16:7"
               },
               {
-                "id": 739,
+                "id": 2181,
                 "name": "BLACKLIST_MASTER",
                 "nodeType": "EnumValue",
-                "src": "873:16:5"
+                "src": "873:16:7"
               }
             ],
             "name": "BlacklistPerson",
             "nodeType": "EnumDefinition",
-            "src": "790:105:5"
+            "src": "790:105:7"
           },
           {
             "canonicalName": "Market.Deal",
-            "id": 770,
+            "id": 2212,
             "members": [
               {
                 "constant": false,
-                "id": 743,
+                "id": 2185,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "923:19:5",
+                "scope": 2212,
+                "src": "923:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1425,19 +1425,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 741,
+                    "id": 2183,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "923:6:5",
+                    "src": "923:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 742,
+                  "id": 2184,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "923:8:5",
+                  "src": "923:8:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -1448,11 +1448,11 @@
               },
               {
                 "constant": false,
-                "id": 745,
+                "id": 2187,
                 "name": "supplierID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "952:18:5",
+                "scope": 2212,
+                "src": "952:18:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1460,10 +1460,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 744,
+                  "id": 2186,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "952:7:5",
+                  "src": "952:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1474,11 +1474,11 @@
               },
               {
                 "constant": false,
-                "id": 747,
+                "id": 2189,
                 "name": "consumerID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "980:18:5",
+                "scope": 2212,
+                "src": "980:18:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1486,10 +1486,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 746,
+                  "id": 2188,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "980:7:5",
+                  "src": "980:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1500,11 +1500,11 @@
               },
               {
                 "constant": false,
-                "id": 749,
+                "id": 2191,
                 "name": "masterID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1008:16:5",
+                "scope": 2212,
+                "src": "1008:16:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1512,10 +1512,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 748,
+                  "id": 2190,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1008:7:5",
+                  "src": "1008:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1526,11 +1526,11 @@
               },
               {
                 "constant": false,
-                "id": 751,
+                "id": 2193,
                 "name": "askID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1034:10:5",
+                "scope": 2212,
+                "src": "1034:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1538,10 +1538,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 750,
+                  "id": 2192,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1034:4:5",
+                  "src": "1034:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1552,11 +1552,11 @@
               },
               {
                 "constant": false,
-                "id": 753,
+                "id": 2195,
                 "name": "bidID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1054:10:5",
+                "scope": 2212,
+                "src": "1054:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1564,10 +1564,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 752,
+                  "id": 2194,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1054:4:5",
+                  "src": "1054:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1578,11 +1578,11 @@
               },
               {
                 "constant": false,
-                "id": 755,
+                "id": 2197,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1074:13:5",
+                "scope": 2212,
+                "src": "1074:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1590,10 +1590,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 754,
+                  "id": 2196,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1074:4:5",
+                  "src": "1074:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1604,11 +1604,11 @@
               },
               {
                 "constant": false,
-                "id": 757,
+                "id": 2199,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1097:10:5",
+                "scope": 2212,
+                "src": "1097:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1616,10 +1616,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 756,
+                  "id": 2198,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1097:4:5",
+                  "src": "1097:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1630,11 +1630,11 @@
               },
               {
                 "constant": false,
-                "id": 759,
+                "id": 2201,
                 "name": "startTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1132:14:5",
+                "scope": 2212,
+                "src": "1132:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1642,10 +1642,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 758,
+                  "id": 2200,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1132:4:5",
+                  "src": "1132:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1656,11 +1656,11 @@
               },
               {
                 "constant": false,
-                "id": 761,
+                "id": 2203,
                 "name": "endTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1156:12:5",
+                "scope": 2212,
+                "src": "1156:12:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1668,10 +1668,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 760,
+                  "id": 2202,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1156:4:5",
+                  "src": "1156:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1682,26 +1682,26 @@
               },
               {
                 "constant": false,
-                "id": 763,
+                "id": 2205,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1178:17:5",
+                "scope": 2212,
+                "src": "1178:17:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_DealStatus_$722",
+                  "typeIdentifier": "t_enum$_DealStatus_$2164",
                   "typeString": "enum Market.DealStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 762,
+                  "id": 2204,
                   "name": "DealStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 722,
-                  "src": "1178:10:5",
+                  "referencedDeclaration": 2164,
+                  "src": "1178:10:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$722",
+                    "typeIdentifier": "t_enum$_DealStatus_$2164",
                     "typeString": "enum Market.DealStatus"
                   }
                 },
@@ -1710,11 +1710,11 @@
               },
               {
                 "constant": false,
-                "id": 765,
+                "id": 2207,
                 "name": "blockedBalance",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1205:19:5",
+                "scope": 2212,
+                "src": "1205:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1722,10 +1722,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 764,
+                  "id": 2206,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1205:4:5",
+                  "src": "1205:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1736,11 +1736,11 @@
               },
               {
                 "constant": false,
-                "id": 767,
+                "id": 2209,
                 "name": "totalPayout",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1234:16:5",
+                "scope": 2212,
+                "src": "1234:16:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1748,10 +1748,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 766,
+                  "id": 2208,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1234:4:5",
+                  "src": "1234:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1762,11 +1762,11 @@
               },
               {
                 "constant": false,
-                "id": 769,
+                "id": 2211,
                 "name": "lastBillTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1260:15:5",
+                "scope": 2212,
+                "src": "1260:15:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1774,10 +1774,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 768,
+                  "id": 2210,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1260:4:5",
+                  "src": "1260:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1789,36 +1789,36 @@
             ],
             "name": "Deal",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "901:381:5",
+            "scope": 5229,
+            "src": "901:381:7",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.Order",
-            "id": 799,
+            "id": 2241,
             "members": [
               {
                 "constant": false,
-                "id": 772,
+                "id": 2214,
                 "name": "orderType",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1311:19:5",
+                "scope": 2241,
+                "src": "1311:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$726",
+                  "typeIdentifier": "t_enum$_OrderType_$2168",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 771,
+                  "id": 2213,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 726,
-                  "src": "1311:9:5",
+                  "referencedDeclaration": 2168,
+                  "src": "1311:9:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -1827,26 +1827,26 @@
               },
               {
                 "constant": false,
-                "id": 774,
+                "id": 2216,
                 "name": "orderStatus",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1340:23:5",
+                "scope": 2241,
+                "src": "1340:23:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderStatus_$730",
+                  "typeIdentifier": "t_enum$_OrderStatus_$2172",
                   "typeString": "enum Market.OrderStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 773,
+                  "id": 2215,
                   "name": "OrderStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 730,
-                  "src": "1340:11:5",
+                  "referencedDeclaration": 2172,
+                  "src": "1340:11:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$730",
+                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
                     "typeString": "enum Market.OrderStatus"
                   }
                 },
@@ -1855,11 +1855,11 @@
               },
               {
                 "constant": false,
-                "id": 776,
+                "id": 2218,
                 "name": "author",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1373:14:5",
+                "scope": 2241,
+                "src": "1373:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1867,10 +1867,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 775,
+                  "id": 2217,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1373:7:5",
+                  "src": "1373:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1881,11 +1881,11 @@
               },
               {
                 "constant": false,
-                "id": 778,
+                "id": 2220,
                 "name": "counterparty",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1397:20:5",
+                "scope": 2241,
+                "src": "1397:20:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1893,10 +1893,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 777,
+                  "id": 2219,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1397:7:5",
+                  "src": "1397:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1907,11 +1907,11 @@
               },
               {
                 "constant": false,
-                "id": 780,
+                "id": 2222,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1427:13:5",
+                "scope": 2241,
+                "src": "1427:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1919,10 +1919,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 779,
+                  "id": 2221,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1427:4:5",
+                  "src": "1427:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1933,11 +1933,11 @@
               },
               {
                 "constant": false,
-                "id": 782,
+                "id": 2224,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1450:13:5",
+                "scope": 2241,
+                "src": "1450:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1945,10 +1945,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 781,
+                  "id": 2223,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1450:7:5",
+                  "src": "1450:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1959,11 +1959,11 @@
               },
               {
                 "constant": false,
-                "id": 785,
+                "id": 2227,
                 "name": "netflags",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1473:15:5",
+                "scope": 2241,
+                "src": "1473:15:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1972,19 +1972,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 783,
+                    "id": 2225,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1473:4:5",
+                    "src": "1473:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 784,
+                  "id": 2226,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1473:6:5",
+                  "src": "1473:6:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                     "typeString": "bool[]"
@@ -1995,26 +1995,26 @@
               },
               {
                 "constant": false,
-                "id": 787,
+                "id": 2229,
                 "name": "identityLevel",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1498:43:5",
+                "scope": 2241,
+                "src": "1498:43:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                  "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                   "typeString": "enum ProfileRegistry.IdentityLevel"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 786,
+                  "id": 2228,
                   "name": "ProfileRegistry.IdentityLevel",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 4931,
-                  "src": "1498:29:5",
+                  "referencedDeclaration": 9497,
+                  "src": "1498:29:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   }
                 },
@@ -2023,11 +2023,11 @@
               },
               {
                 "constant": false,
-                "id": 789,
+                "id": 2231,
                 "name": "blacklist",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1551:17:5",
+                "scope": 2241,
+                "src": "1551:17:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2035,10 +2035,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 788,
+                  "id": 2230,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1551:7:5",
+                  "src": "1551:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -2049,11 +2049,11 @@
               },
               {
                 "constant": false,
-                "id": 791,
+                "id": 2233,
                 "name": "tag",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1578:11:5",
+                "scope": 2241,
+                "src": "1578:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2061,10 +2061,10 @@
                   "typeString": "bytes32"
                 },
                 "typeName": {
-                  "id": 790,
+                  "id": 2232,
                   "name": "bytes32",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1578:7:5",
+                  "src": "1578:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes32",
                     "typeString": "bytes32"
@@ -2075,11 +2075,11 @@
               },
               {
                 "constant": false,
-                "id": 794,
+                "id": 2236,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1599:19:5",
+                "scope": 2241,
+                "src": "1599:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2088,19 +2088,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 792,
+                    "id": 2234,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1599:6:5",
+                    "src": "1599:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 793,
+                  "id": 2235,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1599:8:5",
+                  "src": "1599:8:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -2111,11 +2111,11 @@
               },
               {
                 "constant": false,
-                "id": 796,
+                "id": 2238,
                 "name": "frozenSum",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1628:14:5",
+                "scope": 2241,
+                "src": "1628:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2123,10 +2123,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 795,
+                  "id": 2237,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1628:4:5",
+                  "src": "1628:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2137,11 +2137,11 @@
               },
               {
                 "constant": false,
-                "id": 798,
+                "id": 2240,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1652:11:5",
+                "scope": 2241,
+                "src": "1652:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2149,10 +2149,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 797,
+                  "id": 2239,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1652:4:5",
+                  "src": "1652:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2164,21 +2164,21 @@
             ],
             "name": "Order",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "1288:382:5",
+            "scope": 5229,
+            "src": "1288:382:7",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.ChangeRequest",
-            "id": 810,
+            "id": 2252,
             "members": [
               {
                 "constant": false,
-                "id": 801,
+                "id": 2243,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1707:11:5",
+                "scope": 2252,
+                "src": "1707:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2186,10 +2186,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 800,
+                  "id": 2242,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1707:4:5",
+                  "src": "1707:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2200,26 +2200,26 @@
               },
               {
                 "constant": false,
-                "id": 803,
+                "id": 2245,
                 "name": "requestType",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1728:21:5",
+                "scope": 2252,
+                "src": "1728:21:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$726",
+                  "typeIdentifier": "t_enum$_OrderType_$2168",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 802,
+                  "id": 2244,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 726,
-                  "src": "1728:9:5",
+                  "referencedDeclaration": 2168,
+                  "src": "1728:9:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -2228,11 +2228,11 @@
               },
               {
                 "constant": false,
-                "id": 805,
+                "id": 2247,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1759:10:5",
+                "scope": 2252,
+                "src": "1759:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2240,10 +2240,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 804,
+                  "id": 2246,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1759:4:5",
+                  "src": "1759:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2254,11 +2254,11 @@
               },
               {
                 "constant": false,
-                "id": 807,
+                "id": 2249,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1779:13:5",
+                "scope": 2252,
+                "src": "1779:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2266,10 +2266,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 806,
+                  "id": 2248,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1779:4:5",
+                  "src": "1779:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2280,26 +2280,26 @@
               },
               {
                 "constant": false,
-                "id": 809,
+                "id": 2251,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1802:20:5",
+                "scope": 2252,
+                "src": "1802:20:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                   "typeString": "enum Market.RequestStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 808,
+                  "id": 2250,
                   "name": "RequestStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 736,
-                  "src": "1802:13:5",
+                  "referencedDeclaration": 2178,
+                  "src": "1802:13:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                     "typeString": "enum Market.RequestStatus"
                   }
                 },
@@ -2309,28 +2309,28 @@
             ],
             "name": "ChangeRequest",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "1676:153:5",
+            "scope": 5229,
+            "src": "1676:153:7",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 814,
+            "id": 2256,
             "name": "OrderPlaced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 813,
+              "id": 2255,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 812,
+                  "id": 2254,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 814,
-                  "src": "1868:20:5",
+                  "scope": 2256,
+                  "src": "1868:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2338,10 +2338,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 811,
+                    "id": 2253,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1868:4:5",
+                    "src": "1868:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2351,28 +2351,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1867:22:5"
+              "src": "1867:22:7"
             },
-            "src": "1850:40:5"
+            "src": "1850:40:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 818,
+            "id": 2260,
             "name": "OrderUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 817,
+              "id": 2259,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 816,
+                  "id": 2258,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 818,
-                  "src": "1914:20:5",
+                  "scope": 2260,
+                  "src": "1914:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2380,10 +2380,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 815,
+                    "id": 2257,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1914:4:5",
+                    "src": "1914:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2393,28 +2393,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1913:22:5"
+              "src": "1913:22:7"
             },
-            "src": "1895:41:5"
+            "src": "1895:41:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 822,
+            "id": 2264,
             "name": "DealOpened",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 821,
+              "id": 2263,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 820,
+                  "id": 2262,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 822,
-                  "src": "1959:19:5",
+                  "scope": 2264,
+                  "src": "1959:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2422,10 +2422,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 819,
+                    "id": 2261,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1959:4:5",
+                    "src": "1959:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2435,28 +2435,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1958:21:5"
+              "src": "1958:21:7"
             },
-            "src": "1942:38:5"
+            "src": "1942:38:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 826,
+            "id": 2268,
             "name": "DealUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 825,
+              "id": 2267,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 824,
+                  "id": 2266,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 826,
-                  "src": "2003:19:5",
+                  "scope": 2268,
+                  "src": "2003:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2464,10 +2464,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 823,
+                    "id": 2265,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2003:4:5",
+                    "src": "2003:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2477,28 +2477,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2002:21:5"
+              "src": "2002:21:7"
             },
-            "src": "1985:39:5"
+            "src": "1985:39:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 832,
+            "id": 2274,
             "name": "Billed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 831,
+              "id": 2273,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 828,
+                  "id": 2270,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 832,
-                  "src": "2043:19:5",
+                  "scope": 2274,
+                  "src": "2043:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2506,10 +2506,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 827,
+                    "id": 2269,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2043:4:5",
+                    "src": "2043:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2520,12 +2520,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 830,
+                  "id": 2272,
                   "indexed": true,
                   "name": "paidAmount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 832,
-                  "src": "2064:23:5",
+                  "scope": 2274,
+                  "src": "2064:23:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2533,10 +2533,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 829,
+                    "id": 2271,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2064:4:5",
+                    "src": "2064:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2546,28 +2546,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2042:46:5"
+              "src": "2042:46:7"
             },
-            "src": "2030:59:5"
+            "src": "2030:59:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 836,
+            "id": 2278,
             "name": "DealChangeRequestSet",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 835,
+              "id": 2277,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 834,
+                  "id": 2276,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 836,
-                  "src": "2122:28:5",
+                  "scope": 2278,
+                  "src": "2122:28:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2575,10 +2575,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 833,
+                    "id": 2275,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2122:4:5",
+                    "src": "2122:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2588,28 +2588,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2121:30:5"
+              "src": "2121:30:7"
             },
-            "src": "2095:57:5"
+            "src": "2095:57:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 840,
+            "id": 2282,
             "name": "DealChangeRequestUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 839,
+              "id": 2281,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 838,
+                  "id": 2280,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 840,
-                  "src": "2188:28:5",
+                  "scope": 2282,
+                  "src": "2188:28:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2617,10 +2617,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 837,
+                    "id": 2279,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2188:4:5",
+                    "src": "2188:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2630,28 +2630,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2187:30:5"
+              "src": "2187:30:7"
             },
-            "src": "2157:61:5"
+            "src": "2157:61:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 846,
+            "id": 2288,
             "name": "WorkerAnnounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 845,
+              "id": 2287,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 842,
+                  "id": 2284,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 846,
-                  "src": "2246:22:5",
+                  "scope": 2288,
+                  "src": "2246:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2659,10 +2659,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 841,
+                    "id": 2283,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2246:7:5",
+                    "src": "2246:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2673,12 +2673,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 844,
+                  "id": 2286,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 846,
-                  "src": "2270:22:5",
+                  "scope": 2288,
+                  "src": "2270:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2686,10 +2686,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 843,
+                    "id": 2285,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2270:7:5",
+                    "src": "2270:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2699,28 +2699,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2245:48:5"
+              "src": "2245:48:7"
             },
-            "src": "2224:70:5"
+            "src": "2224:70:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 852,
+            "id": 2294,
             "name": "WorkerConfirmed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 851,
+              "id": 2293,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 848,
+                  "id": 2290,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 852,
-                  "src": "2321:22:5",
+                  "scope": 2294,
+                  "src": "2321:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2728,10 +2728,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 847,
+                    "id": 2289,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2321:7:5",
+                    "src": "2321:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2742,12 +2742,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 850,
+                  "id": 2292,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 852,
-                  "src": "2345:22:5",
+                  "scope": 2294,
+                  "src": "2345:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2755,10 +2755,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 849,
+                    "id": 2291,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:5",
+                    "src": "2345:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2768,28 +2768,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2320:48:5"
+              "src": "2320:48:7"
             },
-            "src": "2299:70:5"
+            "src": "2299:70:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 858,
+            "id": 2300,
             "name": "WorkerRemoved",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 857,
+              "id": 2299,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 854,
+                  "id": 2296,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 858,
-                  "src": "2394:22:5",
+                  "scope": 2300,
+                  "src": "2394:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2797,10 +2797,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 853,
+                    "id": 2295,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2394:7:5",
+                    "src": "2394:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2811,12 +2811,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 856,
+                  "id": 2298,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 858,
-                  "src": "2418:22:5",
+                  "scope": 2300,
+                  "src": "2418:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2824,10 +2824,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 855,
+                    "id": 2297,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2418:7:5",
+                    "src": "2418:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2837,28 +2837,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2393:48:5"
+              "src": "2393:48:7"
             },
-            "src": "2374:68:5"
+            "src": "2374:68:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 862,
+            "id": 2304,
             "name": "NumBenchmarksUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 861,
+              "id": 2303,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 860,
+                  "id": 2302,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 862,
-                  "src": "2475:19:5",
+                  "scope": 2304,
+                  "src": "2475:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2866,10 +2866,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 859,
+                    "id": 2301,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2475:4:5",
+                    "src": "2475:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2879,28 +2879,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2474:21:5"
+              "src": "2474:21:7"
             },
-            "src": "2448:48:5"
+            "src": "2448:48:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 866,
+            "id": 2308,
             "name": "NumNetflagsUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 865,
+              "id": 2307,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 864,
+                  "id": 2306,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 866,
-                  "src": "2526:19:5",
+                  "scope": 2308,
+                  "src": "2526:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2908,10 +2908,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 863,
+                    "id": 2305,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2526:4:5",
+                    "src": "2526:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2921,17 +2921,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2525:21:5"
+              "src": "2525:21:7"
             },
-            "src": "2501:46:5"
+            "src": "2501:46:7"
           },
           {
             "constant": true,
-            "id": 871,
+            "id": 2313,
             "name": "MAX_BENCHMARKS_VALUE",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2566:44:5",
+            "scope": 5229,
+            "src": "2566:44:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -2939,10 +2939,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 867,
+              "id": 2309,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2566:4:5",
+              "src": "2566:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -2954,7 +2954,7 @@
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
               },
-              "id": 870,
+              "id": 2312,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -2962,14 +2962,14 @@
               "leftExpression": {
                 "argumentTypes": null,
                 "hexValue": "32",
-                "id": 868,
+                "id": 2310,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2603:1:5",
+                "src": "2603:1:7",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_2_by_1",
@@ -2982,14 +2982,14 @@
               "rightExpression": {
                 "argumentTypes": null,
                 "hexValue": "3633",
-                "id": 869,
+                "id": 2311,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2608:2:5",
+                "src": "2608:2:7",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_63_by_1",
@@ -2997,7 +2997,7 @@
                 },
                 "value": "63"
               },
-              "src": "2603:7:5",
+              "src": "2603:7:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
@@ -3007,26 +3007,26 @@
           },
           {
             "constant": false,
-            "id": 873,
+            "id": 2315,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2617:9:5",
+            "scope": 5229,
+            "src": "2617:9:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$5514",
+              "typeIdentifier": "t_contract$_SNM_$10080",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 872,
+              "id": 2314,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5514,
-              "src": "2617:3:5",
+              "referencedDeclaration": 10080,
+              "src": "2617:3:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$5514",
+                "typeIdentifier": "t_contract$_SNM_$10080",
                 "typeString": "contract SNM"
               }
             },
@@ -3035,26 +3035,26 @@
           },
           {
             "constant": false,
-            "id": 875,
+            "id": 2317,
             "name": "bl",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2633:12:5",
+            "scope": 5229,
+            "src": "2633:12:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_Blacklist_$592",
+              "typeIdentifier": "t_contract$_Blacklist_$1161",
               "typeString": "contract Blacklist"
             },
             "typeName": {
               "contractScope": null,
-              "id": 874,
+              "id": 2316,
               "name": "Blacklist",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 592,
-              "src": "2633:9:5",
+              "referencedDeclaration": 1161,
+              "src": "2633:9:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Blacklist_$592",
+                "typeIdentifier": "t_contract$_Blacklist_$1161",
                 "typeString": "contract Blacklist"
               }
             },
@@ -3063,26 +3063,26 @@
           },
           {
             "constant": false,
-            "id": 877,
+            "id": 2319,
             "name": "oracle",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2652:16:5",
+            "scope": 5229,
+            "src": "2652:16:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_OracleUSD_$4903",
+              "typeIdentifier": "t_contract$_OracleUSD_$8677",
               "typeString": "contract OracleUSD"
             },
             "typeName": {
               "contractScope": null,
-              "id": 876,
+              "id": 2318,
               "name": "OracleUSD",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 4903,
-              "src": "2652:9:5",
+              "referencedDeclaration": 8677,
+              "src": "2652:9:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                "typeIdentifier": "t_contract$_OracleUSD_$8677",
                 "typeString": "contract OracleUSD"
               }
             },
@@ -3091,26 +3091,26 @@
           },
           {
             "constant": false,
-            "id": 879,
+            "id": 2321,
             "name": "pr",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2675:18:5",
+            "scope": 5229,
+            "src": "2675:18:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+              "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
               "typeString": "contract ProfileRegistry"
             },
             "typeName": {
               "contractScope": null,
-              "id": 878,
+              "id": 2320,
               "name": "ProfileRegistry",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5469,
-              "src": "2675:15:5",
+              "referencedDeclaration": 10035,
+              "src": "2675:15:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                 "typeString": "contract ProfileRegistry"
               }
             },
@@ -3119,11 +3119,11 @@
           },
           {
             "constant": false,
-            "id": 882,
+            "id": 2324,
             "name": "ordersAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2700:21:5",
+            "scope": 5229,
+            "src": "2700:21:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3131,10 +3131,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 880,
+              "id": 2322,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2700:4:5",
+              "src": "2700:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3143,14 +3143,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 881,
+              "id": 2323,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2720:1:5",
+              "src": "2720:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3162,11 +3162,11 @@
           },
           {
             "constant": false,
-            "id": 885,
+            "id": 2327,
             "name": "dealAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2728:19:5",
+            "scope": 5229,
+            "src": "2728:19:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3174,10 +3174,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 883,
+              "id": 2325,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2728:4:5",
+              "src": "2728:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3186,14 +3186,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 884,
+              "id": 2326,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2746:1:5",
+              "src": "2746:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3205,11 +3205,11 @@
           },
           {
             "constant": false,
-            "id": 888,
+            "id": 2330,
             "name": "requestsAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2754:23:5",
+            "scope": 5229,
+            "src": "2754:23:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3217,10 +3217,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 886,
+              "id": 2328,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2754:4:5",
+              "src": "2754:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3229,14 +3229,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 887,
+              "id": 2329,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2776:1:5",
+              "src": "2776:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3248,11 +3248,11 @@
           },
           {
             "constant": false,
-            "id": 890,
+            "id": 2332,
             "name": "benchmarksQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2820:23:5",
+            "scope": 5229,
+            "src": "2820:23:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3260,10 +3260,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 889,
+              "id": 2331,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2820:4:5",
+              "src": "2820:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3274,11 +3274,11 @@
           },
           {
             "constant": false,
-            "id": 892,
+            "id": 2334,
             "name": "netflagsQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2884:21:5",
+            "scope": 5229,
+            "src": "2884:21:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3286,10 +3286,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 891,
+              "id": 2333,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2884:4:5",
+              "src": "2884:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3300,44 +3300,44 @@
           },
           {
             "constant": false,
-            "id": 896,
+            "id": 2338,
             "name": "orders",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2912:36:5",
+            "scope": 5229,
+            "src": "2912:36:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
               "typeString": "mapping(uint256 => struct Market.Order)"
             },
             "typeName": {
-              "id": 895,
+              "id": 2337,
               "keyType": {
-                "id": 893,
+                "id": 2335,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2920:4:5",
+                "src": "2920:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2912:22:5",
+              "src": "2912:22:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Order)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 894,
+                "id": 2336,
                 "name": "Order",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 799,
-                "src": "2928:5:5",
+                "referencedDeclaration": 2241,
+                "src": "2928:5:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                  "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                   "typeString": "struct Market.Order"
                 }
               }
@@ -3347,44 +3347,44 @@
           },
           {
             "constant": false,
-            "id": 900,
+            "id": 2342,
             "name": "deals",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2955:34:5",
+            "scope": 5229,
+            "src": "2955:34:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
               "typeString": "mapping(uint256 => struct Market.Deal)"
             },
             "typeName": {
-              "id": 899,
+              "id": 2341,
               "keyType": {
-                "id": 897,
+                "id": 2339,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2963:4:5",
+                "src": "2963:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2955:21:5",
+              "src": "2955:21:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Deal)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 898,
+                "id": 2340,
                 "name": "Deal",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 770,
-                "src": "2971:4:5",
+                "referencedDeclaration": 2212,
+                "src": "2971:4:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                  "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                   "typeString": "struct Market.Deal"
                 }
               }
@@ -3394,11 +3394,11 @@
           },
           {
             "constant": false,
-            "id": 905,
+            "id": 2347,
             "name": "dealsID",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2996:34:5",
+            "scope": 5229,
+            "src": "2996:34:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3406,38 +3406,38 @@
               "typeString": "mapping(address => uint256[])"
             },
             "typeName": {
-              "id": 904,
+              "id": 2346,
               "keyType": {
-                "id": 901,
+                "id": 2343,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3004:7:5",
+                "src": "3004:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2996:26:5",
+              "src": "2996:26:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_uint256_$dyn_storage_$",
                 "typeString": "mapping(address => uint256[])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 902,
+                  "id": 2344,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3015:4:5",
+                  "src": "3015:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 903,
+                "id": 2345,
                 "length": null,
                 "nodeType": "ArrayTypeName",
-                "src": "3015:6:5",
+                "src": "3015:6:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                   "typeString": "uint256[]"
@@ -3449,44 +3449,44 @@
           },
           {
             "constant": false,
-            "id": 909,
+            "id": 2351,
             "name": "requests",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3037:39:5",
+            "scope": 5229,
+            "src": "3037:39:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
               "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
             },
             "typeName": {
-              "id": 908,
+              "id": 2350,
               "keyType": {
-                "id": 906,
+                "id": 2348,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3045:4:5",
+                "src": "3045:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3037:30:5",
+              "src": "3037:30:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                 "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 907,
+                "id": 2349,
                 "name": "ChangeRequest",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 810,
-                "src": "3053:13:5",
+                "referencedDeclaration": 2252,
+                "src": "3053:13:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                  "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                   "typeString": "struct Market.ChangeRequest"
                 }
               }
@@ -3496,11 +3496,11 @@
           },
           {
             "constant": false,
-            "id": 915,
+            "id": 2357,
             "name": "actualRequests",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3083:39:5",
+            "scope": 5229,
+            "src": "3083:39:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3508,46 +3508,46 @@
               "typeString": "mapping(uint256 => uint256[2])"
             },
             "typeName": {
-              "id": 914,
+              "id": 2356,
               "keyType": {
-                "id": 910,
+                "id": 2352,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3091:4:5",
+                "src": "3091:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3083:24:5",
+              "src": "3083:24:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                 "typeString": "mapping(uint256 => uint256[2])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 911,
+                  "id": 2353,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3099:4:5",
+                  "src": "3099:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 913,
+                "id": 2355,
                 "length": {
                   "argumentTypes": null,
                   "hexValue": "32",
-                  "id": 912,
+                  "id": 2354,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "kind": "number",
                   "lValueRequested": false,
                   "nodeType": "Literal",
-                  "src": "3104:1:5",
+                  "src": "3104:1:7",
                   "subdenomination": null,
                   "typeDescriptions": {
                     "typeIdentifier": null,
@@ -3556,7 +3556,7 @@
                   "value": "2"
                 },
                 "nodeType": "ArrayTypeName",
-                "src": "3099:7:5",
+                "src": "3099:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$2_storage_ptr",
                   "typeString": "uint256[2]"
@@ -3568,11 +3568,11 @@
           },
           {
             "constant": false,
-            "id": 919,
+            "id": 2361,
             "name": "masterOf",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3129:36:5",
+            "scope": 5229,
+            "src": "3129:36:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3580,28 +3580,28 @@
               "typeString": "mapping(address => address)"
             },
             "typeName": {
-              "id": 918,
+              "id": 2360,
               "keyType": {
-                "id": 916,
+                "id": 2358,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3137:7:5",
+                "src": "3137:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3129:27:5",
+              "src": "3129:27:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                 "typeString": "mapping(address => address)"
               },
               "valueType": {
-                "id": 917,
+                "id": 2359,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3148:7:5",
+                "src": "3148:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
@@ -3613,11 +3613,11 @@
           },
           {
             "constant": false,
-            "id": 923,
+            "id": 2365,
             "name": "isMaster",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3172:33:5",
+            "scope": 5229,
+            "src": "3172:33:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3625,28 +3625,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 922,
+              "id": 2364,
               "keyType": {
-                "id": 920,
+                "id": 2362,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3180:7:5",
+                "src": "3180:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3172:24:5",
+              "src": "3172:24:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 921,
+                "id": 2363,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "3191:4:5",
+                "src": "3191:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -3658,11 +3658,11 @@
           },
           {
             "constant": false,
-            "id": 929,
+            "id": 2371,
             "name": "masterRequest",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3212:58:5",
+            "scope": 5229,
+            "src": "3212:58:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3670,46 +3670,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 928,
+              "id": 2370,
               "keyType": {
-                "id": 924,
+                "id": 2366,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3220:7:5",
+                "src": "3220:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3212:44:5",
+              "src": "3212:44:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 927,
+                "id": 2369,
                 "keyType": {
-                  "id": 925,
+                  "id": 2367,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3239:7:5",
+                  "src": "3239:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "3231:24:5",
+                "src": "3231:24:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 926,
+                  "id": 2368,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3250:4:5",
+                  "src": "3250:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -3722,28 +3722,28 @@
           },
           {
             "body": {
-              "id": 976,
+              "id": 2418,
               "nodeType": "Block",
-              "src": "3438:253:5",
+              "src": "3438:253:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 948,
+                    "id": 2390,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 944,
+                      "id": 2386,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 873,
-                      "src": "3448:5:5",
+                      "referencedDeclaration": 2315,
+                      "src": "3448:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
@@ -3754,12 +3754,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 946,
+                          "id": 2388,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 931,
-                          "src": "3460:6:5",
+                          "referencedDeclaration": 2373,
+                          "src": "3460:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3773,18 +3773,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 945,
+                        "id": 2387,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5514,
-                        "src": "3456:3:5",
+                        "referencedDeclaration": 10080,
+                        "src": "3456:3:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$5514_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 947,
+                      "id": 2389,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3792,40 +3792,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3456:11:5",
+                      "src": "3456:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "3448:19:5",
+                    "src": "3448:19:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$5514",
+                      "typeIdentifier": "t_contract$_SNM_$10080",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 949,
+                  "id": 2391,
                   "nodeType": "ExpressionStatement",
-                  "src": "3448:19:5"
+                  "src": "3448:19:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 954,
+                    "id": 2396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 950,
+                      "id": 2392,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 875,
-                      "src": "3477:2:5",
+                      "referencedDeclaration": 2317,
+                      "src": "3477:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -3836,12 +3836,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 952,
+                          "id": 2394,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 933,
-                          "src": "3492:10:5",
+                          "referencedDeclaration": 2375,
+                          "src": "3492:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3855,18 +3855,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 951,
+                        "id": 2393,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 592,
-                        "src": "3482:9:5",
+                        "referencedDeclaration": 1161,
+                        "src": "3482:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$592_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 953,
+                      "id": 2395,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3874,40 +3874,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3482:21:5",
+                      "src": "3482:21:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "3477:26:5",
+                    "src": "3477:26:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 955,
+                  "id": 2397,
                   "nodeType": "ExpressionStatement",
-                  "src": "3477:26:5"
+                  "src": "3477:26:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 960,
+                    "id": 2402,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 956,
+                      "id": 2398,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 877,
-                      "src": "3513:6:5",
+                      "referencedDeclaration": 2319,
+                      "src": "3513:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -3918,12 +3918,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 958,
+                          "id": 2400,
                           "name": "_oracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 935,
-                          "src": "3532:7:5",
+                          "referencedDeclaration": 2377,
+                          "src": "3532:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3937,18 +3937,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 957,
+                        "id": 2399,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4903,
-                        "src": "3522:9:5",
+                        "referencedDeclaration": 8677,
+                        "src": "3522:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 959,
+                      "id": 2401,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3956,40 +3956,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3522:18:5",
+                      "src": "3522:18:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "3513:27:5",
+                    "src": "3513:27:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 961,
+                  "id": 2403,
                   "nodeType": "ExpressionStatement",
-                  "src": "3513:27:5"
+                  "src": "3513:27:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 966,
+                    "id": 2408,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 962,
+                      "id": 2404,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 879,
-                      "src": "3550:2:5",
+                      "referencedDeclaration": 2321,
+                      "src": "3550:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -4000,12 +4000,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 964,
+                          "id": 2406,
                           "name": "_profileRegistry",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 937,
-                          "src": "3571:16:5",
+                          "referencedDeclaration": 2379,
+                          "src": "3571:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4019,18 +4019,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 963,
+                        "id": 2405,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5469,
-                        "src": "3555:15:5",
+                        "referencedDeclaration": 10035,
+                        "src": "3555:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 965,
+                      "id": 2407,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4038,38 +4038,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3555:33:5",
+                      "src": "3555:33:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "3550:38:5",
+                    "src": "3550:38:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 967,
+                  "id": 2409,
                   "nodeType": "ExpressionStatement",
-                  "src": "3550:38:5"
+                  "src": "3550:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 970,
+                    "id": 2412,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 968,
+                      "id": 2410,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "3598:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "3598:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4079,43 +4079,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 969,
+                      "id": 2411,
                       "name": "_benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 939,
-                      "src": "3619:19:5",
+                      "referencedDeclaration": 2381,
+                      "src": "3619:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3598:40:5",
+                    "src": "3598:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 971,
+                  "id": 2413,
                   "nodeType": "ExpressionStatement",
-                  "src": "3598:40:5"
+                  "src": "3598:40:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 974,
+                    "id": 2416,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 972,
+                      "id": 2414,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "3648:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "3648:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4125,31 +4125,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 973,
+                      "id": 2415,
                       "name": "_netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 941,
-                      "src": "3667:17:5",
+                      "referencedDeclaration": 2383,
+                      "src": "3667:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3648:36:5",
+                    "src": "3648:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 975,
+                  "id": 2417,
                   "nodeType": "ExpressionStatement",
-                  "src": "3648:36:5"
+                  "src": "3648:36:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 977,
+            "id": 2419,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -4157,16 +4157,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 942,
+              "id": 2384,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 931,
+                  "id": 2373,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3302:14:5",
+                  "scope": 2419,
+                  "src": "3302:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4174,10 +4174,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 930,
+                    "id": 2372,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3302:7:5",
+                    "src": "3302:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4188,11 +4188,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 933,
+                  "id": 2375,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3318:18:5",
+                  "scope": 2419,
+                  "src": "3318:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4200,10 +4200,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 932,
+                    "id": 2374,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3318:7:5",
+                    "src": "3318:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4214,11 +4214,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 935,
+                  "id": 2377,
                   "name": "_oracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3338:15:5",
+                  "scope": 2419,
+                  "src": "3338:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4226,10 +4226,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 934,
+                    "id": 2376,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3338:7:5",
+                    "src": "3338:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4240,11 +4240,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 937,
+                  "id": 2379,
                   "name": "_profileRegistry",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3355:24:5",
+                  "scope": 2419,
+                  "src": "3355:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4252,10 +4252,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 936,
+                    "id": 2378,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3355:7:5",
+                    "src": "3355:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4266,11 +4266,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 939,
+                  "id": 2381,
                   "name": "_benchmarksQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3381:24:5",
+                  "scope": 2419,
+                  "src": "3381:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4278,10 +4278,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 938,
+                    "id": 2380,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3381:4:5",
+                    "src": "3381:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4292,11 +4292,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 941,
+                  "id": 2383,
                   "name": "_netflagsQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3407:22:5",
+                  "scope": 2419,
+                  "src": "3407:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4304,10 +4304,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 940,
+                    "id": 2382,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3407:4:5",
+                    "src": "3407:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4317,26 +4317,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3301:129:5"
+              "src": "3301:129:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 943,
+              "id": 2385,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3438:0:5"
+              "src": "3438:0:7"
             },
-            "scope": 3787,
-            "src": "3290:401:5",
+            "scope": 5229,
+            "src": "3290:401:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1138,
+              "id": 2580,
               "nodeType": "Block",
-              "src": "4068:1331:5",
+              "src": "4068:1331:7",
               "statements": [
                 {
                   "expression": {
@@ -4345,24 +4345,24 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1009,
+                        "id": 2451,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1005,
+                          "id": 2447,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 990,
-                          "src": "4087:14:5",
+                          "referencedDeclaration": 2432,
+                          "src": "4087:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -4374,32 +4374,32 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1006,
+                              "id": 2448,
                               "name": "ProfileRegistry",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5469,
-                              "src": "4105:15:5",
+                              "referencedDeclaration": 10035,
+                              "src": "4105:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                                 "typeString": "type(contract ProfileRegistry)"
                               }
                             },
-                            "id": 1007,
+                            "id": 2449,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "IdentityLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4931,
-                            "src": "4105:29:5",
+                            "referencedDeclaration": 9497,
+                            "src": "4105:29:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1008,
+                          "id": 2450,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4407,13 +4407,13 @@
                           "memberName": "ANONYMOUS",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4105:39:5",
+                          "src": "4105:39:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "4087:57:5",
+                        "src": "4087:57:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4427,21 +4427,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1004,
+                      "id": 2446,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4079:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4079:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1010,
+                    "id": 2452,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4449,15 +4449,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4079:66:5",
+                    "src": "4079:66:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1011,
+                  "id": 2453,
                   "nodeType": "ExpressionStatement",
-                  "src": "4079:66:5"
+                  "src": "4079:66:7"
                 },
                 {
                   "expression": {
@@ -4469,7 +4469,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1016,
+                        "id": 2458,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4478,18 +4478,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1013,
+                            "id": 2455,
                             "name": "_netflags",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 988,
-                            "src": "4163:9:5",
+                            "referencedDeclaration": 2430,
+                            "src": "4163:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "id": 1014,
+                          "id": 2456,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4497,7 +4497,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4163:16:5",
+                          "src": "4163:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4507,18 +4507,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1015,
+                          "id": 2457,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 892,
-                          "src": "4183:16:5",
+                          "referencedDeclaration": 2334,
+                          "src": "4183:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4163:36:5",
+                        "src": "4163:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4532,21 +4532,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1012,
+                      "id": 2454,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4155:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4155:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1017,
+                    "id": 2459,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4554,15 +4554,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4155:45:5",
+                    "src": "4155:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1018,
+                  "id": 2460,
                   "nodeType": "ExpressionStatement",
-                  "src": "4155:45:5"
+                  "src": "4155:45:7"
                 },
                 {
                   "expression": {
@@ -4574,7 +4574,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1023,
+                        "id": 2465,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4583,18 +4583,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1020,
+                            "id": 2462,
                             "name": "_benchmarks",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 997,
-                            "src": "4218:11:5",
+                            "referencedDeclaration": 2439,
+                            "src": "4218:11:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "id": 1021,
+                          "id": 2463,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4602,7 +4602,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4218:18:5",
+                          "src": "4218:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4612,18 +4612,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1022,
+                          "id": 2464,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 890,
-                          "src": "4240:18:5",
+                          "referencedDeclaration": 2332,
+                          "src": "4240:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4218:40:5",
+                        "src": "4218:40:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4637,21 +4637,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1019,
+                      "id": 2461,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4210:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4210:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1024,
+                    "id": 2466,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4659,21 +4659,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4210:49:5",
+                    "src": "4210:49:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1025,
+                  "id": 2467,
                   "nodeType": "ExpressionStatement",
-                  "src": "4210:49:5"
+                  "src": "4210:49:7"
                 },
                 {
                   "body": {
-                    "id": 1045,
+                    "id": 2487,
                     "nodeType": "Block",
-                    "src": "4316:71:5",
+                    "src": "4316:71:7",
                     "statements": [
                       {
                         "expression": {
@@ -4685,7 +4685,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 1042,
+                              "id": 2484,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4694,26 +4694,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1038,
+                                  "id": 2480,
                                   "name": "_benchmarks",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 997,
-                                  "src": "4338:11:5",
+                                  "referencedDeclaration": 2439,
+                                  "src": "4338:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1040,
+                                "id": 2482,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1039,
+                                  "id": 2481,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1027,
-                                  "src": "4350:1:5",
+                                  "referencedDeclaration": 2469,
+                                  "src": "4350:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -4724,7 +4724,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "4338:14:5",
+                                "src": "4338:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -4734,18 +4734,18 @@
                               "operator": "<",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 1041,
+                                "id": 2483,
                                 "name": "MAX_BENCHMARKS_VALUE",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 871,
-                                "src": "4355:20:5",
+                                "referencedDeclaration": 2313,
+                                "src": "4355:20:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "4338:37:5",
+                              "src": "4338:37:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -4759,21 +4759,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1037,
+                            "id": 2479,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "4330:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "4330:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1043,
+                          "id": 2485,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4781,15 +4781,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4330:46:5",
+                          "src": "4330:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1044,
+                        "id": 2486,
                         "nodeType": "ExpressionStatement",
-                        "src": "4330:46:5"
+                        "src": "4330:46:7"
                       }
                     ]
                   },
@@ -4799,19 +4799,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1033,
+                    "id": 2475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1030,
+                      "id": 2472,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1027,
-                      "src": "4287:1:5",
+                      "referencedDeclaration": 2469,
+                      "src": "4287:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4823,18 +4823,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1031,
+                        "id": 2473,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 997,
-                        "src": "4291:11:5",
+                        "referencedDeclaration": 2439,
+                        "src": "4291:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1032,
+                      "id": 2474,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4842,31 +4842,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4291:18:5",
+                      "src": "4291:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4287:22:5",
+                    "src": "4287:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1046,
+                  "id": 2488,
                   "initializationExpression": {
                     "assignments": [
-                      1027
+                      2469
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 1027,
+                        "id": 2469,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 1139,
-                        "src": "4275:6:5",
+                        "scope": 2581,
+                        "src": "4275:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -4874,10 +4874,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 1026,
+                          "id": 2468,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4275:4:5",
+                          "src": "4275:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4887,18 +4887,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 1029,
+                    "id": 2471,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1028,
+                      "id": 2470,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4284:1:5",
+                      "src": "4284:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -4907,12 +4907,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4275:10:5"
+                    "src": "4275:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1035,
+                      "id": 2477,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4920,15 +4920,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4311:3:5",
+                      "src": "4311:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1034,
+                        "id": 2476,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1027,
-                        "src": "4311:1:5",
+                        "referencedDeclaration": 2469,
+                        "src": "4311:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4939,25 +4939,25 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1036,
+                    "id": 2478,
                     "nodeType": "ExpressionStatement",
-                    "src": "4311:3:5"
+                    "src": "4311:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4270:117:5"
+                  "src": "4270:117:7"
                 },
                 {
                   "assignments": [
-                    1048
+                    2490
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1048,
+                      "id": 2490,
                       "name": "lockedSum",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1139,
-                      "src": "4397:14:5",
+                      "scope": 2581,
+                      "src": "4397:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -4965,10 +4965,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1047,
+                        "id": 2489,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4397:4:5",
+                        "src": "4397:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4978,18 +4978,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1050,
+                  "id": 2492,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 1049,
+                    "id": 2491,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4414:1:5",
+                    "src": "4414:1:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -4998,30 +4998,30 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4397:18:5"
+                  "src": "4397:18:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 1054,
+                    "id": 2496,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1051,
+                      "id": 2493,
                       "name": "_orderType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 979,
-                      "src": "4430:10:5",
+                      "referencedDeclaration": 2421,
+                      "src": "4430:10:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -5031,18 +5031,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1052,
+                        "id": 2494,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "4444:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "4444:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 1053,
+                      "id": 2495,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5050,26 +5050,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4444:19:5",
+                      "src": "4444:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "4430:33:5",
+                    "src": "4430:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1098,
+                  "id": 2540,
                   "nodeType": "IfStatement",
-                  "src": "4426:463:5",
+                  "src": "4426:463:7",
                   "trueBody": {
-                    "id": 1097,
+                    "id": 2539,
                     "nodeType": "Block",
-                    "src": "4465:424:5",
+                    "src": "4465:424:7",
                     "statements": [
                       {
                         "condition": {
@@ -5078,19 +5078,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 1057,
+                          "id": 2499,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 1055,
+                            "id": 2497,
                             "name": "_duration",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 983,
-                            "src": "4483:9:5",
+                            "referencedDeclaration": 2425,
+                            "src": "4483:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -5101,14 +5101,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1056,
+                            "id": 2498,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4496:1:5",
+                            "src": "4496:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -5116,7 +5116,7 @@
                             },
                             "value": "0"
                           },
-                          "src": "4483:14:5",
+                          "src": "4483:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -5129,19 +5129,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 1068,
+                            "id": 2510,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 1066,
+                              "id": 2508,
                               "name": "_duration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 983,
-                              "src": "4587:9:5",
+                              "referencedDeclaration": 2425,
+                              "src": "4587:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5152,14 +5152,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 1067,
+                              "id": 2509,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4599:6:5",
+                              "src": "4599:6:7",
                               "subdenomination": "days",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_86400_by_1",
@@ -5167,33 +5167,33 @@
                               },
                               "value": "1"
                             },
-                            "src": "4587:18:5",
+                            "src": "4587:18:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 1084,
+                            "id": 2526,
                             "nodeType": "Block",
-                            "src": "4693:77:5",
+                            "src": "4693:77:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1082,
+                                  "id": 2524,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 1077,
+                                    "id": 2519,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1048,
-                                    "src": "4711:9:5",
+                                    "referencedDeclaration": 2490,
+                                    "src": "4711:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -5206,12 +5206,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 1079,
+                                        "id": 2521,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 985,
-                                        "src": "4740:6:5",
+                                        "referencedDeclaration": 2427,
+                                        "src": "4740:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5220,14 +5220,14 @@
                                       {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 1080,
+                                        "id": 2522,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "4748:6:5",
+                                        "src": "4748:6:7",
                                         "subdenomination": "days",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_86400_by_1",
@@ -5247,18 +5247,18 @@
                                           "typeString": "int_const 86400"
                                         }
                                       ],
-                                      "id": 1078,
+                                      "id": 2520,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3428,
-                                      "src": "4723:16:5",
+                                      "referencedDeclaration": 4870,
+                                      "src": "4723:16:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 1081,
+                                    "id": 2523,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -5266,48 +5266,48 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4723:32:5",
+                                    "src": "4723:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4711:44:5",
+                                  "src": "4711:44:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 1083,
+                                "id": 2525,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4711:44:5"
+                                "src": "4711:44:7"
                               }
                             ]
                           },
-                          "id": 1085,
+                          "id": 2527,
                           "nodeType": "IfStatement",
-                          "src": "4583:187:5",
+                          "src": "4583:187:7",
                           "trueBody": {
-                            "id": 1076,
+                            "id": 2518,
                             "nodeType": "Block",
-                            "src": "4607:80:5",
+                            "src": "4607:80:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1074,
+                                  "id": 2516,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 1069,
+                                    "id": 2511,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1048,
-                                    "src": "4625:9:5",
+                                    "referencedDeclaration": 2490,
+                                    "src": "4625:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -5320,12 +5320,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 1071,
+                                        "id": 2513,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 985,
-                                        "src": "4654:6:5",
+                                        "referencedDeclaration": 2427,
+                                        "src": "4654:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5333,12 +5333,12 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 1072,
+                                        "id": 2514,
                                         "name": "_duration",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 983,
-                                        "src": "4662:9:5",
+                                        "referencedDeclaration": 2425,
+                                        "src": "4662:9:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5356,18 +5356,18 @@
                                           "typeString": "uint256"
                                         }
                                       ],
-                                      "id": 1070,
+                                      "id": 2512,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3428,
-                                      "src": "4637:16:5",
+                                      "referencedDeclaration": 4870,
+                                      "src": "4637:16:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 1073,
+                                    "id": 2515,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -5375,49 +5375,49 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4637:35:5",
+                                    "src": "4637:35:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4625:47:5",
+                                  "src": "4625:47:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 1075,
+                                "id": 2517,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4625:47:5"
+                                "src": "4625:47:7"
                               }
                             ]
                           }
                         },
-                        "id": 1086,
+                        "id": 2528,
                         "nodeType": "IfStatement",
-                        "src": "4479:291:5",
+                        "src": "4479:291:7",
                         "trueBody": {
-                          "id": 1065,
+                          "id": 2507,
                           "nodeType": "Block",
-                          "src": "4499:78:5",
+                          "src": "4499:78:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1063,
+                                "id": 2505,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 1058,
+                                  "id": 2500,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1048,
-                                  "src": "4517:9:5",
+                                  "referencedDeclaration": 2490,
+                                  "src": "4517:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -5430,12 +5430,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 1060,
+                                      "id": 2502,
                                       "name": "_price",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 985,
-                                      "src": "4546:6:5",
+                                      "referencedDeclaration": 2427,
+                                      "src": "4546:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -5444,14 +5444,14 @@
                                     {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 1061,
+                                      "id": 2503,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "4554:7:5",
+                                      "src": "4554:7:7",
                                       "subdenomination": "hours",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_3600_by_1",
@@ -5471,18 +5471,18 @@
                                         "typeString": "int_const 3600"
                                       }
                                     ],
-                                    "id": 1059,
+                                    "id": 2501,
                                     "name": "CalculatePayment",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3428,
-                                    "src": "4529:16:5",
+                                    "referencedDeclaration": 4870,
+                                    "src": "4529:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) view returns (uint256)"
                                     }
                                   },
-                                  "id": 1062,
+                                  "id": 2504,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5490,21 +5490,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "4529:33:5",
+                                  "src": "4529:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "4517:45:5",
+                                "src": "4517:45:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 1064,
+                              "id": 2506,
                               "nodeType": "ExpressionStatement",
-                              "src": "4517:45:5"
+                              "src": "4517:45:7"
                             }
                           ]
                         }
@@ -5520,18 +5520,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1090,
+                                    "id": 2532,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "4849:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "4849:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 1091,
+                                  "id": 2533,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5539,7 +5539,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "4849:10:5",
+                                  "src": "4849:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -5547,25 +5547,25 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 1092,
+                                  "id": 2534,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7814,
-                                  "src": "4861:4:5",
+                                  "referencedDeclaration": 11366,
+                                  "src": "4861:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Market_$3787",
+                                    "typeIdentifier": "t_contract$_Market_$5229",
                                     "typeString": "contract Market"
                                   }
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 1093,
+                                  "id": 2535,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1048,
-                                  "src": "4867:9:5",
+                                  "referencedDeclaration": 2490,
+                                  "src": "4867:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -5579,7 +5579,7 @@
                                     "typeString": "address"
                                   },
                                   {
-                                    "typeIdentifier": "t_contract$_Market_$3787",
+                                    "typeIdentifier": "t_contract$_Market_$5229",
                                     "typeString": "contract Market"
                                   },
                                   {
@@ -5589,32 +5589,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1088,
+                                  "id": 2530,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 873,
-                                  "src": "4830:5:5",
+                                  "referencedDeclaration": 2315,
+                                  "src": "4830:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SNM_$5514",
+                                    "typeIdentifier": "t_contract$_SNM_$10080",
                                     "typeString": "contract SNM"
                                   }
                                 },
-                                "id": 1089,
+                                "id": 2531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transferFrom",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 7607,
-                                "src": "4830:18:5",
+                                "referencedDeclaration": 11153,
+                                "src": "4830:18:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 1094,
+                              "id": 2536,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5622,7 +5622,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "4830:47:5",
+                              "src": "4830:47:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -5636,21 +5636,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1087,
+                            "id": 2529,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "4822:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "4822:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1095,
+                          "id": 2537,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5658,15 +5658,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4822:56:5",
+                          "src": "4822:56:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1096,
+                        "id": 2538,
                         "nodeType": "ExpressionStatement",
-                        "src": "4822:56:5"
+                        "src": "4822:56:7"
                       }
                     ]
                   }
@@ -5674,19 +5674,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1104,
+                    "id": 2546,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1099,
+                      "id": 2541,
                       "name": "ordersAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 882,
-                      "src": "4899:12:5",
+                      "referencedDeclaration": 2324,
+                      "src": "4899:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5700,14 +5700,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1102,
+                          "id": 2544,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4931:1:5",
+                          "src": "4931:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -5725,32 +5725,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1100,
+                          "id": 2542,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 882,
-                          "src": "4914:12:5",
+                          "referencedDeclaration": 2324,
+                          "src": "4914:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1101,
+                        "id": 2543,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "4914:16:5",
+                        "referencedDeclaration": 10795,
+                        "src": "4914:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1103,
+                      "id": 2545,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5758,34 +5758,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4914:19:5",
+                      "src": "4914:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4899:34:5",
+                    "src": "4899:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1105,
+                  "id": 2547,
                   "nodeType": "ExpressionStatement",
-                  "src": "4899:34:5"
+                  "src": "4899:34:7"
                 },
                 {
                   "assignments": [
-                    1107
+                    2549
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1107,
+                      "id": 2549,
                       "name": "orderId",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1139,
-                      "src": "4943:15:5",
+                      "scope": 2581,
+                      "src": "4943:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -5793,10 +5793,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1106,
+                        "id": 2548,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4943:7:5",
+                        "src": "4943:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5806,27 +5806,27 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1109,
+                  "id": 2551,
                   "initialValue": {
                     "argumentTypes": null,
-                    "id": 1108,
+                    "id": 2550,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 882,
-                    "src": "4961:12:5",
+                    "referencedDeclaration": 2324,
+                    "src": "4961:12:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4943:30:5"
+                  "src": "4943:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1130,
+                    "id": 2572,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5835,26 +5835,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1110,
+                        "id": 2552,
                         "name": "orders",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 896,
-                        "src": "4984:6:5",
+                        "referencedDeclaration": 2338,
+                        "src": "4984:6:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                         }
                       },
-                      "id": 1112,
+                      "id": 2554,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1111,
+                        "id": 2553,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1107,
-                        "src": "4991:7:5",
+                        "referencedDeclaration": 2549,
+                        "src": "4991:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5865,9 +5865,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4984:15:5",
+                      "src": "4984:15:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_storage",
+                        "typeIdentifier": "t_struct$_Order_$2241_storage",
                         "typeString": "struct Market.Order storage ref"
                       }
                     },
@@ -5878,14 +5878,14 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 1114,
+                          "id": 2556,
                           "name": "_orderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 979,
-                          "src": "5021:10:5",
+                          "referencedDeclaration": 2421,
+                          "src": "5021:10:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -5893,18 +5893,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1115,
+                            "id": 2557,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "5045:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "5045:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1116,
+                          "id": 2558,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5912,9 +5912,9 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5045:24:5",
+                          "src": "5045:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -5922,18 +5922,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1117,
+                            "id": 2559,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "5083:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "5083:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1118,
+                          "id": 2560,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5941,7 +5941,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5083:10:5",
+                          "src": "5083:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5949,12 +5949,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1119,
+                          "id": 2561,
                           "name": "_id_counterparty",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 981,
-                          "src": "5107:16:5",
+                          "referencedDeclaration": 2423,
+                          "src": "5107:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5962,12 +5962,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1120,
+                          "id": 2562,
                           "name": "_duration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 983,
-                          "src": "5137:9:5",
+                          "referencedDeclaration": 2425,
+                          "src": "5137:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5975,12 +5975,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1121,
+                          "id": 2563,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 985,
-                          "src": "5160:6:5",
+                          "referencedDeclaration": 2427,
+                          "src": "5160:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5988,12 +5988,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1122,
+                          "id": 2564,
                           "name": "_netflags",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 988,
-                          "src": "5180:9:5",
+                          "referencedDeclaration": 2430,
+                          "src": "5180:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                             "typeString": "bool[] memory"
@@ -6001,25 +6001,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1123,
+                          "id": 2565,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 990,
-                          "src": "5203:14:5",
+                          "referencedDeclaration": 2432,
+                          "src": "5203:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1124,
+                          "id": 2566,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 992,
-                          "src": "5231:10:5",
+                          "referencedDeclaration": 2434,
+                          "src": "5231:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6027,12 +6027,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1125,
+                          "id": 2567,
                           "name": "_tag",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 994,
-                          "src": "5255:4:5",
+                          "referencedDeclaration": 2436,
+                          "src": "5255:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -6040,12 +6040,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1126,
+                          "id": 2568,
                           "name": "_benchmarks",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "5273:11:5",
+                          "referencedDeclaration": 2439,
+                          "src": "5273:11:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                             "typeString": "uint64[] memory"
@@ -6053,12 +6053,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1127,
+                          "id": 2569,
                           "name": "lockedSum",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1048,
-                          "src": "5298:9:5",
+                          "referencedDeclaration": 2490,
+                          "src": "5298:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6067,14 +6067,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1128,
+                          "id": 2570,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "5321:1:5",
+                          "src": "5321:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -6086,11 +6086,11 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
                           {
@@ -6114,7 +6114,7 @@
                             "typeString": "bool[] memory"
                           },
                           {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           },
                           {
@@ -6138,18 +6138,18 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 1113,
+                        "id": 2555,
                         "name": "Order",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 799,
-                        "src": "5002:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "5002:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Order_$799_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Order_$2241_storage_ptr_$",
                           "typeString": "type(struct Market.Order storage pointer)"
                         }
                       },
-                      "id": 1129,
+                      "id": 2571,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6157,21 +6157,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5002:330:5",
+                      "src": "5002:330:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "src": "4984:348:5",
+                    "src": "4984:348:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
-                  "id": 1131,
+                  "id": 2573,
                   "nodeType": "ExpressionStatement",
-                  "src": "4984:348:5"
+                  "src": "4984:348:7"
                 },
                 {
                   "eventCall": {
@@ -6179,12 +6179,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1133,
+                        "id": 2575,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1107,
-                        "src": "5360:7:5",
+                        "referencedDeclaration": 2549,
+                        "src": "5360:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6198,18 +6198,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1132,
+                      "id": 2574,
                       "name": "OrderPlaced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 814,
-                      "src": "5348:11:5",
+                      "referencedDeclaration": 2256,
+                      "src": "5348:11:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1134,
+                    "id": 2576,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6217,91 +6217,91 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5348:20:5",
+                    "src": "5348:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1135,
+                  "id": 2577,
                   "nodeType": "EmitStatement",
-                  "src": "5343:25:5"
+                  "src": "5343:25:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1136,
+                    "id": 2578,
                     "name": "orderId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1107,
-                    "src": "5385:7:5",
+                    "referencedDeclaration": 2549,
+                    "src": "5385:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1003,
-                  "id": 1137,
+                  "functionReturnParameters": 2445,
+                  "id": 2579,
                   "nodeType": "Return",
-                  "src": "5378:14:5"
+                  "src": "5378:14:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1139,
+            "id": 2581,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1000,
+                "id": 2442,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 999,
+                  "id": 2441,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "4033:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "4033:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4033:13:5"
+                "src": "4033:13:7"
               }
             ],
             "name": "PlaceOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 998,
+              "id": 2440,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 979,
+                  "id": 2421,
                   "name": "_orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3767:20:5",
+                  "scope": 2581,
+                  "src": "3767:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 978,
+                    "id": 2420,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "3767:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "3767:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -6310,11 +6310,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 981,
+                  "id": 2423,
                   "name": "_id_counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3797:24:5",
+                  "scope": 2581,
+                  "src": "3797:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6322,10 +6322,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 980,
+                    "id": 2422,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3797:7:5",
+                    "src": "3797:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6336,11 +6336,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 983,
+                  "id": 2425,
                   "name": "_duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3831:14:5",
+                  "scope": 2581,
+                  "src": "3831:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6348,10 +6348,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 982,
+                    "id": 2424,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3831:4:5",
+                    "src": "3831:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6362,11 +6362,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 985,
+                  "id": 2427,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3855:11:5",
+                  "scope": 2581,
+                  "src": "3855:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6374,10 +6374,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 984,
+                    "id": 2426,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3855:4:5",
+                    "src": "3855:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6388,11 +6388,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 988,
+                  "id": 2430,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3876:16:5",
+                  "scope": 2581,
+                  "src": "3876:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6401,19 +6401,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 986,
+                      "id": 2428,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "3876:4:5",
+                      "src": "3876:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 987,
+                    "id": 2429,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "3876:6:5",
+                    "src": "3876:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -6424,26 +6424,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 990,
+                  "id": 2432,
                   "name": "_identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3902:44:5",
+                  "scope": 2581,
+                  "src": "3902:44:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 989,
+                    "id": 2431,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "3902:29:5",
+                    "referencedDeclaration": 9497,
+                    "src": "3902:29:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -6452,11 +6452,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 992,
+                  "id": 2434,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3956:18:5",
+                  "scope": 2581,
+                  "src": "3956:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6464,10 +6464,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 991,
+                    "id": 2433,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3956:7:5",
+                    "src": "3956:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6478,11 +6478,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 994,
+                  "id": 2436,
                   "name": "_tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3984:12:5",
+                  "scope": 2581,
+                  "src": "3984:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6490,10 +6490,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 993,
+                    "id": 2435,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3984:7:5",
+                    "src": "3984:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -6504,11 +6504,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 997,
+                  "id": 2439,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "4006:20:5",
+                  "scope": 2581,
+                  "src": "4006:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6517,19 +6517,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 995,
+                      "id": 2437,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "4006:6:5",
+                      "src": "4006:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 996,
+                    "id": 2438,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "4006:8:5",
+                    "src": "4006:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -6539,20 +6539,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3757:275:5"
+              "src": "3757:275:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1003,
+              "id": 2445,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1002,
+                  "id": 2444,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "4063:4:5",
+                  "scope": 2581,
+                  "src": "4063:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6560,10 +6560,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1001,
+                    "id": 2443,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4063:4:5",
+                    "src": "4063:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6573,19 +6573,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4062:6:5"
+              "src": "4062:6:7"
             },
-            "scope": 3787,
-            "src": "3738:1661:5",
+            "scope": 5229,
+            "src": "3738:1661:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1198,
+              "id": 2640,
               "nodeType": "Block",
-              "src": "5461:375:5",
+              "src": "5461:375:7",
               "statements": [
                 {
                   "expression": {
@@ -6597,19 +6597,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1149,
+                        "id": 2591,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1147,
+                          "id": 2589,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1141,
-                          "src": "5479:7:5",
+                          "referencedDeclaration": 2583,
+                          "src": "5479:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6619,18 +6619,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1148,
+                          "id": 2590,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 882,
-                          "src": "5490:12:5",
+                          "referencedDeclaration": 2324,
+                          "src": "5490:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "5479:23:5",
+                        "src": "5479:23:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6644,21 +6644,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1146,
+                      "id": 2588,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5471:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5471:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1150,
+                    "id": 2592,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6666,15 +6666,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5471:32:5",
+                    "src": "5471:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1151,
+                  "id": 2593,
                   "nodeType": "ExpressionStatement",
-                  "src": "5471:32:5"
+                  "src": "5471:32:7"
                 },
                 {
                   "expression": {
@@ -6683,10 +6683,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 1159,
+                        "id": 2601,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6697,26 +6697,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1153,
+                              "id": 2595,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 896,
-                              "src": "5521:6:5",
+                              "referencedDeclaration": 2338,
+                              "src": "5521:6:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 1155,
+                            "id": 2597,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1154,
+                              "id": 2596,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1141,
-                              "src": "5528:7:5",
+                              "referencedDeclaration": 2583,
+                              "src": "5528:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -6727,23 +6727,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5521:15:5",
+                            "src": "5521:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_storage",
+                              "typeIdentifier": "t_struct$_Order_$2241_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 1156,
+                          "id": 2598,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 774,
-                          "src": "5521:27:5",
+                          "referencedDeclaration": 2216,
+                          "src": "5521:27:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -6753,18 +6753,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1157,
+                            "id": 2599,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "5552:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "5552:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1158,
+                          "id": 2600,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -6772,13 +6772,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5552:24:5",
+                          "src": "5552:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "5521:55:5",
+                        "src": "5521:55:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6792,21 +6792,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1152,
+                      "id": 2594,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5513:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5513:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1160,
+                    "id": 2602,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6814,15 +6814,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5513:64:5",
+                    "src": "5513:64:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1161,
+                  "id": 2603,
                   "nodeType": "ExpressionStatement",
-                  "src": "5513:64:5"
+                  "src": "5513:64:7"
                 },
                 {
                   "expression": {
@@ -6834,7 +6834,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 1169,
+                        "id": 2611,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6845,26 +6845,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1163,
+                              "id": 2605,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 896,
-                              "src": "5595:6:5",
+                              "referencedDeclaration": 2338,
+                              "src": "5595:6:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 1165,
+                            "id": 2607,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1164,
+                              "id": 2606,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1141,
-                              "src": "5602:7:5",
+                              "referencedDeclaration": 2583,
+                              "src": "5602:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -6875,21 +6875,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5595:15:5",
+                            "src": "5595:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_storage",
+                              "typeIdentifier": "t_struct$_Order_$2241_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 1166,
+                          "id": 2608,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "5595:22:5",
+                          "referencedDeclaration": 2218,
+                          "src": "5595:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6901,18 +6901,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1167,
+                            "id": 2609,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "5621:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "5621:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1168,
+                          "id": 2610,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6920,13 +6920,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5621:10:5",
+                          "src": "5621:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "5595:36:5",
+                        "src": "5595:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6940,21 +6940,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1162,
+                      "id": 2604,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5587:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5587:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1170,
+                    "id": 2612,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6962,15 +6962,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5587:45:5",
+                    "src": "5587:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1171,
+                  "id": 2613,
                   "nodeType": "ExpressionStatement",
-                  "src": "5587:45:5"
+                  "src": "5587:45:7"
                 },
                 {
                   "expression": {
@@ -6983,18 +6983,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1175,
+                              "id": 2617,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "5666:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "5666:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1176,
+                            "id": 2618,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -7002,7 +7002,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "5666:10:5",
+                            "src": "5666:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -7014,26 +7014,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1177,
+                                "id": 2619,
                                 "name": "orders",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 896,
-                                "src": "5678:6:5",
+                                "referencedDeclaration": 2338,
+                                "src": "5678:6:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                                 }
                               },
-                              "id": 1179,
+                              "id": 2621,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1178,
+                                "id": 2620,
                                 "name": "orderID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1141,
-                                "src": "5685:7:5",
+                                "referencedDeclaration": 2583,
+                                "src": "5685:7:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -7044,21 +7044,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "5678:15:5",
+                              "src": "5678:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_storage",
+                                "typeIdentifier": "t_struct$_Order_$2241_storage",
                                 "typeString": "struct Market.Order storage ref"
                               }
                             },
-                            "id": 1180,
+                            "id": 2622,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "frozenSum",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 796,
-                            "src": "5678:25:5",
+                            "referencedDeclaration": 2238,
+                            "src": "5678:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -7078,32 +7078,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1173,
+                            "id": 2615,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "5651:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "5651:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 1174,
+                          "id": 2616,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "5651:14:5",
+                          "referencedDeclaration": 10965,
+                          "src": "5651:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 1181,
+                        "id": 2623,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7111,7 +7111,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5651:53:5",
+                        "src": "5651:53:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7125,21 +7125,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1172,
+                      "id": 2614,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5643:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5643:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1182,
+                    "id": 2624,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7147,20 +7147,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5643:62:5",
+                    "src": "5643:62:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1183,
+                  "id": 2625,
                   "nodeType": "ExpressionStatement",
-                  "src": "5643:62:5"
+                  "src": "5643:62:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1190,
+                    "id": 2632,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7171,26 +7171,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1184,
+                          "id": 2626,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "5715:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "5715:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1186,
+                        "id": 2628,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1185,
+                          "id": 2627,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1141,
-                          "src": "5722:7:5",
+                          "referencedDeclaration": 2583,
+                          "src": "5722:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7201,23 +7201,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5715:15:5",
+                        "src": "5715:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1187,
+                      "id": 2629,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "5715:27:5",
+                      "referencedDeclaration": 2216,
+                      "src": "5715:27:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -7227,18 +7227,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1188,
+                        "id": 2630,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "5745:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "5745:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1189,
+                      "id": 2631,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7246,21 +7246,21 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5745:26:5",
+                      "src": "5745:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "5715:56:5",
+                    "src": "5715:56:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1191,
+                  "id": 2633,
                   "nodeType": "ExpressionStatement",
-                  "src": "5715:56:5"
+                  "src": "5715:56:7"
                 },
                 {
                   "eventCall": {
@@ -7268,12 +7268,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1193,
+                        "id": 2635,
                         "name": "orderID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1141,
-                        "src": "5800:7:5",
+                        "referencedDeclaration": 2583,
+                        "src": "5800:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7287,18 +7287,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1192,
+                      "id": 2634,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "5787:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "5787:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1194,
+                    "id": 2636,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7306,28 +7306,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5787:21:5",
+                    "src": "5787:21:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1195,
+                  "id": 2637,
                   "nodeType": "EmitStatement",
-                  "src": "5782:26:5"
+                  "src": "5782:26:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1196,
+                    "id": 2638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "5825:4:5",
+                    "src": "5825:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -7335,15 +7335,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1145,
-                  "id": 1197,
+                  "functionReturnParameters": 2587,
+                  "id": 2639,
                   "nodeType": "Return",
-                  "src": "5818:11:5"
+                  "src": "5818:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1199,
+            "id": 2641,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -7351,16 +7351,16 @@
             "name": "CancelOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1142,
+              "id": 2584,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1141,
+                  "id": 2583,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1199,
-                  "src": "5426:12:5",
+                  "scope": 2641,
+                  "src": "5426:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7368,10 +7368,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1140,
+                    "id": 2582,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5426:4:5",
+                    "src": "5426:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7381,20 +7381,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5425:14:5"
+              "src": "5425:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1145,
+              "id": 2587,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1144,
+                  "id": 2586,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1199,
-                  "src": "5456:4:5",
+                  "scope": 2641,
+                  "src": "5456:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7402,10 +7402,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1143,
+                    "id": 2585,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5456:4:5",
+                    "src": "5456:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -7415,47 +7415,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5455:6:5"
+              "src": "5455:6:7"
             },
-            "scope": 3787,
-            "src": "5405:431:5",
+            "scope": 5229,
+            "src": "5405:431:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1315,
+              "id": 2757,
               "nodeType": "Block",
-              "src": "5914:806:5",
+              "src": "5914:806:7",
               "statements": [
                 {
                   "assignments": [
-                    1209
+                    2651
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1209,
+                      "id": 2651,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1316,
-                      "src": "5924:16:5",
+                      "scope": 2758,
+                      "src": "5924:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1208,
+                        "id": 2650,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "5924:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "5924:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -7463,31 +7463,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1213,
+                  "id": 2655,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1210,
+                      "id": 2652,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "5943:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "5943:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1212,
+                    "id": 2654,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1211,
+                      "id": 2653,
                       "name": "askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1201,
-                      "src": "5950:5:5",
+                      "referencedDeclaration": 2643,
+                      "src": "5950:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -7498,14 +7498,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "5943:13:5",
+                    "src": "5943:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "5924:32:5"
+                  "src": "5924:32:7"
                 },
                 {
                   "expression": {
@@ -7514,10 +7514,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1219,
+                        "id": 2661,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7526,28 +7526,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1215,
+                            "id": 2657,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "5974:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "5974:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1216,
+                          "id": 2658,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "5974:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "5974:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -7557,18 +7557,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1217,
+                            "id": 2659,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "5991:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "5991:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1218,
+                          "id": 2660,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7576,13 +7576,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5991:19:5",
+                          "src": "5991:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "5974:36:5",
+                        "src": "5974:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7596,21 +7596,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1214,
+                      "id": 2656,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5966:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5966:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1220,
+                    "id": 2662,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7618,15 +7618,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5966:45:5",
+                    "src": "5966:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1221,
+                  "id": 2663,
                   "nodeType": "ExpressionStatement",
-                  "src": "5966:45:5"
+                  "src": "5966:45:7"
                 },
                 {
                   "expression": {
@@ -7635,10 +7635,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 1227,
+                        "id": 2669,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7647,28 +7647,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1223,
+                            "id": 2665,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6029:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6029:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1224,
+                          "id": 2666,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 774,
-                          "src": "6029:15:5",
+                          "referencedDeclaration": 2216,
+                          "src": "6029:15:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -7678,18 +7678,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1225,
+                            "id": 2667,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "6048:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "6048:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1226,
+                          "id": 2668,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7697,13 +7697,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "6048:24:5",
+                          "src": "6048:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "6029:43:5",
+                        "src": "6029:43:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7717,21 +7717,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1222,
+                      "id": 2664,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6021:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6021:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1228,
+                    "id": 2670,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7739,15 +7739,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6021:52:5",
+                    "src": "6021:52:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1229,
+                  "id": 2671,
                   "nodeType": "ExpressionStatement",
-                  "src": "6021:52:5"
+                  "src": "6021:52:7"
                 },
                 {
                   "expression": {
@@ -7759,7 +7759,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1234,
+                        "id": 2676,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7768,26 +7768,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1231,
+                            "id": 2673,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6092:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6092:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1232,
+                          "id": 2674,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "6092:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "6092:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7797,18 +7797,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1233,
+                          "id": 2675,
                           "name": "buyoutDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1203,
-                          "src": "6108:14:5",
+                          "referencedDeclaration": 2645,
+                          "src": "6108:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "6092:30:5",
+                        "src": "6092:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7822,21 +7822,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1230,
+                      "id": 2672,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6084:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6084:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1235,
+                    "id": 2677,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7844,15 +7844,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6084:39:5",
+                    "src": "6084:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1236,
+                  "id": 2678,
                   "nodeType": "ExpressionStatement",
-                  "src": "6084:39:5"
+                  "src": "6084:39:7"
                 },
                 {
                   "expression": {
@@ -7861,10 +7861,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1245,
+                        "id": 2687,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7876,18 +7876,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1240,
+                                "id": 2682,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "6160:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "6160:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1241,
+                              "id": 2683,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -7895,7 +7895,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6160:10:5",
+                              "src": "6160:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -7911,32 +7911,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1238,
+                              "id": 2680,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "6141:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "6141:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1239,
+                            "id": 2681,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "6141:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "6141:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1242,
+                          "id": 2684,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7944,9 +7944,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6141:30:5",
+                          "src": "6141:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -7956,32 +7956,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1243,
+                            "id": 2685,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6175:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6175:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1244,
+                          "id": 2686,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "6175:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "6175:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "6141:51:5",
+                        "src": "6141:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7995,21 +7995,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1237,
+                      "id": 2679,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6133:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6133:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1246,
+                    "id": 2688,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8017,15 +8017,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6133:60:5",
+                    "src": "6133:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1247,
+                  "id": 2689,
                   "nodeType": "ExpressionStatement",
-                  "src": "6133:60:5"
+                  "src": "6133:60:7"
                 },
                 {
                   "expression": {
@@ -8037,7 +8037,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1269,
+                        "id": 2711,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8048,7 +8048,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1259,
+                          "id": 2701,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8060,18 +8060,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1251,
+                                  "id": 2693,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "6220:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "6220:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1252,
+                                "id": 2694,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8079,7 +8079,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6220:10:5",
+                                "src": "6220:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8092,26 +8092,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1254,
+                                      "id": 2696,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1209,
-                                      "src": "6242:3:5",
+                                      "referencedDeclaration": 2651,
+                                      "src": "6242:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1255,
+                                    "id": 2697,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 776,
-                                    "src": "6242:10:5",
+                                    "referencedDeclaration": 2218,
+                                    "src": "6242:10:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -8125,18 +8125,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 1253,
+                                  "id": 2695,
                                   "name": "GetMaster",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2856,
-                                  "src": "6232:9:5",
+                                  "referencedDeclaration": 4298,
+                                  "src": "6232:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                     "typeString": "function (address) view returns (address)"
                                   }
                                 },
-                                "id": 1256,
+                                "id": 2698,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8144,7 +8144,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "6232:21:5",
+                                "src": "6232:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8164,32 +8164,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1249,
+                                "id": 2691,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "6211:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "6211:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1250,
+                              "id": 2692,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "6211:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "6211:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1257,
+                            "id": 2699,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -8197,7 +8197,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6211:43:5",
+                            "src": "6211:43:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -8208,14 +8208,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1258,
+                            "id": 2700,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6258:5:5",
+                            "src": "6258:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -8223,7 +8223,7 @@
                             },
                             "value": "false"
                           },
-                          "src": "6211:52:5",
+                          "src": "6211:52:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -8237,7 +8237,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1268,
+                          "id": 2710,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8249,26 +8249,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1262,
+                                  "id": 2704,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1209,
-                                  "src": "6276:3:5",
+                                  "referencedDeclaration": 2651,
+                                  "src": "6276:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1263,
+                                "id": 2705,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "6276:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "6276:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8278,18 +8278,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1264,
+                                  "id": 2706,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "6288:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "6288:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1265,
+                                "id": 2707,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8297,7 +8297,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6288:10:5",
+                                "src": "6288:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8317,32 +8317,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1260,
+                                "id": 2702,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "6267:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "6267:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1261,
+                              "id": 2703,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "6267:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "6267:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1266,
+                            "id": 2708,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -8350,7 +8350,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6267:32:5",
+                            "src": "6267:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -8361,14 +8361,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1267,
+                            "id": 2709,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6303:5:5",
+                            "src": "6303:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -8376,13 +8376,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "6267:41:5",
+                          "src": "6267:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6211:97:5",
+                        "src": "6211:97:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8396,21 +8396,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1248,
+                      "id": 2690,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6203:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6203:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1270,
+                    "id": 2712,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8418,15 +8418,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6203:106:5",
+                    "src": "6203:106:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1271,
+                  "id": 2713,
                   "nodeType": "ExpressionStatement",
-                  "src": "6203:106:5"
+                  "src": "6203:106:7"
                 },
                 {
                   "expression": {
@@ -8438,7 +8438,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1281,
+                        "id": 2723,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8450,26 +8450,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1275,
+                                "id": 2717,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1209,
-                                "src": "6336:3:5",
+                                "referencedDeclaration": 2651,
+                                "src": "6336:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1276,
+                              "id": 2718,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blacklist",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 789,
-                              "src": "6336:13:5",
+                              "referencedDeclaration": 2231,
+                              "src": "6336:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -8479,18 +8479,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1277,
+                                "id": 2719,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "6351:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "6351:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1278,
+                              "id": 2720,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8498,7 +8498,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6351:10:5",
+                              "src": "6351:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -8518,32 +8518,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1273,
+                              "id": 2715,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 875,
-                              "src": "6327:2:5",
+                              "referencedDeclaration": 2317,
+                              "src": "6327:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$592",
+                                "typeIdentifier": "t_contract$_Blacklist_$1161",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 1274,
+                            "id": 2716,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 460,
-                            "src": "6327:8:5",
+                            "referencedDeclaration": 1029,
+                            "src": "6327:8:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 1279,
+                          "id": 2721,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8551,7 +8551,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6327:35:5",
+                          "src": "6327:35:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -8562,14 +8562,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 1280,
+                          "id": 2722,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "6366:5:5",
+                          "src": "6366:5:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -8577,7 +8577,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "6327:44:5",
+                        "src": "6327:44:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8591,21 +8591,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1272,
+                      "id": 2714,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6319:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6319:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1282,
+                    "id": 2724,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8613,15 +8613,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6319:53:5",
+                    "src": "6319:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1283,
+                  "id": 2725,
                   "nodeType": "ExpressionStatement",
-                  "src": "6319:53:5"
+                  "src": "6319:53:7"
                 },
                 {
                   "expression": {
@@ -8631,18 +8631,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1285,
+                          "id": 2727,
                           "name": "OrderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 726,
-                          "src": "6407:9:5",
+                          "referencedDeclaration": 2168,
+                          "src": "6407:9:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                            "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                             "typeString": "type(enum Market.OrderType)"
                           }
                         },
-                        "id": 1286,
+                        "id": 2728,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8650,9 +8650,9 @@
                         "memberName": "ORDER_BID",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6407:19:5",
+                        "src": "6407:19:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -8663,26 +8663,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1288,
+                              "id": 2730,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1209,
-                              "src": "6450:3:5",
+                              "referencedDeclaration": 2651,
+                              "src": "6450:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1289,
+                            "id": 2731,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "author",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 776,
-                            "src": "6450:10:5",
+                            "referencedDeclaration": 2218,
+                            "src": "6450:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -8696,18 +8696,18 @@
                               "typeString": "address"
                             }
                           ],
-                          "id": 1287,
+                          "id": 2729,
                           "name": "GetMaster",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2856,
-                          "src": "6440:9:5",
+                          "referencedDeclaration": 4298,
+                          "src": "6440:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                             "typeString": "function (address) view returns (address)"
                           }
                         },
-                        "id": 1290,
+                        "id": 2732,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8715,7 +8715,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6440:21:5",
+                        "src": "6440:21:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -8723,12 +8723,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1291,
+                        "id": 2733,
                         "name": "buyoutDuration",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1203,
-                        "src": "6475:14:5",
+                        "referencedDeclaration": 2645,
+                        "src": "6475:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -8738,26 +8738,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1292,
+                          "id": 2734,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6503:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6503:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1293,
+                        "id": 2735,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 782,
-                        "src": "6503:9:5",
+                        "referencedDeclaration": 2224,
+                        "src": "6503:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -8767,26 +8767,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1294,
+                          "id": 2736,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6526:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6526:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1295,
+                        "id": 2737,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "6526:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "6526:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -8798,32 +8798,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1296,
+                            "id": 2738,
                             "name": "ProfileRegistry",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5469,
-                            "src": "6552:15:5",
+                            "referencedDeclaration": 10035,
+                            "src": "6552:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                               "typeString": "type(contract ProfileRegistry)"
                             }
                           },
-                          "id": 1297,
+                          "id": 2739,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "IdentityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4931,
-                          "src": "6552:29:5",
+                          "referencedDeclaration": 9497,
+                          "src": "6552:29:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                             "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                           }
                         },
-                        "id": 1298,
+                        "id": 2740,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8831,9 +8831,9 @@
                         "memberName": "ANONYMOUS",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6552:39:5",
+                        "src": "6552:39:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -8843,14 +8843,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1300,
+                            "id": 2742,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6613:1:5",
+                            "src": "6613:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -8866,20 +8866,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 1299,
+                          "id": 2741,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6605:7:5",
+                          "src": "6605:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 1301,
+                        "id": 2743,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8887,7 +8887,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6605:10:5",
+                        "src": "6605:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -8899,14 +8899,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1303,
+                            "id": 2745,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6637:1:5",
+                            "src": "6637:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -8922,20 +8922,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 1302,
+                          "id": 2744,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6629:7:5",
+                          "src": "6629:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_bytes32_$",
                             "typeString": "type(bytes32)"
                           },
                           "typeName": "bytes32"
                         },
-                        "id": 1304,
+                        "id": 2746,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8943,7 +8943,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6629:10:5",
+                        "src": "6629:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -8953,26 +8953,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1305,
+                          "id": 2747,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6653:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6653:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1306,
+                        "id": 2748,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "6653:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "6653:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -8982,7 +8982,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
                         {
@@ -9002,7 +9002,7 @@
                           "typeString": "bool[] memory"
                         },
                         {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
                         {
@@ -9018,18 +9018,18 @@
                           "typeString": "uint64[] memory"
                         }
                       ],
-                      "id": 1284,
+                      "id": 2726,
                       "name": "PlaceOrder",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1139,
-                      "src": "6383:10:5",
+                      "referencedDeclaration": 2581,
+                      "src": "6383:10:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$726_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$4931_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$2168_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
                         "typeString": "function (enum Market.OrderType,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory) returns (uint256)"
                       }
                     },
-                    "id": 1307,
+                    "id": 2749,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9037,15 +9037,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6383:285:5",
+                    "src": "6383:285:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1308,
+                  "id": 2750,
                   "nodeType": "ExpressionStatement",
-                  "src": "6383:285:5"
+                  "src": "6383:285:7"
                 },
                 {
                   "expression": {
@@ -9053,12 +9053,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1310,
+                        "id": 2752,
                         "name": "askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1201,
-                        "src": "6688:5:5",
+                        "referencedDeclaration": 2643,
+                        "src": "6688:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9069,18 +9069,18 @@
                         "arguments": [],
                         "expression": {
                           "argumentTypes": [],
-                          "id": 1311,
+                          "id": 2753,
                           "name": "GetOrdersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2910,
-                          "src": "6695:15:5",
+                          "referencedDeclaration": 4352,
+                          "src": "6695:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                             "typeString": "function () view returns (uint256)"
                           }
                         },
-                        "id": 1312,
+                        "id": 2754,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9088,7 +9088,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6695:17:5",
+                        "src": "6695:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9106,18 +9106,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1309,
+                      "id": 2751,
                       "name": "OpenDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1743,
-                      "src": "6679:8:5",
+                      "referencedDeclaration": 3185,
+                      "src": "6679:8:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 1313,
+                    "id": 2755,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9125,57 +9125,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6679:34:5",
+                    "src": "6679:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1314,
+                  "id": 2756,
                   "nodeType": "ExpressionStatement",
-                  "src": "6679:34:5"
+                  "src": "6679:34:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1316,
+            "id": 2758,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1206,
+                "id": 2648,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1205,
+                  "id": 2647,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "5900:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "5900:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5900:13:5"
+                "src": "5900:13:7"
               }
             ],
             "name": "QuickBuy",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1204,
+              "id": 2646,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1201,
+                  "id": 2643,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "5860:10:5",
+                  "scope": 2758,
+                  "src": "5860:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9183,10 +9183,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1200,
+                    "id": 2642,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5860:4:5",
+                    "src": "5860:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9197,11 +9197,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1203,
+                  "id": 2645,
                   "name": "buyoutDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "5872:19:5",
+                  "scope": 2758,
+                  "src": "5872:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9209,10 +9209,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1202,
+                    "id": 2644,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5872:4:5",
+                    "src": "5872:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9222,54 +9222,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5859:33:5"
+              "src": "5859:33:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1207,
+              "id": 2649,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5914:0:5"
+              "src": "5914:0:7"
             },
-            "scope": 3787,
-            "src": "5842:878:5",
+            "scope": 5229,
+            "src": "5842:878:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1742,
+              "id": 3184,
               "nodeType": "Block",
-              "src": "6814:2981:5",
+              "src": "6814:2981:7",
               "statements": [
                 {
                   "assignments": [
-                    1326
+                    2768
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1326,
+                      "id": 2768,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "6824:16:5",
+                      "scope": 3185,
+                      "src": "6824:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1325,
+                        "id": 2767,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "6824:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "6824:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -9277,31 +9277,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1330,
+                  "id": 2772,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1327,
+                      "id": 2769,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "6843:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "6843:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1329,
+                    "id": 2771,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1328,
+                      "id": 2770,
                       "name": "_askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1318,
-                      "src": "6850:6:5",
+                      "referencedDeclaration": 2760,
+                      "src": "6850:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9312,42 +9312,42 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6843:14:5",
+                    "src": "6843:14:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6824:33:5"
+                  "src": "6824:33:7"
                 },
                 {
                   "assignments": [
-                    1332
+                    2774
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1332,
+                      "id": 2774,
                       "name": "bid",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "6867:16:5",
+                      "scope": 3185,
+                      "src": "6867:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1331,
+                        "id": 2773,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "6867:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "6867:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -9355,31 +9355,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1336,
+                  "id": 2778,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1333,
+                      "id": 2775,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "6886:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "6886:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1335,
+                    "id": 2777,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1334,
+                      "id": 2776,
                       "name": "_bidID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1320,
-                      "src": "6893:6:5",
+                      "referencedDeclaration": 2762,
+                      "src": "6893:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9390,14 +9390,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6886:14:5",
+                    "src": "6886:14:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6867:33:5"
+                  "src": "6867:33:7"
                 },
                 {
                   "expression": {
@@ -9409,7 +9409,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1348,
+                        "id": 2790,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9417,10 +9417,10 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 1342,
+                          "id": 2784,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9429,28 +9429,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1338,
+                              "id": 2780,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "6919:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "6919:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1339,
+                            "id": 2781,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 774,
-                            "src": "6919:15:5",
+                            "referencedDeclaration": 2216,
+                            "src": "6919:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -9460,18 +9460,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1340,
+                              "id": 2782,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 730,
-                              "src": "6938:11:5",
+                              "referencedDeclaration": 2172,
+                              "src": "6938:11:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 1341,
+                            "id": 2783,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -9479,13 +9479,13 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6938:24:5",
+                            "src": "6938:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6919:43:5",
+                          "src": "6919:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -9496,10 +9496,10 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 1347,
+                          "id": 2789,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9508,28 +9508,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1343,
+                              "id": 2785,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "6966:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "6966:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1344,
+                            "id": 2786,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 774,
-                            "src": "6966:15:5",
+                            "referencedDeclaration": 2216,
+                            "src": "6966:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -9539,18 +9539,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1345,
+                              "id": 2787,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 730,
-                              "src": "6985:11:5",
+                              "referencedDeclaration": 2172,
+                              "src": "6985:11:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 1346,
+                            "id": 2788,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -9558,19 +9558,19 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6985:24:5",
+                            "src": "6985:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6966:43:5",
+                          "src": "6966:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6919:90:5",
+                        "src": "6919:90:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9584,21 +9584,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1337,
+                      "id": 2779,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6911:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6911:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1349,
+                    "id": 2791,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9606,15 +9606,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6911:99:5",
+                    "src": "6911:99:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1350,
+                  "id": 2792,
                   "nodeType": "ExpressionStatement",
-                  "src": "6911:99:5"
+                  "src": "6911:99:7"
                 },
                 {
                   "expression": {
@@ -9626,7 +9626,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1378,
+                        "id": 2820,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9640,7 +9640,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1363,
+                              "id": 2805,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -9651,7 +9651,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1355,
+                                "id": 2797,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -9660,26 +9660,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1352,
+                                    "id": 2794,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "7029:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "7029:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1353,
+                                  "id": 2795,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7029:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7029:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -9690,14 +9690,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "307830",
-                                  "id": 1354,
+                                  "id": 2796,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7049:3:5",
+                                  "src": "7049:3:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -9705,7 +9705,7 @@
                                   },
                                   "value": "0x0"
                                 },
-                                "src": "7029:23:5",
+                                "src": "7029:23:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -9719,7 +9719,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1362,
+                                "id": 2804,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -9728,26 +9728,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1356,
+                                    "id": 2798,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "7056:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "7056:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1357,
+                                  "id": 2799,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7056:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7056:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -9762,26 +9762,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1359,
+                                        "id": 2801,
                                         "name": "bid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1332,
-                                        "src": "7086:3:5",
+                                        "referencedDeclaration": 2774,
+                                        "src": "7086:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1360,
+                                      "id": 2802,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7086:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7086:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -9795,18 +9795,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1358,
+                                    "id": 2800,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7076:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7076:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1361,
+                                  "id": 2803,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -9814,33 +9814,33 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7076:21:5",
+                                  "src": "7076:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "7056:41:5",
+                                "src": "7056:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7029:68:5",
+                              "src": "7029:68:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 1364,
+                          "id": 2806,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "7028:70:5",
+                          "src": "7028:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -9857,7 +9857,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1376,
+                              "id": 2818,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -9868,7 +9868,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1368,
+                                "id": 2810,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -9877,26 +9877,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1365,
+                                    "id": 2807,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7103:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7103:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1366,
+                                  "id": 2808,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7103:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7103:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -9907,14 +9907,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "307830",
-                                  "id": 1367,
+                                  "id": 2809,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7123:3:5",
+                                  "src": "7123:3:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -9922,7 +9922,7 @@
                                   },
                                   "value": "0x0"
                                 },
-                                "src": "7103:23:5",
+                                "src": "7103:23:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -9936,7 +9936,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1375,
+                                "id": 2817,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -9945,26 +9945,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1369,
+                                    "id": 2811,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7130:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7130:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1370,
+                                  "id": 2812,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7130:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7130:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -9979,26 +9979,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1372,
+                                        "id": 2814,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7160:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7160:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1373,
+                                      "id": 2815,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7160:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7160:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -10012,18 +10012,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1371,
+                                    "id": 2813,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7150:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7150:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1374,
+                                  "id": 2816,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -10031,39 +10031,39 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7150:21:5",
+                                  "src": "7150:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "7130:41:5",
+                                "src": "7130:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7103:68:5",
+                              "src": "7103:68:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 1377,
+                          "id": 2819,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "7102:70:5",
+                          "src": "7102:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7028:144:5",
+                        "src": "7028:144:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10077,21 +10077,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1351,
+                      "id": 2793,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7020:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7020:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1379,
+                    "id": 2821,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10099,15 +10099,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7020:153:5",
+                    "src": "7020:153:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1380,
+                  "id": 2822,
                   "nodeType": "ExpressionStatement",
-                  "src": "7020:153:5"
+                  "src": "7020:153:7"
                 },
                 {
                   "expression": {
@@ -10116,10 +10116,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1386,
+                        "id": 2828,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10128,28 +10128,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1382,
+                            "id": 2824,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7191:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7191:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1383,
+                          "id": 2825,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "7191:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "7191:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -10159,18 +10159,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1384,
+                            "id": 2826,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "7208:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "7208:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1385,
+                          "id": 2827,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10178,13 +10178,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7208:19:5",
+                          "src": "7208:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7191:36:5",
+                        "src": "7191:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10198,21 +10198,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1381,
+                      "id": 2823,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7183:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7183:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1387,
+                    "id": 2829,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10220,15 +10220,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7183:45:5",
+                    "src": "7183:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1388,
+                  "id": 2830,
                   "nodeType": "ExpressionStatement",
-                  "src": "7183:45:5"
+                  "src": "7183:45:7"
                 },
                 {
                   "expression": {
@@ -10237,10 +10237,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1394,
+                        "id": 2836,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10249,28 +10249,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1390,
+                            "id": 2832,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7246:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7246:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1391,
+                          "id": 2833,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "7246:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "7246:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -10280,18 +10280,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1392,
+                            "id": 2834,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "7263:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "7263:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1393,
+                          "id": 2835,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10299,13 +10299,13 @@
                           "memberName": "ORDER_BID",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7263:19:5",
+                          "src": "7263:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7246:36:5",
+                        "src": "7246:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10319,21 +10319,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1389,
+                      "id": 2831,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7238:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7238:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1395,
+                    "id": 2837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10341,15 +10341,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7238:45:5",
+                    "src": "7238:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1396,
+                  "id": 2838,
                   "nodeType": "ExpressionStatement",
-                  "src": "7238:45:5"
+                  "src": "7238:45:7"
                 },
                 {
                   "expression": {
@@ -10361,7 +10361,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1472,
+                        "id": 2914,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10372,7 +10372,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1462,
+                          "id": 2904,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10383,7 +10383,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 1450,
+                            "id": 2892,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -10394,7 +10394,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1440,
+                              "id": 2882,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -10405,7 +10405,7 @@
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 },
-                                "id": 1430,
+                                "id": 2872,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10416,7 +10416,7 @@
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   },
-                                  "id": 1418,
+                                  "id": 2860,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -10427,7 +10427,7 @@
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     },
-                                    "id": 1408,
+                                    "id": 2850,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10439,26 +10439,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1400,
+                                            "id": 2842,
                                             "name": "bid",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1332,
-                                            "src": "7323:3:5",
+                                            "referencedDeclaration": 2774,
+                                            "src": "7323:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1401,
+                                          "id": 2843,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blacklist",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 789,
-                                          "src": "7323:13:5",
+                                          "referencedDeclaration": 2231,
+                                          "src": "7323:13:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -10471,26 +10471,26 @@
                                               "argumentTypes": null,
                                               "expression": {
                                                 "argumentTypes": null,
-                                                "id": 1403,
+                                                "id": 2845,
                                                 "name": "ask",
                                                 "nodeType": "Identifier",
                                                 "overloadedDeclarations": [],
-                                                "referencedDeclaration": 1326,
-                                                "src": "7348:3:5",
+                                                "referencedDeclaration": 2768,
+                                                "src": "7348:3:7",
                                                 "typeDescriptions": {
-                                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                                   "typeString": "struct Market.Order memory"
                                                 }
                                               },
-                                              "id": 1404,
+                                              "id": 2846,
                                               "isConstant": false,
                                               "isLValue": true,
                                               "isPure": false,
                                               "lValueRequested": false,
                                               "memberName": "author",
                                               "nodeType": "MemberAccess",
-                                              "referencedDeclaration": 776,
-                                              "src": "7348:10:5",
+                                              "referencedDeclaration": 2218,
+                                              "src": "7348:10:7",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
                                                 "typeString": "address"
@@ -10504,18 +10504,18 @@
                                                 "typeString": "address"
                                               }
                                             ],
-                                            "id": 1402,
+                                            "id": 2844,
                                             "name": "GetMaster",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2856,
-                                            "src": "7338:9:5",
+                                            "referencedDeclaration": 4298,
+                                            "src": "7338:9:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                               "typeString": "function (address) view returns (address)"
                                             }
                                           },
-                                          "id": 1405,
+                                          "id": 2847,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -10523,7 +10523,7 @@
                                           "lValueRequested": false,
                                           "names": [],
                                           "nodeType": "FunctionCall",
-                                          "src": "7338:21:5",
+                                          "src": "7338:21:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -10543,32 +10543,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1398,
+                                          "id": 2840,
                                           "name": "bl",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 875,
-                                          "src": "7314:2:5",
+                                          "referencedDeclaration": 2317,
+                                          "src": "7314:2:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$592",
+                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
                                             "typeString": "contract Blacklist"
                                           }
                                         },
-                                        "id": 1399,
+                                        "id": 2841,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "Check",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 460,
-                                        "src": "7314:8:5",
+                                        "referencedDeclaration": 1029,
+                                        "src": "7314:8:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                           "typeString": "function (address,address) view external returns (bool)"
                                         }
                                       },
-                                      "id": 1406,
+                                      "id": 2848,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -10576,7 +10576,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "7314:46:5",
+                                      "src": "7314:46:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
                                         "typeString": "bool"
@@ -10587,14 +10587,14 @@
                                     "rightExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "66616c7365",
-                                      "id": 1407,
+                                      "id": 2849,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "bool",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "7364:5:5",
+                                      "src": "7364:5:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
@@ -10602,7 +10602,7 @@
                                       },
                                       "value": "false"
                                     },
-                                    "src": "7314:55:5",
+                                    "src": "7314:55:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -10616,7 +10616,7 @@
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     },
-                                    "id": 1417,
+                                    "id": 2859,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10628,26 +10628,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1411,
+                                            "id": 2853,
                                             "name": "bid",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1332,
-                                            "src": "7394:3:5",
+                                            "referencedDeclaration": 2774,
+                                            "src": "7394:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1412,
+                                          "id": 2854,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blacklist",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 789,
-                                          "src": "7394:13:5",
+                                          "referencedDeclaration": 2231,
+                                          "src": "7394:13:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -10657,26 +10657,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1413,
+                                            "id": 2855,
                                             "name": "ask",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1326,
-                                            "src": "7409:3:5",
+                                            "referencedDeclaration": 2768,
+                                            "src": "7409:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1414,
+                                          "id": 2856,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "author",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 776,
-                                          "src": "7409:10:5",
+                                          "referencedDeclaration": 2218,
+                                          "src": "7409:10:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -10696,32 +10696,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1409,
+                                          "id": 2851,
                                           "name": "bl",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 875,
-                                          "src": "7385:2:5",
+                                          "referencedDeclaration": 2317,
+                                          "src": "7385:2:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$592",
+                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
                                             "typeString": "contract Blacklist"
                                           }
                                         },
-                                        "id": 1410,
+                                        "id": 2852,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "Check",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 460,
-                                        "src": "7385:8:5",
+                                        "referencedDeclaration": 1029,
+                                        "src": "7385:8:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                           "typeString": "function (address,address) view external returns (bool)"
                                         }
                                       },
-                                      "id": 1415,
+                                      "id": 2857,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -10729,7 +10729,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "7385:35:5",
+                                      "src": "7385:35:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
                                         "typeString": "bool"
@@ -10740,14 +10740,14 @@
                                     "rightExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "66616c7365",
-                                      "id": 1416,
+                                      "id": 2858,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "bool",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "7424:5:5",
+                                      "src": "7424:5:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
@@ -10755,13 +10755,13 @@
                                       },
                                       "value": "false"
                                     },
-                                    "src": "7385:44:5",
+                                    "src": "7385:44:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     }
                                   },
-                                  "src": "7314:115:5",
+                                  "src": "7314:115:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -10775,7 +10775,7 @@
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   },
-                                  "id": 1429,
+                                  "id": 2871,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -10787,26 +10787,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1421,
+                                          "id": 2863,
                                           "name": "bid",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1332,
-                                          "src": "7454:3:5",
+                                          "referencedDeclaration": 2774,
+                                          "src": "7454:3:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                             "typeString": "struct Market.Order memory"
                                           }
                                         },
-                                        "id": 1422,
+                                        "id": 2864,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "author",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 776,
-                                        "src": "7454:10:5",
+                                        "referencedDeclaration": 2218,
+                                        "src": "7454:10:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -10819,26 +10819,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 1424,
+                                              "id": 2866,
                                               "name": "ask",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 1326,
-                                              "src": "7476:3:5",
+                                              "referencedDeclaration": 2768,
+                                              "src": "7476:3:7",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                                 "typeString": "struct Market.Order memory"
                                               }
                                             },
-                                            "id": 1425,
+                                            "id": 2867,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "author",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 776,
-                                            "src": "7476:10:5",
+                                            "referencedDeclaration": 2218,
+                                            "src": "7476:10:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_address",
                                               "typeString": "address"
@@ -10852,18 +10852,18 @@
                                               "typeString": "address"
                                             }
                                           ],
-                                          "id": 1423,
+                                          "id": 2865,
                                           "name": "GetMaster",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2856,
-                                          "src": "7466:9:5",
+                                          "referencedDeclaration": 4298,
+                                          "src": "7466:9:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                             "typeString": "function (address) view returns (address)"
                                           }
                                         },
-                                        "id": 1426,
+                                        "id": 2868,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -10871,7 +10871,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "7466:21:5",
+                                        "src": "7466:21:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -10891,32 +10891,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1419,
+                                        "id": 2861,
                                         "name": "bl",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 875,
-                                        "src": "7445:2:5",
+                                        "referencedDeclaration": 2317,
+                                        "src": "7445:2:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Blacklist_$592",
+                                          "typeIdentifier": "t_contract$_Blacklist_$1161",
                                           "typeString": "contract Blacklist"
                                         }
                                       },
-                                      "id": 1420,
+                                      "id": 2862,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "Check",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 460,
-                                      "src": "7445:8:5",
+                                      "referencedDeclaration": 1029,
+                                      "src": "7445:8:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                         "typeString": "function (address,address) view external returns (bool)"
                                       }
                                     },
-                                    "id": 1427,
+                                    "id": 2869,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10924,7 +10924,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "7445:43:5",
+                                    "src": "7445:43:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -10935,14 +10935,14 @@
                                   "rightExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "66616c7365",
-                                    "id": 1428,
+                                    "id": 2870,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "bool",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "7492:5:5",
+                                    "src": "7492:5:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
@@ -10950,13 +10950,13 @@
                                     },
                                     "value": "false"
                                   },
-                                  "src": "7445:52:5",
+                                  "src": "7445:52:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "src": "7314:183:5",
+                                "src": "7314:183:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -10970,7 +10970,7 @@
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 },
-                                "id": 1439,
+                                "id": 2881,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10982,26 +10982,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1433,
+                                        "id": 2875,
                                         "name": "bid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1332,
-                                        "src": "7522:3:5",
+                                        "referencedDeclaration": 2774,
+                                        "src": "7522:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1434,
+                                      "id": 2876,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7522:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7522:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -11011,26 +11011,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1435,
+                                        "id": 2877,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7534:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7534:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1436,
+                                      "id": 2878,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7534:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7534:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -11050,32 +11050,32 @@
                                     ],
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1431,
+                                      "id": 2873,
                                       "name": "bl",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 875,
-                                      "src": "7513:2:5",
+                                      "referencedDeclaration": 2317,
+                                      "src": "7513:2:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                                         "typeString": "contract Blacklist"
                                       }
                                     },
-                                    "id": 1432,
+                                    "id": 2874,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "Check",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 460,
-                                    "src": "7513:8:5",
+                                    "referencedDeclaration": 1029,
+                                    "src": "7513:8:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                       "typeString": "function (address,address) view external returns (bool)"
                                     }
                                   },
-                                  "id": 1437,
+                                  "id": 2879,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -11083,7 +11083,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7513:32:5",
+                                  "src": "7513:32:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -11094,14 +11094,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "66616c7365",
-                                  "id": 1438,
+                                  "id": 2880,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "bool",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7549:5:5",
+                                  "src": "7549:5:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
@@ -11109,13 +11109,13 @@
                                   },
                                   "value": "false"
                                 },
-                                "src": "7513:41:5",
+                                "src": "7513:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7314:240:5",
+                              "src": "7314:240:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -11129,7 +11129,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1449,
+                              "id": 2891,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11141,26 +11141,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1443,
+                                      "id": 2885,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1326,
-                                      "src": "7579:3:5",
+                                      "referencedDeclaration": 2768,
+                                      "src": "7579:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1444,
+                                    "id": 2886,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blacklist",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 789,
-                                    "src": "7579:13:5",
+                                    "referencedDeclaration": 2231,
+                                    "src": "7579:13:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -11170,26 +11170,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1445,
+                                      "id": 2887,
                                       "name": "bid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1332,
-                                      "src": "7594:3:5",
+                                      "referencedDeclaration": 2774,
+                                      "src": "7594:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1446,
+                                    "id": 2888,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 776,
-                                    "src": "7594:10:5",
+                                    "referencedDeclaration": 2218,
+                                    "src": "7594:10:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -11209,32 +11209,32 @@
                                   ],
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1441,
+                                    "id": 2883,
                                     "name": "bl",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 875,
-                                    "src": "7570:2:5",
+                                    "referencedDeclaration": 2317,
+                                    "src": "7570:2:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                                       "typeString": "contract Blacklist"
                                     }
                                   },
-                                  "id": 1442,
+                                  "id": 2884,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "Check",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 460,
-                                  "src": "7570:8:5",
+                                  "referencedDeclaration": 1029,
+                                  "src": "7570:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                     "typeString": "function (address,address) view external returns (bool)"
                                   }
                                 },
-                                "id": 1447,
+                                "id": 2889,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11242,7 +11242,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "7570:35:5",
+                                "src": "7570:35:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -11253,14 +11253,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "66616c7365",
-                                "id": 1448,
+                                "id": 2890,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "7609:5:5",
+                                "src": "7609:5:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -11268,13 +11268,13 @@
                                 },
                                 "value": "false"
                               },
-                              "src": "7570:44:5",
+                              "src": "7570:44:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "7314:300:5",
+                            "src": "7314:300:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -11288,7 +11288,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 1461,
+                            "id": 2903,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -11303,26 +11303,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1454,
+                                        "id": 2896,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7649:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7649:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1455,
+                                      "id": 2897,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7649:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7649:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -11336,18 +11336,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1453,
+                                    "id": 2895,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7639:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7639:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1456,
+                                  "id": 2898,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -11355,7 +11355,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7639:21:5",
+                                  "src": "7639:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -11365,26 +11365,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1457,
+                                    "id": 2899,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7662:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7662:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1458,
+                                  "id": 2900,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "author",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 776,
-                                  "src": "7662:10:5",
+                                  "referencedDeclaration": 2218,
+                                  "src": "7662:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -11404,32 +11404,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1451,
+                                  "id": 2893,
                                   "name": "bl",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 875,
-                                  "src": "7630:2:5",
+                                  "referencedDeclaration": 2317,
+                                  "src": "7630:2:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Blacklist_$592",
+                                    "typeIdentifier": "t_contract$_Blacklist_$1161",
                                     "typeString": "contract Blacklist"
                                   }
                                 },
-                                "id": 1452,
+                                "id": 2894,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "Check",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 460,
-                                "src": "7630:8:5",
+                                "referencedDeclaration": 1029,
+                                "src": "7630:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                   "typeString": "function (address,address) view external returns (bool)"
                                 }
                               },
-                              "id": 1459,
+                              "id": 2901,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11437,7 +11437,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "7630:43:5",
+                              "src": "7630:43:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -11448,14 +11448,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "66616c7365",
-                              "id": 1460,
+                              "id": 2902,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "bool",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "7677:5:5",
+                              "src": "7677:5:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
@@ -11463,13 +11463,13 @@
                               },
                               "value": "false"
                             },
-                            "src": "7630:52:5",
+                            "src": "7630:52:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "7314:368:5",
+                          "src": "7314:368:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -11483,7 +11483,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1471,
+                          "id": 2913,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -11495,26 +11495,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1465,
+                                  "id": 2907,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "7707:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "7707:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1466,
+                                "id": 2908,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "7707:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "7707:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -11524,26 +11524,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1467,
+                                  "id": 2909,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "7719:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "7719:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1468,
+                                "id": 2910,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "7719:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "7719:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -11563,32 +11563,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1463,
+                                "id": 2905,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "7698:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "7698:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1464,
+                              "id": 2906,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "7698:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "7698:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1469,
+                            "id": 2911,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -11596,7 +11596,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "7698:32:5",
+                            "src": "7698:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -11607,14 +11607,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1470,
+                            "id": 2912,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "7734:5:5",
+                            "src": "7734:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -11622,13 +11622,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "7698:41:5",
+                          "src": "7698:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7314:425:5",
+                        "src": "7314:425:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11642,21 +11642,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1397,
+                      "id": 2839,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7293:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7293:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1473,
+                    "id": 2915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11664,15 +11664,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7293:447:5",
+                    "src": "7293:447:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1474,
+                  "id": 2916,
                   "nodeType": "ExpressionStatement",
-                  "src": "7293:447:5"
+                  "src": "7293:447:7"
                 },
                 {
                   "expression": {
@@ -11684,7 +11684,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1480,
+                        "id": 2922,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11693,26 +11693,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1476,
+                            "id": 2918,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7758:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7758:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1477,
+                          "id": 2919,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "7758:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "7758:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11724,32 +11724,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1478,
+                            "id": 2920,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7771:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7771:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1479,
+                          "id": 2921,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "7771:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "7771:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7758:22:5",
+                        "src": "7758:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11763,21 +11763,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1475,
+                      "id": 2917,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7750:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7750:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1481,
+                    "id": 2923,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11785,15 +11785,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7750:31:5",
+                    "src": "7750:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1482,
+                  "id": 2924,
                   "nodeType": "ExpressionStatement",
-                  "src": "7750:31:5"
+                  "src": "7750:31:7"
                 },
                 {
                   "expression": {
@@ -11805,7 +11805,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1488,
+                        "id": 2930,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11814,26 +11814,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1484,
+                            "id": 2926,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7799:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7799:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1485,
+                          "id": 2927,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "7799:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "7799:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11845,32 +11845,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1486,
+                            "id": 2928,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7815:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7815:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1487,
+                          "id": 2929,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "7815:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "7815:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7799:28:5",
+                        "src": "7799:28:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11884,21 +11884,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1483,
+                      "id": 2925,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7791:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7791:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1489,
+                    "id": 2931,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11906,15 +11906,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7791:37:5",
+                    "src": "7791:37:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1490,
+                  "id": 2932,
                   "nodeType": "ExpressionStatement",
-                  "src": "7791:37:5"
+                  "src": "7791:37:7"
                 },
                 {
                   "expression": {
@@ -11923,10 +11923,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1499,
+                        "id": 2941,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11938,26 +11938,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1494,
+                                "id": 2936,
                                 "name": "bid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1332,
-                                "src": "7896:3:5",
+                                "referencedDeclaration": 2774,
+                                "src": "7896:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1495,
+                              "id": 2937,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 776,
-                              "src": "7896:10:5",
+                              "referencedDeclaration": 2218,
+                              "src": "7896:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11973,32 +11973,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1492,
+                              "id": 2934,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "7877:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "7877:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1493,
+                            "id": 2935,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "7877:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "7877:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1496,
+                          "id": 2938,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12006,9 +12006,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7877:30:5",
+                          "src": "7877:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -12018,32 +12018,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1497,
+                            "id": 2939,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7911:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7911:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1498,
+                          "id": 2940,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "7911:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "7911:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7877:51:5",
+                        "src": "7877:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12057,21 +12057,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1491,
+                      "id": 2933,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7869:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7869:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1500,
+                    "id": 2942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12079,15 +12079,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7869:60:5",
+                    "src": "7869:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1501,
+                  "id": 2943,
                   "nodeType": "ExpressionStatement",
-                  "src": "7869:60:5"
+                  "src": "7869:60:7"
                 },
                 {
                   "expression": {
@@ -12096,10 +12096,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1510,
+                        "id": 2952,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12111,26 +12111,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1505,
+                                "id": 2947,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1326,
-                                "src": "7966:3:5",
+                                "referencedDeclaration": 2768,
+                                "src": "7966:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1506,
+                              "id": 2948,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 776,
-                              "src": "7966:10:5",
+                              "referencedDeclaration": 2218,
+                              "src": "7966:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12146,32 +12146,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1503,
+                              "id": 2945,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "7947:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "7947:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1504,
+                            "id": 2946,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "7947:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "7947:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1507,
+                          "id": 2949,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12179,9 +12179,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7947:30:5",
+                          "src": "7947:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -12191,32 +12191,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1508,
+                            "id": 2950,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7981:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7981:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1509,
+                          "id": 2951,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "7981:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "7981:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7947:51:5",
+                        "src": "7947:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12230,21 +12230,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1502,
+                      "id": 2944,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7939:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7939:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1511,
+                    "id": 2953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12252,15 +12252,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7939:60:5",
+                    "src": "7939:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1512,
+                  "id": 2954,
                   "nodeType": "ExpressionStatement",
-                  "src": "7939:60:5"
+                  "src": "7939:60:7"
                 },
                 {
                   "condition": {
@@ -12269,7 +12269,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1517,
+                    "id": 2959,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12280,32 +12280,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1513,
+                          "id": 2955,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8014:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8014:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1514,
+                        "id": 2956,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8014:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8014:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1515,
+                      "id": 2957,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12313,7 +12313,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8014:19:5",
+                      "src": "8014:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12323,36 +12323,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1516,
+                      "id": 2958,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "8036:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "8036:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8014:38:5",
+                    "src": "8014:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1528,
+                  "id": 2970,
                   "nodeType": "IfStatement",
-                  "src": "8010:112:5",
+                  "src": "8010:112:7",
                   "trueBody": {
-                    "id": 1527,
+                    "id": 2969,
                     "nodeType": "Block",
-                    "src": "8054:68:5",
+                    "src": "8054:68:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1525,
+                          "id": 2967,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12361,26 +12361,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1518,
+                              "id": 2960,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "8068:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "8068:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1520,
+                            "id": 2962,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 785,
-                            "src": "8068:12:5",
+                            "referencedDeclaration": 2227,
+                            "src": "8068:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -12395,26 +12395,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1522,
+                                  "id": 2964,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8098:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8098:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1523,
+                                "id": 2965,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 785,
-                                "src": "8098:12:5",
+                                "referencedDeclaration": 2227,
+                                "src": "8098:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -12428,18 +12428,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 1521,
+                              "id": 2963,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3648,
-                              "src": "8083:14:5",
+                              "referencedDeclaration": 5090,
+                              "src": "8083:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 1524,
+                            "id": 2966,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12447,21 +12447,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8083:28:5",
+                            "src": "8083:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8068:43:5",
+                          "src": "8068:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 1526,
+                        "id": 2968,
                         "nodeType": "ExpressionStatement",
-                        "src": "8068:43:5"
+                        "src": "8068:43:7"
                       }
                     ]
                   }
@@ -12473,7 +12473,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1533,
+                    "id": 2975,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12484,32 +12484,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1529,
+                          "id": 2971,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1332,
-                          "src": "8136:3:5",
+                          "referencedDeclaration": 2774,
+                          "src": "8136:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1530,
+                        "id": 2972,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8136:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8136:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1531,
+                      "id": 2973,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12517,7 +12517,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8136:19:5",
+                      "src": "8136:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12527,36 +12527,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1532,
+                      "id": 2974,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "8158:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "8158:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8136:38:5",
+                    "src": "8136:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1544,
+                  "id": 2986,
                   "nodeType": "IfStatement",
-                  "src": "8132:112:5",
+                  "src": "8132:112:7",
                   "trueBody": {
-                    "id": 1543,
+                    "id": 2985,
                     "nodeType": "Block",
-                    "src": "8176:68:5",
+                    "src": "8176:68:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1541,
+                          "id": 2983,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12565,26 +12565,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1534,
+                              "id": 2976,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "8190:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "8190:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1536,
+                            "id": 2978,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 785,
-                            "src": "8190:12:5",
+                            "referencedDeclaration": 2227,
+                            "src": "8190:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -12599,26 +12599,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1538,
+                                  "id": 2980,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8220:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8220:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1539,
+                                "id": 2981,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 785,
-                                "src": "8220:12:5",
+                                "referencedDeclaration": 2227,
+                                "src": "8220:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -12632,18 +12632,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 1537,
+                              "id": 2979,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3648,
-                              "src": "8205:14:5",
+                              "referencedDeclaration": 5090,
+                              "src": "8205:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 1540,
+                            "id": 2982,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12651,30 +12651,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8205:28:5",
+                            "src": "8205:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8190:43:5",
+                          "src": "8190:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 1542,
+                        "id": 2984,
                         "nodeType": "ExpressionStatement",
-                        "src": "8190:43:5"
+                        "src": "8190:43:7"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 1570,
+                    "id": 3012,
                     "nodeType": "Block",
-                    "src": "8301:207:5",
+                    "src": "8301:207:7",
                     "statements": [
                       {
                         "expression": {
@@ -12686,14 +12686,14 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1567,
+                              "id": 3009,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 1562,
+                                "id": 3004,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -12701,47 +12701,47 @@
                                 "nodeType": "UnaryOperation",
                                 "operator": "!",
                                 "prefix": true,
-                                "src": "8461:16:5",
+                                "src": "8461:16:7",
                                 "subExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1558,
+                                      "id": 3000,
                                       "name": "bid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1332,
-                                      "src": "8462:3:5",
+                                      "referencedDeclaration": 2774,
+                                      "src": "8462:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1559,
+                                    "id": 3001,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "netflags",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 785,
-                                    "src": "8462:12:5",
+                                    "referencedDeclaration": 2227,
+                                    "src": "8462:12:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                       "typeString": "bool[] memory"
                                     }
                                   },
-                                  "id": 1561,
+                                  "id": 3003,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1560,
+                                    "id": 3002,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1546,
-                                    "src": "8475:1:5",
+                                    "referencedDeclaration": 2988,
+                                    "src": "8475:1:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -12752,7 +12752,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "8462:15:5",
+                                  "src": "8462:15:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -12771,40 +12771,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1563,
+                                    "id": 3005,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "8481:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "8481:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1564,
+                                  "id": 3006,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "netflags",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 785,
-                                  "src": "8481:12:5",
+                                  "referencedDeclaration": 2227,
+                                  "src": "8481:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                     "typeString": "bool[] memory"
                                   }
                                 },
-                                "id": 1566,
+                                "id": 3008,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1565,
+                                  "id": 3007,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8494:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8494:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -12815,13 +12815,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8481:15:5",
+                                "src": "8481:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "8461:35:5",
+                              "src": "8461:35:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -12835,21 +12835,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1557,
+                            "id": 2999,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "8453:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "8453:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1568,
+                          "id": 3010,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12857,15 +12857,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8453:44:5",
+                          "src": "8453:44:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1569,
+                        "id": 3011,
                         "nodeType": "ExpressionStatement",
-                        "src": "8453:44:5"
+                        "src": "8453:44:7"
                       }
                     ]
                   },
@@ -12875,19 +12875,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1553,
+                    "id": 2995,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1549,
+                      "id": 2991,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1546,
-                      "src": "8271:1:5",
+                      "referencedDeclaration": 2988,
+                      "src": "8271:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12901,32 +12901,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1550,
+                          "id": 2992,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8275:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8275:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1551,
+                        "id": 2993,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8275:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8275:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1552,
+                      "id": 2994,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12934,31 +12934,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8275:19:5",
+                      "src": "8275:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8271:23:5",
+                    "src": "8271:23:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1571,
+                  "id": 3013,
                   "initializationExpression": {
                     "assignments": [
-                      1546
+                      2988
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 1546,
+                        "id": 2988,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 1743,
-                        "src": "8259:6:5",
+                        "scope": 3185,
+                        "src": "8259:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -12966,10 +12966,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 1545,
+                          "id": 2987,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "8259:4:5",
+                          "src": "8259:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -12979,18 +12979,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 1548,
+                    "id": 2990,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1547,
+                      "id": 2989,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "8268:1:5",
+                      "src": "8268:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -12999,12 +12999,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "8259:10:5"
+                    "src": "8259:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1555,
+                      "id": 2997,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13012,15 +13012,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8296:3:5",
+                      "src": "8296:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1554,
+                        "id": 2996,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8296:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8296:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13031,12 +13031,12 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1556,
+                    "id": 2998,
                     "nodeType": "ExpressionStatement",
-                    "src": "8296:3:5"
+                    "src": "8296:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8254:254:5"
+                  "src": "8254:254:7"
                 },
                 {
                   "condition": {
@@ -13045,7 +13045,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1576,
+                    "id": 3018,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13056,32 +13056,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1572,
+                          "id": 3014,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8522:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8522:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1573,
+                        "id": 3015,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8522:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8522:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1574,
+                      "id": 3016,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13089,7 +13089,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8522:21:5",
+                      "src": "8522:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13099,36 +13099,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1575,
+                      "id": 3017,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "8546:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "8546:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8522:42:5",
+                    "src": "8522:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1587,
+                  "id": 3029,
                   "nodeType": "IfStatement",
-                  "src": "8518:122:5",
+                  "src": "8518:122:7",
                   "trueBody": {
-                    "id": 1586,
+                    "id": 3028,
                     "nodeType": "Block",
-                    "src": "8566:74:5",
+                    "src": "8566:74:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1584,
+                          "id": 3026,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13137,26 +13137,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1577,
+                              "id": 3019,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "8580:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "8580:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1579,
+                            "id": 3021,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 794,
-                            "src": "8580:14:5",
+                            "referencedDeclaration": 2236,
+                            "src": "8580:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -13171,26 +13171,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1581,
+                                  "id": 3023,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8614:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8614:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1582,
+                                "id": 3024,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 794,
-                                "src": "8614:14:5",
+                                "referencedDeclaration": 2236,
+                                "src": "8614:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -13204,18 +13204,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 1580,
+                              "id": 3022,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3605,
-                              "src": "8597:16:5",
+                              "referencedDeclaration": 5047,
+                              "src": "8597:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 1583,
+                            "id": 3025,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -13223,21 +13223,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8597:32:5",
+                            "src": "8597:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8580:49:5",
+                          "src": "8580:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 1585,
+                        "id": 3027,
                         "nodeType": "ExpressionStatement",
-                        "src": "8580:49:5"
+                        "src": "8580:49:7"
                       }
                     ]
                   }
@@ -13249,7 +13249,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1592,
+                    "id": 3034,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13260,32 +13260,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1588,
+                          "id": 3030,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1332,
-                          "src": "8654:3:5",
+                          "referencedDeclaration": 2774,
+                          "src": "8654:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1589,
+                        "id": 3031,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8654:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8654:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1590,
+                      "id": 3032,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13293,7 +13293,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8654:21:5",
+                      "src": "8654:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13303,36 +13303,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1591,
+                      "id": 3033,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "8678:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "8678:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8654:42:5",
+                    "src": "8654:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1603,
+                  "id": 3045,
                   "nodeType": "IfStatement",
-                  "src": "8650:122:5",
+                  "src": "8650:122:7",
                   "trueBody": {
-                    "id": 1602,
+                    "id": 3044,
                     "nodeType": "Block",
-                    "src": "8698:74:5",
+                    "src": "8698:74:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1600,
+                          "id": 3042,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13341,26 +13341,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1593,
+                              "id": 3035,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "8712:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "8712:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1595,
+                            "id": 3037,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 794,
-                            "src": "8712:14:5",
+                            "referencedDeclaration": 2236,
+                            "src": "8712:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -13375,26 +13375,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1597,
+                                  "id": 3039,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "8746:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "8746:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1598,
+                                "id": 3040,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 794,
-                                "src": "8746:14:5",
+                                "referencedDeclaration": 2236,
+                                "src": "8746:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -13408,18 +13408,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 1596,
+                              "id": 3038,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3605,
-                              "src": "8729:16:5",
+                              "referencedDeclaration": 5047,
+                              "src": "8729:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 1599,
+                            "id": 3041,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -13427,30 +13427,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8729:32:5",
+                            "src": "8729:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8712:49:5",
+                          "src": "8712:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 1601,
+                        "id": 3043,
                         "nodeType": "ExpressionStatement",
-                        "src": "8712:49:5"
+                        "src": "8712:49:7"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 1628,
+                    "id": 3070,
                     "nodeType": "Block",
-                    "src": "8826:72:5",
+                    "src": "8826:72:7",
                     "statements": [
                       {
                         "expression": {
@@ -13462,7 +13462,7 @@
                                 "typeIdentifier": "t_uint64",
                                 "typeString": "uint64"
                               },
-                              "id": 1625,
+                              "id": 3067,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -13473,40 +13473,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1617,
+                                    "id": 3059,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "8848:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "8848:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1618,
+                                  "id": 3060,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 794,
-                                  "src": "8848:14:5",
+                                  "referencedDeclaration": 2236,
+                                  "src": "8848:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1620,
+                                "id": 3062,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1619,
+                                  "id": 3061,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8863:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8863:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -13517,7 +13517,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8848:17:5",
+                                "src": "8848:17:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -13531,40 +13531,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1621,
+                                    "id": 3063,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "8869:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "8869:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1622,
+                                  "id": 3064,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 794,
-                                  "src": "8869:14:5",
+                                  "referencedDeclaration": 2236,
+                                  "src": "8869:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1624,
+                                "id": 3066,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1623,
+                                  "id": 3065,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8884:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8884:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -13575,13 +13575,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8869:17:5",
+                                "src": "8869:17:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
                                 }
                               },
-                              "src": "8848:38:5",
+                              "src": "8848:38:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -13595,21 +13595,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1616,
+                            "id": 3058,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "8840:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "8840:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1626,
+                          "id": 3068,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13617,15 +13617,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8840:47:5",
+                          "src": "8840:47:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1627,
+                        "id": 3069,
                         "nodeType": "ExpressionStatement",
-                        "src": "8840:47:5"
+                        "src": "8840:47:7"
                       }
                     ]
                   },
@@ -13635,19 +13635,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1612,
+                    "id": 3054,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1608,
+                      "id": 3050,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1546,
-                      "src": "8794:1:5",
+                      "referencedDeclaration": 2988,
+                      "src": "8794:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13661,32 +13661,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1609,
+                          "id": 3051,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8798:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8798:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1610,
+                        "id": 3052,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8798:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8798:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1611,
+                      "id": 3053,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13694,35 +13694,35 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8798:21:5",
+                      "src": "8798:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8794:25:5",
+                    "src": "8794:25:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1629,
+                  "id": 3071,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1606,
+                      "id": 3048,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 1604,
+                        "id": 3046,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8787:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8787:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13733,14 +13733,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 1605,
+                        "id": 3047,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "8791:1:5",
+                        "src": "8791:1:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -13748,20 +13748,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "8787:5:5",
+                      "src": "8787:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1607,
+                    "id": 3049,
                     "nodeType": "ExpressionStatement",
-                    "src": "8787:5:5"
+                    "src": "8787:5:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1614,
+                      "id": 3056,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13769,15 +13769,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8821:3:5",
+                      "src": "8821:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1613,
+                        "id": 3055,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8821:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8821:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13788,29 +13788,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1615,
+                    "id": 3057,
                     "nodeType": "ExpressionStatement",
-                    "src": "8821:3:5"
+                    "src": "8821:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8782:116:5"
+                  "src": "8782:116:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1635,
+                    "id": 3077,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1630,
+                      "id": 3072,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "8908:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "8908:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13824,14 +13824,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1633,
+                          "id": 3075,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "8936:1:5",
+                          "src": "8936:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -13849,32 +13849,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1631,
+                          "id": 3073,
                           "name": "dealAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 885,
-                          "src": "8921:10:5",
+                          "referencedDeclaration": 2327,
+                          "src": "8921:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1632,
+                        "id": 3074,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "8921:14:5",
+                        "referencedDeclaration": 10795,
+                        "src": "8921:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1634,
+                      "id": 3076,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13882,34 +13882,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "8921:17:5",
+                      "src": "8921:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8908:30:5",
+                    "src": "8908:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1636,
+                  "id": 3078,
                   "nodeType": "ExpressionStatement",
-                  "src": "8908:30:5"
+                  "src": "8908:30:7"
                 },
                 {
                   "assignments": [
-                    1638
+                    3080
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1638,
+                      "id": 3080,
                       "name": "master",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "8948:14:5",
+                      "scope": 3185,
+                      "src": "8948:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -13917,10 +13917,10 @@
                         "typeString": "address"
                       },
                       "typeName": {
-                        "id": 1637,
+                        "id": 3079,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "8948:7:5",
+                        "src": "8948:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13930,7 +13930,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1643,
+                  "id": 3085,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
@@ -13938,26 +13938,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1640,
+                          "id": 3082,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8975:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8975:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1641,
+                        "id": 3083,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 776,
-                        "src": "8975:10:5",
+                        "referencedDeclaration": 2218,
+                        "src": "8975:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13971,18 +13971,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1639,
+                      "id": 3081,
                       "name": "GetMaster",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2856,
-                      "src": "8965:9:5",
+                      "referencedDeclaration": 4298,
+                      "src": "8965:9:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                         "typeString": "function (address) view returns (address)"
                       }
                     },
-                    "id": 1642,
+                    "id": 3084,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13990,19 +13990,19 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "8965:21:5",
+                    "src": "8965:21:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "8948:38:5"
+                  "src": "8948:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1650,
+                    "id": 3092,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14013,26 +14013,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1644,
+                          "id": 3086,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "8996:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "8996:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1646,
+                        "id": 3088,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1645,
+                          "id": 3087,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9003:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9003:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14043,23 +14043,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "8996:14:5",
+                        "src": "8996:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1647,
+                      "id": 3089,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "8996:26:5",
+                      "referencedDeclaration": 2216,
+                      "src": "8996:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -14069,18 +14069,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1648,
+                        "id": 3090,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "9025:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "9025:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1649,
+                      "id": 3091,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -14088,26 +14088,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9025:26:5",
+                      "src": "9025:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "8996:55:5",
+                    "src": "8996:55:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1651,
+                  "id": 3093,
                   "nodeType": "ExpressionStatement",
-                  "src": "8996:55:5"
+                  "src": "8996:55:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1658,
+                    "id": 3100,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14118,26 +14118,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1652,
+                          "id": 3094,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9061:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9061:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1654,
+                        "id": 3096,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1653,
+                          "id": 3095,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9068:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9068:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14148,23 +14148,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9061:14:5",
+                        "src": "9061:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1655,
+                      "id": 3097,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "9061:26:5",
+                      "referencedDeclaration": 2216,
+                      "src": "9061:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -14174,18 +14174,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1656,
+                        "id": 3098,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "9090:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "9090:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1657,
+                      "id": 3099,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -14193,26 +14193,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9090:26:5",
+                      "src": "9090:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "9061:55:5",
+                    "src": "9061:55:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1659,
+                  "id": 3101,
                   "nodeType": "ExpressionStatement",
-                  "src": "9061:55:5"
+                  "src": "9061:55:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1665,
+                    "id": 3107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14223,26 +14223,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1660,
+                          "id": 3102,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9126:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9126:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1662,
+                        "id": 3104,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1661,
+                          "id": 3103,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9133:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9133:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14253,21 +14253,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9126:14:5",
+                        "src": "9126:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1663,
+                      "id": 3105,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 798,
-                      "src": "9126:21:5",
+                      "referencedDeclaration": 2240,
+                      "src": "9126:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14277,31 +14277,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1664,
+                      "id": 3106,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "9150:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "9150:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9126:34:5",
+                    "src": "9126:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1666,
+                  "id": 3108,
                   "nodeType": "ExpressionStatement",
-                  "src": "9126:34:5"
+                  "src": "9126:34:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1672,
+                    "id": 3114,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14312,26 +14312,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1667,
+                          "id": 3109,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9170:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9170:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1669,
+                        "id": 3111,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1668,
+                          "id": 3110,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9177:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9177:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14342,21 +14342,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9170:14:5",
+                        "src": "9170:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1670,
+                      "id": 3112,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 798,
-                      "src": "9170:21:5",
+                      "referencedDeclaration": 2240,
+                      "src": "9170:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14366,26 +14366,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1671,
+                      "id": 3113,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "9194:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "9194:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9170:34:5",
+                    "src": "9170:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1673,
+                  "id": 3115,
                   "nodeType": "ExpressionStatement",
-                  "src": "9170:34:5"
+                  "src": "9170:34:7"
                 },
                 {
                   "eventCall": {
@@ -14393,12 +14393,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1675,
+                        "id": 3117,
                         "name": "_askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1318,
-                        "src": "9233:6:5",
+                        "referencedDeclaration": 2760,
+                        "src": "9233:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14412,18 +14412,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1674,
+                      "id": 3116,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "9220:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "9220:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1676,
+                    "id": 3118,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14431,15 +14431,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9220:20:5",
+                    "src": "9220:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1677,
+                  "id": 3119,
                   "nodeType": "EmitStatement",
-                  "src": "9215:25:5"
+                  "src": "9215:25:7"
                 },
                 {
                   "eventCall": {
@@ -14447,12 +14447,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1679,
+                        "id": 3121,
                         "name": "_bidID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1320,
-                        "src": "9268:6:5",
+                        "referencedDeclaration": 2762,
+                        "src": "9268:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14466,18 +14466,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1678,
+                      "id": 3120,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "9255:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "9255:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1680,
+                    "id": 3122,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14485,28 +14485,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9255:20:5",
+                    "src": "9255:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1681,
+                  "id": 3123,
                   "nodeType": "EmitStatement",
-                  "src": "9250:25:5"
+                  "src": "9250:25:7"
                 },
                 {
                   "assignments": [
-                    1683
+                    3125
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1683,
+                      "id": 3125,
                       "name": "startTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9286:14:5",
+                      "scope": 3185,
+                      "src": "9286:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -14514,10 +14514,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1682,
+                        "id": 3124,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9286:4:5",
+                        "src": "9286:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14527,23 +14527,23 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1686,
+                  "id": 3128,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1684,
+                      "id": 3126,
                       "name": "block",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7759,
-                      "src": "9303:5:5",
+                      "referencedDeclaration": 11305,
+                      "src": "9303:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_block",
                         "typeString": "block"
                       }
                     },
-                    "id": 1685,
+                    "id": 3127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14551,27 +14551,27 @@
                     "memberName": "timestamp",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "9303:15:5",
+                    "src": "9303:15:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9286:32:5"
+                  "src": "9286:32:7"
                 },
                 {
                   "assignments": [
-                    1688
+                    3130
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1688,
+                      "id": 3130,
                       "name": "endTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9328:12:5",
+                      "scope": 3185,
+                      "src": "9328:12:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -14579,10 +14579,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1687,
+                        "id": 3129,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9328:4:5",
+                        "src": "9328:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14592,18 +14592,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1690,
+                  "id": 3132,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 1689,
+                    "id": 3131,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "9343:1:5",
+                    "src": "9343:1:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -14612,7 +14612,7 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9328:16:5"
+                  "src": "9328:16:7"
                 },
                 {
                   "condition": {
@@ -14621,7 +14621,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1694,
+                    "id": 3136,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14630,26 +14630,26 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1691,
+                        "id": 3133,
                         "name": "ask",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1326,
-                        "src": "9419:3:5",
+                        "referencedDeclaration": 2768,
+                        "src": "9419:3:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                           "typeString": "struct Market.Order memory"
                         }
                       },
-                      "id": 1692,
+                      "id": 3134,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 780,
-                      "src": "9419:12:5",
+                      "referencedDeclaration": 2222,
+                      "src": "9419:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14660,14 +14660,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1693,
+                      "id": 3135,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9435:1:5",
+                      "src": "9435:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -14675,37 +14675,37 @@
                       },
                       "value": "0"
                     },
-                    "src": "9419:17:5",
+                    "src": "9419:17:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1704,
+                  "id": 3146,
                   "nodeType": "IfStatement",
-                  "src": "9415:85:5",
+                  "src": "9415:85:7",
                   "trueBody": {
-                    "id": 1703,
+                    "id": 3145,
                     "nodeType": "Block",
-                    "src": "9438:62:5",
+                    "src": "9438:62:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1701,
+                          "id": 3143,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1695,
+                            "id": 3137,
                             "name": "endTime",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1688,
-                            "src": "9452:7:5",
+                            "referencedDeclaration": 3130,
+                            "src": "9452:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14720,26 +14720,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1698,
+                                  "id": 3140,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "9476:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "9476:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1699,
+                                "id": 3141,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "duration",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 780,
-                                "src": "9476:12:5",
+                                "referencedDeclaration": 2222,
+                                "src": "9476:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -14755,32 +14755,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1696,
+                                "id": 3138,
                                 "name": "startTime",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1683,
-                                "src": "9462:9:5",
+                                "referencedDeclaration": 3125,
+                                "src": "9462:9:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 1697,
+                              "id": 3139,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7249,
-                              "src": "9462:13:5",
+                              "referencedDeclaration": 10795,
+                              "src": "9462:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 1700,
+                            "id": 3142,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14788,37 +14788,37 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "9462:27:5",
+                            "src": "9462:27:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "9452:37:5",
+                          "src": "9452:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1702,
+                        "id": 3144,
                         "nodeType": "ExpressionStatement",
-                        "src": "9452:37:5"
+                        "src": "9452:37:7"
                       }
                     ]
                   }
                 },
                 {
                   "assignments": [
-                    1706
+                    3148
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1706,
+                      "id": 3148,
                       "name": "blockedBalance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9509:19:5",
+                      "scope": 3185,
+                      "src": "9509:19:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -14826,10 +14826,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1705,
+                        "id": 3147,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9509:4:5",
+                        "src": "9509:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14839,43 +14839,43 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1709,
+                  "id": 3151,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1707,
+                      "id": 3149,
                       "name": "bid",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1332,
-                      "src": "9531:3:5",
+                      "referencedDeclaration": 2774,
+                      "src": "9531:3:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "id": 1708,
+                    "id": 3150,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
                     "lValueRequested": false,
                     "memberName": "frozenSum",
                     "nodeType": "MemberAccess",
-                    "referencedDeclaration": 796,
-                    "src": "9531:13:5",
+                    "referencedDeclaration": 2238,
+                    "src": "9531:13:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9509:35:5"
+                  "src": "9509:35:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1736,
+                    "id": 3178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14884,26 +14884,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1710,
+                        "id": 3152,
                         "name": "deals",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 900,
-                        "src": "9554:5:5",
+                        "referencedDeclaration": 2342,
+                        "src": "9554:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                         }
                       },
-                      "id": 1712,
+                      "id": 3154,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1711,
+                        "id": 3153,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 885,
-                        "src": "9560:10:5",
+                        "referencedDeclaration": 2327,
+                        "src": "9560:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14914,9 +14914,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9554:17:5",
+                      "src": "9554:17:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                         "typeString": "struct Market.Deal storage ref"
                       }
                     },
@@ -14929,26 +14929,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1714,
+                            "id": 3156,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9579:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9579:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1715,
+                          "id": 3157,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "benchmarks",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 794,
-                          "src": "9579:14:5",
+                          "referencedDeclaration": 2236,
+                          "src": "9579:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
@@ -14958,26 +14958,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1716,
+                            "id": 3158,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9595:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9595:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1717,
+                          "id": 3159,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "9595:10:5",
+                          "referencedDeclaration": 2218,
+                          "src": "9595:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14987,26 +14987,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1718,
+                            "id": 3160,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "9607:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "9607:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1719,
+                          "id": 3161,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "9607:10:5",
+                          "referencedDeclaration": 2218,
+                          "src": "9607:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15014,12 +15014,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1720,
+                          "id": 3162,
                           "name": "master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1638,
-                          "src": "9619:6:5",
+                          "referencedDeclaration": 3080,
+                          "src": "9619:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15027,12 +15027,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1721,
+                          "id": 3163,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9627:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9627:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15040,12 +15040,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1722,
+                          "id": 3164,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9635:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9635:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15055,26 +15055,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1723,
+                            "id": 3165,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "9643:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "9643:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1724,
+                          "id": 3166,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "9643:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "9643:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15084,26 +15084,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1725,
+                            "id": 3167,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9657:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9657:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1726,
+                          "id": 3168,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "9657:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "9657:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15111,12 +15111,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1727,
+                          "id": 3169,
                           "name": "startTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1683,
-                          "src": "9668:9:5",
+                          "referencedDeclaration": 3125,
+                          "src": "9668:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15124,12 +15124,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1728,
+                          "id": 3170,
                           "name": "endTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1688,
-                          "src": "9679:7:5",
+                          "referencedDeclaration": 3130,
+                          "src": "9679:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15139,18 +15139,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1729,
+                            "id": 3171,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "9688:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "9688:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 1730,
+                          "id": 3172,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -15158,20 +15158,20 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9688:26:5",
+                          "src": "9688:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1731,
+                          "id": 3173,
                           "name": "blockedBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1706,
-                          "src": "9716:14:5",
+                          "referencedDeclaration": 3148,
+                          "src": "9716:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15180,14 +15180,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1732,
+                          "id": 3174,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9732:1:5",
+                          "src": "9732:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -15199,18 +15199,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1733,
+                            "id": 3175,
                             "name": "block",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7759,
-                            "src": "9735:5:5",
+                            "referencedDeclaration": 11305,
+                            "src": "9735:5:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_block",
                               "typeString": "block"
                             }
                           },
-                          "id": 1734,
+                          "id": 3176,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15218,7 +15218,7 @@
                           "memberName": "timestamp",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9735:15:5",
+                          "src": "9735:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15268,7 +15268,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           },
                           {
@@ -15284,18 +15284,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 1713,
+                        "id": 3155,
                         "name": "Deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 770,
-                        "src": "9574:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "9574:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Deal_$770_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Deal_$2212_storage_ptr_$",
                           "typeString": "type(struct Market.Deal storage pointer)"
                         }
                       },
-                      "id": 1735,
+                      "id": 3177,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -15303,21 +15303,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "9574:177:5",
+                      "src": "9574:177:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory",
                         "typeString": "struct Market.Deal memory"
                       }
                     },
-                    "src": "9554:197:5",
+                    "src": "9554:197:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
-                  "id": 1737,
+                  "id": 3179,
                   "nodeType": "ExpressionStatement",
-                  "src": "9554:197:5"
+                  "src": "9554:197:7"
                 },
                 {
                   "eventCall": {
@@ -15325,12 +15325,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1739,
+                        "id": 3181,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 885,
-                        "src": "9777:10:5",
+                        "referencedDeclaration": 2327,
+                        "src": "9777:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -15344,18 +15344,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1738,
+                      "id": 3180,
                       "name": "DealOpened",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 822,
-                      "src": "9766:10:5",
+                      "referencedDeclaration": 2264,
+                      "src": "9766:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1740,
+                    "id": 3182,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15363,57 +15363,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9766:22:5",
+                    "src": "9766:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1741,
+                  "id": 3183,
                   "nodeType": "EmitStatement",
-                  "src": "9761:27:5"
+                  "src": "9761:27:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1743,
+            "id": 3185,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1323,
+                "id": 2765,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1322,
+                  "id": 2764,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "6793:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "6793:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6793:13:5"
+                "src": "6793:13:7"
               }
             ],
             "name": "OpenDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1321,
+              "id": 2763,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1318,
+                  "id": 2760,
                   "name": "_askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1743,
-                  "src": "6767:11:5",
+                  "scope": 3185,
+                  "src": "6767:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15421,10 +15421,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1317,
+                    "id": 2759,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6767:4:5",
+                    "src": "6767:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15435,11 +15435,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1320,
+                  "id": 2762,
                   "name": "_bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1743,
-                  "src": "6780:11:5",
+                  "scope": 3185,
+                  "src": "6780:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15447,10 +15447,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1319,
+                    "id": 2761,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6780:4:5",
+                    "src": "6780:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15460,26 +15460,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6766:26:5"
+              "src": "6766:26:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1324,
+              "id": 2766,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6814:0:5"
+              "src": "6814:0:7"
             },
-            "scope": 3787,
-            "src": "6749:3046:5",
+            "scope": 5229,
+            "src": "6749:3046:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1833,
+              "id": 3275,
               "nodeType": "Block",
-              "src": "9883:573:5",
+              "src": "9883:573:7",
               "statements": [
                 {
                   "expression": {
@@ -15491,10 +15491,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 1759,
+                            "id": 3201,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15505,26 +15505,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1753,
+                                  "id": 3195,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "9902:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "9902:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1755,
+                                "id": 3197,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1754,
+                                  "id": 3196,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "9908:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "9908:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15535,23 +15535,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9902:13:5",
+                                "src": "9902:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1756,
+                              "id": 3198,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 763,
-                              "src": "9902:20:5",
+                              "referencedDeclaration": 2205,
+                              "src": "9902:20:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -15561,18 +15561,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1757,
+                                "id": 3199,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 722,
-                                "src": "9926:10:5",
+                                "referencedDeclaration": 2164,
+                                "src": "9926:10:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 1758,
+                              "id": 3200,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -15580,27 +15580,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9926:26:5",
+                              "src": "9926:26:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "9902:50:5",
+                            "src": "9902:50:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 1760,
+                        "id": 3202,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "9901:52:5",
+                        "src": "9901:52:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15614,21 +15614,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1752,
+                      "id": 3194,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "9893:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "9893:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1761,
+                    "id": 3203,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15636,15 +15636,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9893:61:5",
+                    "src": "9893:61:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1762,
+                  "id": 3204,
                   "nodeType": "ExpressionStatement",
-                  "src": "9893:61:5"
+                  "src": "9893:61:7"
                 },
                 {
                   "expression": {
@@ -15656,7 +15656,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1786,
+                        "id": 3228,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15667,7 +15667,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1778,
+                          "id": 3220,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15678,7 +15678,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1770,
+                            "id": 3212,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15687,18 +15687,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1764,
+                                "id": 3206,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "9972:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "9972:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1765,
+                              "id": 3207,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -15706,7 +15706,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9972:10:5",
+                              "src": "9972:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -15720,26 +15720,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1766,
+                                  "id": 3208,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "9986:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "9986:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1768,
+                                "id": 3210,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1767,
+                                  "id": 3209,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "9992:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "9992:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15750,27 +15750,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9986:13:5",
+                                "src": "9986:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1769,
+                              "id": 3211,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "9986:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "9986:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "9972:38:5",
+                            "src": "9972:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -15784,7 +15784,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1777,
+                            "id": 3219,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15793,18 +15793,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1771,
+                                "id": 3213,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10014:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10014:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1772,
+                              "id": 3214,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -15812,7 +15812,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10014:10:5",
+                              "src": "10014:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -15826,26 +15826,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1773,
+                                  "id": 3215,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10028:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10028:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1775,
+                                "id": 3217,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1774,
+                                  "id": 3216,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "10034:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "10034:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15856,33 +15856,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10028:13:5",
+                                "src": "10028:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1776,
+                              "id": 3218,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "10028:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "10028:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10014:38:5",
+                            "src": "10014:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "9972:80:5",
+                          "src": "9972:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -15896,7 +15896,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 1785,
+                          "id": 3227,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15905,18 +15905,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1779,
+                              "id": 3221,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "10056:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "10056:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1780,
+                            "id": 3222,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15924,7 +15924,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10056:10:5",
+                            "src": "10056:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -15938,26 +15938,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1781,
+                                "id": 3223,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "10070:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "10070:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 1783,
+                              "id": 3225,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1782,
+                                "id": 3224,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1745,
-                                "src": "10076:6:5",
+                                "referencedDeclaration": 3187,
+                                "src": "10076:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -15968,33 +15968,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10070:13:5",
+                              "src": "10070:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 1784,
+                            "id": 3226,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "10070:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "10070:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10056:36:5",
+                          "src": "10056:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "9972:120:5",
+                        "src": "9972:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -16008,21 +16008,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1763,
+                      "id": 3205,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "9964:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "9964:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1787,
+                    "id": 3229,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16030,15 +16030,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9964:129:5",
+                    "src": "9964:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1788,
+                  "id": 3230,
                   "nodeType": "ExpressionStatement",
-                  "src": "9964:129:5"
+                  "src": "9964:129:7"
                 },
                 {
                   "condition": {
@@ -16047,7 +16047,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1801,
+                    "id": 3243,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16056,18 +16056,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1789,
+                        "id": 3231,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "10108:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "10108:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 1790,
+                      "id": 3232,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16075,7 +16075,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "10108:15:5",
+                      "src": "10108:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -16092,26 +16092,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1796,
+                              "id": 3238,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10155:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10155:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1798,
+                            "id": 3240,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1797,
+                              "id": 3239,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1745,
-                              "src": "10161:6:5",
+                              "referencedDeclaration": 3187,
+                              "src": "10161:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -16122,21 +16122,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10155:13:5",
+                            "src": "10155:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1799,
+                          "id": 3241,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 755,
-                          "src": "10155:22:5",
+                          "referencedDeclaration": 2197,
+                          "src": "10155:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -16156,26 +16156,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1791,
+                              "id": 3233,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10127:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10127:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1793,
+                            "id": 3235,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1792,
+                              "id": 3234,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1745,
-                              "src": "10133:6:5",
+                              "referencedDeclaration": 3187,
+                              "src": "10133:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -16186,41 +16186,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10127:13:5",
+                            "src": "10127:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1794,
+                          "id": 3236,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 759,
-                          "src": "10127:23:5",
+                          "referencedDeclaration": 2201,
+                          "src": "10127:23:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1795,
+                        "id": 3237,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "10127:27:5",
+                        "referencedDeclaration": 10795,
+                        "src": "10127:27:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1800,
+                      "id": 3242,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16228,26 +16228,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "10127:51:5",
+                      "src": "10127:51:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10108:70:5",
+                    "src": "10108:70:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1813,
+                  "id": 3255,
                   "nodeType": "IfStatement",
-                  "src": "10104:177:5",
+                  "src": "10104:177:7",
                   "trueBody": {
-                    "id": 1812,
+                    "id": 3254,
                     "nodeType": "Block",
-                    "src": "10180:101:5",
+                    "src": "10180:101:7",
                     "statements": [
                       {
                         "expression": {
@@ -16259,7 +16259,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 1809,
+                              "id": 3251,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -16270,26 +16270,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 1803,
+                                    "id": 3245,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "10231:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "10231:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 1805,
+                                  "id": 3247,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1804,
+                                    "id": 3246,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1745,
-                                    "src": "10237:6:5",
+                                    "referencedDeclaration": 3187,
+                                    "src": "10237:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -16300,21 +16300,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "10231:13:5",
+                                  "src": "10231:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 1806,
+                                "id": 3248,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "10231:24:5",
+                                "referencedDeclaration": 2189,
+                                "src": "10231:24:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -16326,18 +16326,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1807,
+                                  "id": 3249,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "10259:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "10259:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1808,
+                                "id": 3250,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -16345,13 +16345,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "10259:10:5",
+                                "src": "10259:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "10231:38:5",
+                              "src": "10231:38:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -16365,21 +16365,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1802,
+                            "id": 3244,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "10223:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "10223:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1810,
+                          "id": 3252,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -16387,15 +16387,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10223:47:5",
+                          "src": "10223:47:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1811,
+                        "id": 3253,
                         "nodeType": "ExpressionStatement",
-                        "src": "10223:47:5"
+                        "src": "10223:47:7"
                       }
                     ]
                   }
@@ -16406,12 +16406,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1815,
+                        "id": 3257,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10305:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10305:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16419,14 +16419,14 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1816,
+                        "id": 3258,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1747,
-                        "src": "10313:11:5",
+                        "referencedDeclaration": 3189,
+                        "src": "10313:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       }
@@ -16438,22 +16438,22 @@
                           "typeString": "uint256"
                         },
                         {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       ],
-                      "id": 1814,
+                      "id": 3256,
                       "name": "AddToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3489,
-                      "src": "10290:14:5",
+                      "referencedDeclaration": 4931,
+                      "src": "10290:14:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$740_$returns$__$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2182_$returns$__$",
                         "typeString": "function (uint256,enum Market.BlacklistPerson)"
                       }
                     },
-                    "id": 1817,
+                    "id": 3259,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16461,15 +16461,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10290:35:5",
+                    "src": "10290:35:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1818,
+                  "id": 3260,
                   "nodeType": "ExpressionStatement",
-                  "src": "10290:35:5"
+                  "src": "10290:35:7"
                 },
                 {
                   "expression": {
@@ -16477,12 +16477,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1820,
+                        "id": 3262,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10348:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10348:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16496,18 +16496,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1819,
+                      "id": 3261,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3200,
-                      "src": "10335:12:5",
+                      "referencedDeclaration": 4642,
+                      "src": "10335:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1821,
+                    "id": 3263,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16515,15 +16515,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10335:20:5",
+                    "src": "10335:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1822,
+                  "id": 3264,
                   "nodeType": "ExpressionStatement",
-                  "src": "10335:20:5"
+                  "src": "10335:20:7"
                 },
                 {
                   "expression": {
@@ -16531,12 +16531,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1824,
+                        "id": 3266,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10383:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10383:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16550,18 +16550,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1823,
+                      "id": 3265,
                       "name": "InternalCloseDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3562,
-                      "src": "10365:17:5",
+                      "referencedDeclaration": 5004,
+                      "src": "10365:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1825,
+                    "id": 3267,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16569,15 +16569,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10365:25:5",
+                    "src": "10365:25:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1826,
+                  "id": 3268,
                   "nodeType": "ExpressionStatement",
-                  "src": "10365:25:5"
+                  "src": "10365:25:7"
                 },
                 {
                   "expression": {
@@ -16585,12 +16585,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1828,
+                        "id": 3270,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10421:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10421:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16604,18 +16604,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1827,
+                      "id": 3269,
                       "name": "RefundRemainingFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3386,
-                      "src": "10400:20:5",
+                      "referencedDeclaration": 4828,
+                      "src": "10400:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1829,
+                    "id": 3271,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16623,28 +16623,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10400:28:5",
+                    "src": "10400:28:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1830,
+                  "id": 3272,
                   "nodeType": "ExpressionStatement",
-                  "src": "10400:28:5"
+                  "src": "10400:28:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1831,
+                    "id": 3273,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10445:4:5",
+                    "src": "10445:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -16652,15 +16652,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1751,
-                  "id": 1832,
+                  "functionReturnParameters": 3193,
+                  "id": 3274,
                   "nodeType": "Return",
-                  "src": "10438:11:5"
+                  "src": "10438:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1834,
+            "id": 3276,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -16668,16 +16668,16 @@
             "name": "CloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1748,
+              "id": 3190,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1745,
+                  "id": 3187,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9820:11:5",
+                  "scope": 3276,
+                  "src": "9820:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16685,10 +16685,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1744,
+                    "id": 3186,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9820:4:5",
+                    "src": "9820:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16699,26 +16699,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 1747,
+                  "id": 3189,
                   "name": "blacklisted",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9833:27:5",
+                  "scope": 3276,
+                  "src": "9833:27:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 1746,
+                    "id": 3188,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 740,
-                    "src": "9833:15:5",
+                    "referencedDeclaration": 2182,
+                    "src": "9833:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -16726,20 +16726,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9819:42:5"
+              "src": "9819:42:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1751,
+              "id": 3193,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1750,
+                  "id": 3192,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9878:4:5",
+                  "scope": 3276,
+                  "src": "9878:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16747,10 +16747,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1749,
+                    "id": 3191,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9878:4:5",
+                    "src": "9878:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -16760,19 +16760,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9877:6:5"
+              "src": "9877:6:7"
             },
-            "scope": 3787,
-            "src": "9801:655:5",
+            "scope": 5229,
+            "src": "9801:655:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1851,
+              "id": 3293,
               "nodeType": "Block",
-              "src": "10510:98:5",
+              "src": "10510:98:7",
               "statements": [
                 {
                   "expression": {
@@ -16780,12 +16780,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1842,
+                        "id": 3284,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1836,
-                        "src": "10533:6:5",
+                        "referencedDeclaration": 3278,
+                        "src": "10533:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16799,18 +16799,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1841,
+                      "id": 3283,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3200,
-                      "src": "10520:12:5",
+                      "referencedDeclaration": 4642,
+                      "src": "10520:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1843,
+                    "id": 3285,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16818,15 +16818,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10520:20:5",
+                    "src": "10520:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1844,
+                  "id": 3286,
                   "nodeType": "ExpressionStatement",
-                  "src": "10520:20:5"
+                  "src": "10520:20:7"
                 },
                 {
                   "expression": {
@@ -16834,12 +16834,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1846,
+                        "id": 3288,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1836,
-                        "src": "10573:6:5",
+                        "referencedDeclaration": 3278,
+                        "src": "10573:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16853,18 +16853,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1845,
+                      "id": 3287,
                       "name": "ReserveNextPeriodFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3348,
-                      "src": "10550:22:5",
+                      "referencedDeclaration": 4790,
+                      "src": "10550:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1847,
+                    "id": 3289,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16872,28 +16872,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10550:30:5",
+                    "src": "10550:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1848,
+                  "id": 3290,
                   "nodeType": "ExpressionStatement",
-                  "src": "10550:30:5"
+                  "src": "10550:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1849,
+                    "id": 3291,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10597:4:5",
+                    "src": "10597:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -16901,15 +16901,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1840,
-                  "id": 1850,
+                  "functionReturnParameters": 3282,
+                  "id": 3292,
                   "nodeType": "Return",
-                  "src": "10590:11:5"
+                  "src": "10590:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1852,
+            "id": 3294,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -16917,16 +16917,16 @@
             "name": "Bill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1837,
+              "id": 3279,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1836,
+                  "id": 3278,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1852,
-                  "src": "10476:11:5",
+                  "scope": 3294,
+                  "src": "10476:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16934,10 +16934,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1835,
+                    "id": 3277,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10476:4:5",
+                    "src": "10476:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16947,20 +16947,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10475:13:5"
+              "src": "10475:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1840,
+              "id": 3282,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1839,
+                  "id": 3281,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1852,
-                  "src": "10505:4:5",
+                  "scope": 3294,
+                  "src": "10505:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16968,10 +16968,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1838,
+                    "id": 3280,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10505:4:5",
+                    "src": "10505:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -16981,19 +16981,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10504:6:5"
+              "src": "10504:6:7"
             },
-            "scope": 3787,
-            "src": "10462:146:5",
+            "scope": 5229,
+            "src": "10462:146:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2345,
+              "id": 3787,
               "nodeType": "Block",
-              "src": "10727:3974:5",
+              "src": "10727:3974:7",
               "statements": [
                 {
                   "expression": {
@@ -17005,7 +17005,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1886,
+                        "id": 3328,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -17016,7 +17016,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1878,
+                          "id": 3320,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17027,7 +17027,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1870,
+                            "id": 3312,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17036,18 +17036,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1864,
+                                "id": 3306,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10745:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10745:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1865,
+                              "id": 3307,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -17055,7 +17055,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10745:10:5",
+                              "src": "10745:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -17069,26 +17069,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1866,
+                                  "id": 3308,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10759:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10759:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1868,
+                                "id": 3310,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1867,
+                                  "id": 3309,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "10765:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "10765:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -17099,27 +17099,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10759:13:5",
+                                "src": "10759:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1869,
+                              "id": 3311,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "10759:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "10759:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10745:38:5",
+                            "src": "10745:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -17133,7 +17133,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1877,
+                            "id": 3319,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17142,18 +17142,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1871,
+                                "id": 3313,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10787:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10787:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1872,
+                              "id": 3314,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -17161,7 +17161,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10787:10:5",
+                              "src": "10787:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -17175,26 +17175,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1873,
+                                  "id": 3315,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10801:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10801:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1875,
+                                "id": 3317,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1874,
+                                  "id": 3316,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "10807:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "10807:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -17205,33 +17205,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10801:13:5",
+                                "src": "10801:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1876,
+                              "id": 3318,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 749,
-                              "src": "10801:22:5",
+                              "referencedDeclaration": 2191,
+                              "src": "10801:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10787:36:5",
+                            "src": "10787:36:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "10745:78:5",
+                          "src": "10745:78:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -17245,7 +17245,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 1885,
+                          "id": 3327,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17254,18 +17254,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1879,
+                              "id": 3321,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "10827:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "10827:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1880,
+                            "id": 3322,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17273,7 +17273,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10827:10:5",
+                            "src": "10827:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -17287,26 +17287,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1881,
+                                "id": 3323,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "10841:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "10841:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 1883,
+                              "id": 3325,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1882,
+                                "id": 3324,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "10847:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "10847:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17317,33 +17317,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10841:13:5",
+                              "src": "10841:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 1884,
+                            "id": 3326,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "supplierID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 745,
-                            "src": "10841:24:5",
+                            "referencedDeclaration": 2187,
+                            "src": "10841:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10827:38:5",
+                          "src": "10827:38:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10745:120:5",
+                        "src": "10745:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -17357,21 +17357,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1863,
+                      "id": 3305,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "10737:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "10737:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1887,
+                    "id": 3329,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17379,15 +17379,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10737:129:5",
+                    "src": "10737:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1888,
+                  "id": 3330,
                   "nodeType": "ExpressionStatement",
-                  "src": "10737:129:5"
+                  "src": "10737:129:7"
                 },
                 {
                   "expression": {
@@ -17396,10 +17396,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 1896,
+                        "id": 3338,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -17410,26 +17410,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1890,
+                              "id": 3332,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10884:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10884:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1892,
+                            "id": 3334,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1891,
+                              "id": 3333,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "10890:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "10890:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -17440,23 +17440,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10884:13:5",
+                            "src": "10884:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1893,
+                          "id": 3335,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 763,
-                          "src": "10884:20:5",
+                          "referencedDeclaration": 2205,
+                          "src": "10884:20:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -17466,18 +17466,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1894,
+                            "id": 3336,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "10908:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "10908:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 1895,
+                          "id": 3337,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -17485,13 +17485,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "10908:26:5",
+                          "src": "10908:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "10884:50:5",
+                        "src": "10884:50:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -17505,21 +17505,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1889,
+                      "id": 3331,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "10876:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "10876:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1897,
+                    "id": 3339,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17527,15 +17527,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10876:59:5",
+                    "src": "10876:59:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1898,
+                  "id": 3340,
                   "nodeType": "ExpressionStatement",
-                  "src": "10876:59:5"
+                  "src": "10876:59:7"
                 },
                 {
                   "condition": {
@@ -17543,12 +17543,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1900,
+                        "id": 3342,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1854,
-                        "src": "10957:6:5",
+                        "referencedDeclaration": 3296,
+                        "src": "10957:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -17562,18 +17562,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1899,
+                      "id": 3341,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3401,
-                      "src": "10950:6:5",
+                      "referencedDeclaration": 4843,
+                      "src": "10950:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 1901,
+                    "id": 3343,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17581,20 +17581,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10950:14:5",
+                    "src": "10950:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1909,
+                  "id": 3351,
                   "nodeType": "IfStatement",
-                  "src": "10946:70:5",
+                  "src": "10946:70:7",
                   "trueBody": {
-                    "id": 1908,
+                    "id": 3350,
                     "nodeType": "Block",
-                    "src": "10966:50:5",
+                    "src": "10966:50:7",
                     "statements": [
                       {
                         "expression": {
@@ -17606,19 +17606,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 1905,
+                              "id": 3347,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 1903,
+                                "id": 3345,
                                 "name": "newDuration",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1858,
-                                "src": "10988:11:5",
+                                "referencedDeclaration": 3300,
+                                "src": "10988:11:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17629,14 +17629,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 1904,
+                                "id": 3346,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11003:1:5",
+                                "src": "11003:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -17644,7 +17644,7 @@
                                 },
                                 "value": "0"
                               },
-                              "src": "10988:16:5",
+                              "src": "10988:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -17658,21 +17658,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1902,
+                            "id": 3344,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "10980:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "10980:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1906,
+                          "id": 3348,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17680,15 +17680,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10980:25:5",
+                          "src": "10980:25:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1907,
+                        "id": 3349,
                         "nodeType": "ExpressionStatement",
-                        "src": "10980:25:5"
+                        "src": "10980:25:7"
                       }
                     ]
                   }
@@ -17696,19 +17696,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1915,
+                    "id": 3357,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1910,
+                      "id": 3352,
                       "name": "requestsAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 888,
-                      "src": "11026:14:5",
+                      "referencedDeclaration": 2330,
+                      "src": "11026:14:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -17722,14 +17722,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1913,
+                          "id": 3355,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "11062:1:5",
+                          "src": "11062:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -17747,32 +17747,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1911,
+                          "id": 3353,
                           "name": "requestsAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 888,
-                          "src": "11043:14:5",
+                          "referencedDeclaration": 2330,
+                          "src": "11043:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1912,
+                        "id": 3354,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "11043:18:5",
+                        "referencedDeclaration": 10795,
+                        "src": "11043:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1914,
+                      "id": 3356,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17780,47 +17780,47 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11043:21:5",
+                      "src": "11043:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11026:38:5",
+                    "src": "11026:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1916,
+                  "id": 3358,
                   "nodeType": "ExpressionStatement",
-                  "src": "11026:38:5"
+                  "src": "11026:38:7"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1918,
+                      "id": 3360,
                       "name": "requestType",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2346,
-                      "src": "11075:21:5",
+                      "scope": 3788,
+                      "src": "11075:21:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1917,
+                        "id": 3359,
                         "name": "OrderType",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 726,
-                        "src": "11075:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "11075:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -17828,10 +17828,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1919,
+                  "id": 3361,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11075:21:5"
+                  "src": "11075:21:7"
                 },
                 {
                   "condition": {
@@ -17840,7 +17840,7 @@
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "id": 1926,
+                    "id": 3368,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17849,18 +17849,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1920,
+                        "id": 3362,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "11111:3:5",
+                        "referencedDeclaration": 11315,
+                        "src": "11111:3:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 1921,
+                      "id": 3363,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17868,7 +17868,7 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11111:10:5",
+                      "src": "11111:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -17882,26 +17882,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1922,
+                          "id": 3364,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "11125:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "11125:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 1924,
+                        "id": 3366,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1923,
+                          "id": 3365,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "11131:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "11131:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -17912,55 +17912,55 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11125:13:5",
+                        "src": "11125:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 1925,
+                      "id": 3367,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "consumerID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 747,
-                      "src": "11125:24:5",
+                      "referencedDeclaration": 2189,
+                      "src": "11125:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "11111:38:5",
+                    "src": "11111:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 1938,
+                    "id": 3380,
                     "nodeType": "Block",
-                    "src": "11215:58:5",
+                    "src": "11215:58:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1936,
+                          "id": 3378,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1933,
+                            "id": 3375,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1918,
-                            "src": "11229:11:5",
+                            "referencedDeclaration": 3360,
+                            "src": "11229:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -17970,18 +17970,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1934,
+                              "id": 3376,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 726,
-                              "src": "11243:9:5",
+                              "referencedDeclaration": 2168,
+                              "src": "11243:9:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 1935,
+                            "id": 3377,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -17989,50 +17989,50 @@
                             "memberName": "ORDER_ASK",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11243:19:5",
+                            "src": "11243:19:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11229:33:5",
+                          "src": "11229:33:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 1937,
+                        "id": 3379,
                         "nodeType": "ExpressionStatement",
-                        "src": "11229:33:5"
+                        "src": "11229:33:7"
                       }
                     ]
                   },
-                  "id": 1939,
+                  "id": 3381,
                   "nodeType": "IfStatement",
-                  "src": "11107:166:5",
+                  "src": "11107:166:7",
                   "trueBody": {
-                    "id": 1932,
+                    "id": 3374,
                     "nodeType": "Block",
-                    "src": "11151:58:5",
+                    "src": "11151:58:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1930,
+                          "id": 3372,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1927,
+                            "id": 3369,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1918,
-                            "src": "11165:11:5",
+                            "referencedDeclaration": 3360,
+                            "src": "11165:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -18042,18 +18042,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1928,
+                              "id": 3370,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 726,
-                              "src": "11179:9:5",
+                              "referencedDeclaration": 2168,
+                              "src": "11179:9:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 1929,
+                            "id": 3371,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -18061,21 +18061,21 @@
                             "memberName": "ORDER_BID",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11179:19:5",
+                            "src": "11179:19:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11165:33:5",
+                          "src": "11165:33:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 1931,
+                        "id": 3373,
                         "nodeType": "ExpressionStatement",
-                        "src": "11165:33:5"
+                        "src": "11165:33:7"
                       }
                     ]
                   }
@@ -18083,7 +18083,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1951,
+                    "id": 3393,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18092,26 +18092,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1940,
+                        "id": 3382,
                         "name": "requests",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 909,
-                        "src": "11283:8:5",
+                        "referencedDeclaration": 2351,
+                        "src": "11283:8:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                         }
                       },
-                      "id": 1942,
+                      "id": 3384,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1941,
+                        "id": 3383,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 888,
-                        "src": "11292:14:5",
+                        "referencedDeclaration": 2330,
+                        "src": "11292:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18122,9 +18122,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "11283:24:5",
+                      "src": "11283:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                         "typeString": "struct Market.ChangeRequest storage ref"
                       }
                     },
@@ -18135,12 +18135,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 1944,
+                          "id": 3386,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "11324:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "11324:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18148,25 +18148,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1945,
+                          "id": 3387,
                           "name": "requestType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1918,
-                          "src": "11332:11:5",
+                          "referencedDeclaration": 3360,
+                          "src": "11332:11:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1946,
+                          "id": 3388,
                           "name": "newPrice",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1856,
-                          "src": "11345:8:5",
+                          "referencedDeclaration": 3298,
+                          "src": "11345:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18174,12 +18174,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1947,
+                          "id": 3389,
                           "name": "newDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1858,
-                          "src": "11355:11:5",
+                          "referencedDeclaration": 3300,
+                          "src": "11355:11:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18189,18 +18189,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1948,
+                            "id": 3390,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 736,
-                            "src": "11368:13:5",
+                            "referencedDeclaration": 2178,
+                            "src": "11368:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 1949,
+                          "id": 3391,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -18208,9 +18208,9 @@
                           "memberName": "REQUEST_CREATED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "11368:29:5",
+                          "src": "11368:29:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         }
@@ -18222,7 +18222,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           },
                           {
@@ -18234,22 +18234,22 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         ],
-                        "id": 1943,
+                        "id": 3385,
                         "name": "ChangeRequest",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 810,
-                        "src": "11310:13:5",
+                        "referencedDeclaration": 2252,
+                        "src": "11310:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$810_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2252_storage_ptr_$",
                           "typeString": "type(struct Market.ChangeRequest storage pointer)"
                         }
                       },
-                      "id": 1950,
+                      "id": 3392,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -18257,21 +18257,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11310:88:5",
+                      "src": "11310:88:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory",
                         "typeString": "struct Market.ChangeRequest memory"
                       }
                     },
-                    "src": "11283:115:5",
+                    "src": "11283:115:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
-                  "id": 1952,
+                  "id": 3394,
                   "nodeType": "ExpressionStatement",
-                  "src": "11283:115:5"
+                  "src": "11283:115:7"
                 },
                 {
                   "eventCall": {
@@ -18279,12 +18279,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1954,
+                        "id": 3396,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 888,
-                        "src": "11434:14:5",
+                        "referencedDeclaration": 2330,
+                        "src": "11434:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18298,18 +18298,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1953,
+                      "id": 3395,
                       "name": "DealChangeRequestSet",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 836,
-                      "src": "11413:20:5",
+                      "referencedDeclaration": 2278,
+                      "src": "11413:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1955,
+                    "id": 3397,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18317,38 +18317,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11413:36:5",
+                    "src": "11413:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1956,
+                  "id": 3398,
                   "nodeType": "EmitStatement",
-                  "src": "11408:41:5"
+                  "src": "11408:41:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 1960,
+                    "id": 3402,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1957,
+                      "id": 3399,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1918,
-                      "src": "11464:11:5",
+                      "referencedDeclaration": 3360,
+                      "src": "11464:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -18358,18 +18358,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1958,
+                        "id": 3400,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "11479:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "11479:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 1959,
+                      "id": 3401,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -18377,26 +18377,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11479:19:5",
+                      "src": "11479:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "11464:34:5",
+                    "src": "11464:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2161,
+                  "id": 3603,
                   "nodeType": "IfStatement",
-                  "src": "11460:1719:5",
+                  "src": "11460:1719:7",
                   "trueBody": {
-                    "id": 2160,
+                    "id": 3602,
                     "nodeType": "Block",
-                    "src": "11500:1679:5",
+                    "src": "11500:1679:7",
                     "statements": [
                       {
                         "eventCall": {
@@ -18408,26 +18408,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1962,
+                                  "id": 3404,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "11544:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "11544:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 1964,
+                                "id": 3406,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1963,
+                                  "id": 3405,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11559:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11559:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -18438,24 +18438,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11544:22:5",
+                                "src": "11544:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 1966,
+                              "id": 3408,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 1965,
+                                "id": 3407,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11567:1:5",
+                                "src": "11567:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -18468,7 +18468,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11544:25:5",
+                              "src": "11544:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -18482,18 +18482,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 1961,
+                            "id": 3403,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "11519:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "11519:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 1967,
+                          "id": 3409,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18501,20 +18501,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "11519:51:5",
+                          "src": "11519:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1968,
+                        "id": 3410,
                         "nodeType": "EmitStatement",
-                        "src": "11514:56:5"
+                        "src": "11514:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1979,
+                          "id": 3421,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18525,44 +18525,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1969,
+                                "id": 3411,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "11584:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "11584:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 1975,
+                              "id": 3417,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 1970,
+                                    "id": 3412,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "11593:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "11593:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 1972,
+                                  "id": 3414,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1971,
+                                    "id": 3413,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "11608:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "11608:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -18573,24 +18573,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "11593:22:5",
+                                  "src": "11593:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 1974,
+                                "id": 3416,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 1973,
+                                  "id": 3415,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "11616:1:5",
+                                  "src": "11616:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -18603,7 +18603,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11593:25:5",
+                                "src": "11593:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18614,23 +18614,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11584:35:5",
+                              "src": "11584:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 1976,
+                            "id": 3418,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "11584:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "11584:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -18640,18 +18640,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1977,
+                              "id": 3419,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "11629:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "11629:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 1978,
+                            "id": 3420,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -18659,26 +18659,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11629:30:5",
+                            "src": "11629:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "11584:75:5",
+                          "src": "11584:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 1980,
+                        "id": 3422,
                         "nodeType": "ExpressionStatement",
-                        "src": "11584:75:5"
+                        "src": "11584:75:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1987,
+                          "id": 3429,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18689,26 +18689,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1981,
+                                "id": 3423,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "11673:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "11673:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 1984,
+                              "id": 3426,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1982,
+                                "id": 3424,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "11688:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "11688:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18719,24 +18719,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11673:22:5",
+                              "src": "11673:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 1985,
+                            "id": 3427,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 1983,
+                              "id": 3425,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11696:1:5",
+                              "src": "11696:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -18749,7 +18749,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "11673:25:5",
+                            "src": "11673:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -18759,54 +18759,54 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 1986,
+                            "id": 3428,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "11701:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "11701:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "11673:42:5",
+                          "src": "11673:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1988,
+                        "id": 3430,
                         "nodeType": "ExpressionStatement",
-                        "src": "11673:42:5"
+                        "src": "11673:42:7"
                       },
                       {
                         "assignments": [
-                          1990
+                          3432
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 1990,
+                            "id": 3432,
                             "name": "matchingRequest",
                             "nodeType": "VariableDeclaration",
-                            "scope": 2346,
-                            "src": "11729:36:5",
+                            "scope": 3788,
+                            "src": "11729:36:7",
                             "stateVariable": false,
                             "storageLocation": "memory",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 1989,
+                              "id": 3431,
                               "name": "ChangeRequest",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 810,
-                              "src": "11729:13:5",
+                              "referencedDeclaration": 2252,
+                              "src": "11729:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                                 "typeString": "struct Market.ChangeRequest"
                               }
                             },
@@ -18814,49 +18814,49 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 1998,
+                        "id": 3440,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1991,
+                            "id": 3433,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "11768:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "11768:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 1997,
+                          "id": 3439,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1992,
+                                "id": 3434,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "11777:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "11777:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 1994,
+                              "id": 3436,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1993,
+                                "id": 3435,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "11792:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "11792:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18867,24 +18867,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11777:22:5",
+                              "src": "11777:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 1996,
+                            "id": 3438,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 1995,
+                              "id": 3437,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11800:1:5",
+                              "src": "11800:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -18897,7 +18897,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "11777:25:5",
+                            "src": "11777:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -18908,14 +18908,14 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "11768:35:5",
+                          "src": "11768:35:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "11729:74:5"
+                        "src": "11729:74:7"
                       },
                       {
                         "condition": {
@@ -18924,7 +18924,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2011,
+                          "id": 3453,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18935,19 +18935,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2004,
+                            "id": 3446,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 1999,
+                              "id": 3441,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1858,
-                              "src": "11822:11:5",
+                              "referencedDeclaration": 3300,
+                              "src": "11822:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -18961,26 +18961,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2000,
+                                  "id": 3442,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "11837:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "11837:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2002,
+                                "id": 3444,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2001,
+                                  "id": 3443,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11843:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11843:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -18991,27 +18991,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11837:13:5",
+                                "src": "11837:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2003,
+                              "id": 3445,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 755,
-                              "src": "11837:22:5",
+                              "referencedDeclaration": 2197,
+                              "src": "11837:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11822:37:5",
+                            "src": "11822:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -19025,19 +19025,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2010,
+                            "id": 3452,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2005,
+                              "id": 3447,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1856,
-                              "src": "11863:8:5",
+                              "referencedDeclaration": 3298,
+                              "src": "11863:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -19051,26 +19051,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2006,
+                                  "id": 3448,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "11874:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "11874:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2008,
+                                "id": 3450,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2007,
+                                  "id": 3449,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11880:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11880:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -19081,33 +19081,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11874:13:5",
+                                "src": "11874:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2009,
+                              "id": 3451,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 757,
-                              "src": "11874:19:5",
+                              "referencedDeclaration": 2199,
+                              "src": "11874:19:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11863:30:5",
+                            "src": "11863:30:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "11822:71:5",
+                          "src": "11822:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -19120,7 +19120,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 2058,
+                            "id": 3500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -19131,7 +19131,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2053,
+                              "id": 3495,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -19139,10 +19139,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 2048,
+                                "id": 3490,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -19151,28 +19151,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2044,
+                                    "id": 3486,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "12190:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "12190:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2045,
+                                  "id": 3487,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "12190:22:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "12190:22:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -19182,18 +19182,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2046,
+                                    "id": 3488,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "12216:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "12216:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2047,
+                                  "id": 3489,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -19201,13 +19201,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "12216:29:5",
+                                  "src": "12216:29:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "12190:55:5",
+                                "src": "12190:55:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -19221,7 +19221,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 2052,
+                                "id": 3494,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -19230,26 +19230,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2049,
+                                    "id": 3491,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "12249:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "12249:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2050,
+                                  "id": 3492,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 807,
-                                  "src": "12249:24:5",
+                                  "referencedDeclaration": 2249,
+                                  "src": "12249:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -19259,24 +19259,24 @@
                                 "operator": ">=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2051,
+                                  "id": 3493,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1858,
-                                  "src": "12277:11:5",
+                                  "referencedDeclaration": 3300,
+                                  "src": "12277:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12249:39:5",
+                                "src": "12249:39:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "12190:98:5",
+                              "src": "12190:98:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -19290,7 +19290,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2057,
+                              "id": 3499,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -19299,26 +19299,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2054,
+                                  "id": 3496,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1990,
-                                  "src": "12292:15:5",
+                                  "referencedDeclaration": 3432,
+                                  "src": "12292:15:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2055,
+                                "id": 3497,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 805,
-                                "src": "12292:21:5",
+                                "referencedDeclaration": 2247,
+                                "src": "12292:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -19328,67 +19328,67 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2056,
+                                "id": 3498,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1856,
-                                "src": "12317:8:5",
+                                "referencedDeclaration": 3298,
+                                "src": "12317:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "12292:33:5",
+                              "src": "12292:33:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "12190:135:5",
+                            "src": "12190:135:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2129,
+                            "id": 3571,
                             "nodeType": "Block",
-                            "src": "12899:54:5",
+                            "src": "12899:54:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2127,
+                                  "id": 3569,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 888,
-                                  "src": "12924:14:5",
+                                  "referencedDeclaration": 2330,
+                                  "src": "12924:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 1862,
-                                "id": 2128,
+                                "functionReturnParameters": 3304,
+                                "id": 3570,
                                 "nodeType": "Return",
-                                "src": "12917:21:5"
+                                "src": "12917:21:7"
                               }
                             ]
                           },
-                          "id": 2130,
+                          "id": 3572,
                           "nodeType": "IfStatement",
-                          "src": "12186:767:5",
+                          "src": "12186:767:7",
                           "trueBody": {
-                            "id": 2126,
+                            "id": 3568,
                             "nodeType": "Block",
-                            "src": "12327:566:5",
+                            "src": "12327:566:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2065,
+                                  "id": 3507,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19399,26 +19399,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2059,
+                                        "id": 3501,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "12345:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "12345:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2061,
+                                      "id": 3503,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2060,
+                                        "id": 3502,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 888,
-                                        "src": "12354:14:5",
+                                        "referencedDeclaration": 2330,
+                                        "src": "12354:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19429,23 +19429,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12345:24:5",
+                                      "src": "12345:24:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2062,
+                                    "id": 3504,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "12345:31:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "12345:31:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -19455,18 +19455,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2063,
+                                      "id": 3505,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "12379:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "12379:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2064,
+                                    "id": 3506,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -19474,26 +19474,26 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12379:30:5",
+                                    "src": "12379:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12345:64:5",
+                                  "src": "12345:64:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2066,
+                                "id": 3508,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12345:64:5"
+                                "src": "12345:64:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2077,
+                                  "id": 3519,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19504,44 +19504,44 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2067,
+                                        "id": 3509,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "12427:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "12427:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2073,
+                                      "id": 3515,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
                                           "baseExpression": {
                                             "argumentTypes": null,
-                                            "id": 2068,
+                                            "id": 3510,
                                             "name": "actualRequests",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 915,
-                                            "src": "12436:14:5",
+                                            "referencedDeclaration": 2357,
+                                            "src": "12436:14:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                               "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                             }
                                           },
-                                          "id": 2070,
+                                          "id": 3512,
                                           "indexExpression": {
                                             "argumentTypes": null,
-                                            "id": 2069,
+                                            "id": 3511,
                                             "name": "dealID",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1854,
-                                            "src": "12451:6:5",
+                                            "referencedDeclaration": 3296,
+                                            "src": "12451:6:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -19552,24 +19552,24 @@
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "nodeType": "IndexAccess",
-                                          "src": "12436:22:5",
+                                          "src": "12436:22:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                             "typeString": "uint256[2] storage ref"
                                           }
                                         },
-                                        "id": 2072,
+                                        "id": 3514,
                                         "indexExpression": {
                                           "argumentTypes": null,
                                           "hexValue": "30",
-                                          "id": 2071,
+                                          "id": 3513,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": true,
                                           "kind": "number",
                                           "lValueRequested": false,
                                           "nodeType": "Literal",
-                                          "src": "12459:1:5",
+                                          "src": "12459:1:7",
                                           "subdenomination": null,
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_rational_0_by_1",
@@ -19582,7 +19582,7 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12436:25:5",
+                                        "src": "12436:25:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19593,23 +19593,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12427:35:5",
+                                      "src": "12427:35:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2074,
+                                    "id": 3516,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "12427:42:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "12427:42:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -19619,18 +19619,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2075,
+                                      "id": 3517,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "12472:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "12472:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2076,
+                                    "id": 3518,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -19638,21 +19638,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12472:30:5",
+                                    "src": "12472:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12427:75:5",
+                                  "src": "12427:75:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2078,
+                                "id": 3520,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12427:75:5"
+                                "src": "12427:75:7"
                               },
                               {
                                 "eventCall": {
@@ -19664,26 +19664,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 2080,
+                                          "id": 3522,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 915,
-                                          "src": "12550:14:5",
+                                          "referencedDeclaration": 2357,
+                                          "src": "12550:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 2082,
+                                        "id": 3524,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 2081,
+                                          "id": 3523,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1854,
-                                          "src": "12565:6:5",
+                                          "referencedDeclaration": 3296,
+                                          "src": "12565:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -19694,24 +19694,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12550:22:5",
+                                        "src": "12550:22:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 2084,
+                                      "id": 3526,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "30",
-                                        "id": 2083,
+                                        "id": 3525,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "12573:1:5",
+                                        "src": "12573:1:7",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_0_by_1",
@@ -19724,7 +19724,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12550:25:5",
+                                      "src": "12550:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -19738,18 +19738,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2079,
+                                    "id": 3521,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "12525:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "12525:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2085,
+                                  "id": 3527,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19757,20 +19757,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12525:51:5",
+                                  "src": "12525:51:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2086,
+                                "id": 3528,
                                 "nodeType": "EmitStatement",
-                                "src": "12520:56:5"
+                                "src": "12520:56:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2093,
+                                  "id": 3535,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19781,26 +19781,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2087,
+                                        "id": 3529,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "12594:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "12594:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2090,
+                                      "id": 3532,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2088,
+                                        "id": 3530,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12609:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12609:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19811,24 +19811,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12594:22:5",
+                                      "src": "12594:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2091,
+                                    "id": 3533,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 2089,
+                                      "id": 3531,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12617:1:5",
+                                      "src": "12617:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -19841,7 +19841,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12594:25:5",
+                                    "src": "12594:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -19852,14 +19852,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2092,
+                                    "id": 3534,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12622:1:5",
+                                    "src": "12622:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -19867,20 +19867,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12594:29:5",
+                                  "src": "12594:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2094,
+                                "id": 3536,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12594:29:5"
+                                "src": "12594:29:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2101,
+                                  "id": 3543,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19891,26 +19891,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2095,
+                                        "id": 3537,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "12641:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "12641:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2098,
+                                      "id": 3540,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2096,
+                                        "id": 3538,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12656:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12656:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19921,24 +19921,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12641:22:5",
+                                      "src": "12641:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2099,
+                                    "id": 3541,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2097,
+                                      "id": 3539,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12664:1:5",
+                                      "src": "12664:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -19951,7 +19951,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12641:25:5",
+                                    "src": "12641:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -19962,14 +19962,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2100,
+                                    "id": 3542,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12669:1:5",
+                                    "src": "12669:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -19977,15 +19977,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12641:29:5",
+                                  "src": "12641:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2102,
+                                "id": 3544,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12641:29:5"
+                                "src": "12641:29:7"
                               },
                               {
                                 "expression": {
@@ -19993,12 +19993,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2104,
+                                      "id": 3546,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12693:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12693:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20012,18 +20012,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2103,
+                                    "id": 3545,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1852,
-                                    "src": "12688:4:5",
+                                    "referencedDeclaration": 3294,
+                                    "src": "12688:4:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 2105,
+                                  "id": 3547,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20031,20 +20031,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12688:12:5",
+                                  "src": "12688:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 2106,
+                                "id": 3548,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12688:12:5"
+                                "src": "12688:12:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2113,
+                                  "id": 3555,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20055,26 +20055,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2107,
+                                        "id": 3549,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "12718:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "12718:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2109,
+                                      "id": 3551,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2108,
+                                        "id": 3550,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12724:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12724:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -20085,21 +20085,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12718:13:5",
+                                      "src": "12718:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2110,
+                                    "id": 3552,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 757,
-                                    "src": "12718:19:5",
+                                    "referencedDeclaration": 2199,
+                                    "src": "12718:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20111,45 +20111,45 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2111,
+                                      "id": 3553,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1990,
-                                      "src": "12740:15:5",
+                                      "referencedDeclaration": 3432,
+                                      "src": "12740:15:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 2112,
+                                    "id": 3554,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 805,
-                                    "src": "12740:21:5",
+                                    "referencedDeclaration": 2247,
+                                    "src": "12740:21:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12718:43:5",
+                                  "src": "12718:43:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2114,
+                                "id": 3556,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12718:43:5"
+                                "src": "12718:43:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2120,
+                                  "id": 3562,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20160,26 +20160,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2115,
+                                        "id": 3557,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "12779:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "12779:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2117,
+                                      "id": 3559,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2116,
+                                        "id": 3558,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12785:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12785:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -20190,21 +20190,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12779:13:5",
+                                      "src": "12779:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2118,
+                                    "id": 3560,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 755,
-                                    "src": "12779:22:5",
+                                    "referencedDeclaration": 2197,
+                                    "src": "12779:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20214,26 +20214,26 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2119,
+                                    "id": 3561,
                                     "name": "newDuration",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1858,
-                                    "src": "12804:11:5",
+                                    "referencedDeclaration": 3300,
+                                    "src": "12804:11:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12779:36:5",
+                                  "src": "12779:36:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2121,
+                                "id": 3563,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12779:36:5"
+                                "src": "12779:36:7"
                               },
                               {
                                 "eventCall": {
@@ -20241,12 +20241,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2123,
+                                      "id": 3565,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "12863:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "12863:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20260,18 +20260,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2122,
+                                    "id": 3564,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "12838:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "12838:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2124,
+                                  "id": 3566,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20279,31 +20279,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12838:40:5",
+                                  "src": "12838:40:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2125,
+                                "id": 3567,
                                 "nodeType": "EmitStatement",
-                                "src": "12833:45:5"
+                                "src": "12833:45:7"
                               }
                             ]
                           }
                         },
-                        "id": 2131,
+                        "id": 3573,
                         "nodeType": "IfStatement",
-                        "src": "11818:1135:5",
+                        "src": "11818:1135:7",
                         "trueBody": {
-                          "id": 2043,
+                          "id": 3485,
                           "nodeType": "Block",
-                          "src": "11895:285:5",
+                          "src": "11895:285:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2018,
+                                "id": 3460,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20314,26 +20314,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2012,
+                                      "id": 3454,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "11913:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "11913:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2014,
+                                    "id": 3456,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2013,
+                                      "id": 3455,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "11922:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "11922:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20344,23 +20344,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "11913:24:5",
+                                    "src": "11913:24:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2015,
+                                  "id": 3457,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "11913:31:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "11913:31:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -20370,18 +20370,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2016,
+                                    "id": 3458,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "11947:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "11947:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2017,
+                                  "id": 3459,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -20389,21 +20389,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "11947:30:5",
+                                  "src": "11947:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "11913:64:5",
+                                "src": "11913:64:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2019,
+                              "id": 3461,
                               "nodeType": "ExpressionStatement",
-                              "src": "11913:64:5"
+                              "src": "11913:64:7"
                             },
                             {
                               "expression": {
@@ -20411,12 +20411,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2021,
+                                    "id": 3463,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "12000:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "12000:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20430,18 +20430,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2020,
+                                  "id": 3462,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1852,
-                                  "src": "11995:4:5",
+                                  "referencedDeclaration": 3294,
+                                  "src": "11995:4:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 2022,
+                                "id": 3464,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20449,20 +20449,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "11995:12:5",
+                                "src": "11995:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 2023,
+                              "id": 3465,
                               "nodeType": "ExpressionStatement",
-                              "src": "11995:12:5"
+                              "src": "11995:12:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2029,
+                                "id": 3471,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20473,26 +20473,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2024,
+                                      "id": 3466,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "12025:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "12025:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 2026,
+                                    "id": 3468,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2025,
+                                      "id": 3467,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12031:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12031:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20503,21 +20503,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12025:13:5",
+                                    "src": "12025:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 2027,
+                                  "id": 3469,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "12025:19:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "12025:19:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20527,31 +20527,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2028,
+                                  "id": 3470,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1856,
-                                  "src": "12047:8:5",
+                                  "referencedDeclaration": 3298,
+                                  "src": "12047:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12025:30:5",
+                                "src": "12025:30:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2030,
+                              "id": 3472,
                               "nodeType": "ExpressionStatement",
-                              "src": "12025:30:5"
+                              "src": "12025:30:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2037,
+                                "id": 3479,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20562,26 +20562,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2031,
+                                      "id": 3473,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 915,
-                                      "src": "12073:14:5",
+                                      "referencedDeclaration": 2357,
+                                      "src": "12073:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 2034,
+                                    "id": 3476,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2032,
+                                      "id": 3474,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12088:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12088:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20592,24 +20592,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12073:22:5",
+                                    "src": "12073:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 2035,
+                                  "id": 3477,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "31",
-                                    "id": 2033,
+                                    "id": 3475,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12096:1:5",
+                                    "src": "12096:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_1_by_1",
@@ -20622,7 +20622,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "12073:25:5",
+                                  "src": "12073:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20633,14 +20633,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2036,
+                                  "id": 3478,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12101:1:5",
+                                  "src": "12101:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -20648,15 +20648,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "12073:29:5",
+                                "src": "12073:29:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2038,
+                              "id": 3480,
                               "nodeType": "ExpressionStatement",
-                              "src": "12073:29:5"
+                              "src": "12073:29:7"
                             },
                             {
                               "eventCall": {
@@ -20664,12 +20664,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2040,
+                                    "id": 3482,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 888,
-                                    "src": "12150:14:5",
+                                    "referencedDeclaration": 2330,
+                                    "src": "12150:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20683,18 +20683,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2039,
+                                  "id": 3481,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 840,
-                                  "src": "12125:24:5",
+                                  "referencedDeclaration": 2282,
+                                  "src": "12125:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 2041,
+                                "id": 3483,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20702,15 +20702,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "12125:40:5",
+                                "src": "12125:40:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 2042,
+                              "id": 3484,
                               "nodeType": "EmitStatement",
-                              "src": "12120:45:5"
+                              "src": "12120:45:7"
                             }
                           ]
                         }
@@ -20718,7 +20718,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2142,
+                          "id": 3584,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20729,44 +20729,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2132,
+                                "id": 3574,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "12967:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "12967:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 2138,
+                              "id": 3580,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 2133,
+                                    "id": 3575,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "12976:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "12976:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 2135,
+                                  "id": 3577,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 2134,
+                                    "id": 3576,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "12991:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "12991:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20777,24 +20777,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "12976:22:5",
+                                  "src": "12976:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 2137,
+                                "id": 3579,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 2136,
+                                  "id": 3578,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12999:1:5",
+                                  "src": "12999:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -20807,7 +20807,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "12976:25:5",
+                                "src": "12976:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -20818,23 +20818,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12967:35:5",
+                              "src": "12967:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 2139,
+                            "id": 3581,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "12967:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "12967:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -20844,18 +20844,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2140,
+                              "id": 3582,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "13012:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "13012:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 2141,
+                            "id": 3583,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -20863,21 +20863,21 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13012:30:5",
+                            "src": "13012:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "12967:75:5",
+                          "src": "12967:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 2143,
+                        "id": 3585,
                         "nodeType": "ExpressionStatement",
-                        "src": "12967:75:5"
+                        "src": "12967:75:7"
                       },
                       {
                         "eventCall": {
@@ -20889,26 +20889,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2145,
+                                  "id": 3587,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13086:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13086:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2147,
+                                "id": 3589,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2146,
+                                  "id": 3588,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13101:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13101:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20919,24 +20919,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13086:22:5",
+                                "src": "13086:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2149,
+                              "id": 3591,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 2148,
+                                "id": 3590,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13109:1:5",
+                                "src": "13109:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -20949,7 +20949,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13086:25:5",
+                              "src": "13086:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -20963,18 +20963,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2144,
+                            "id": 3586,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "13061:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "13061:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2150,
+                          "id": 3592,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20982,20 +20982,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13061:51:5",
+                          "src": "13061:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2151,
+                        "id": 3593,
                         "nodeType": "EmitStatement",
-                        "src": "13056:56:5"
+                        "src": "13056:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2158,
+                          "id": 3600,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21006,26 +21006,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2152,
+                                "id": 3594,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "13126:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "13126:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2155,
+                              "id": 3597,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2153,
+                                "id": 3595,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "13141:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "13141:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21036,24 +21036,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13126:22:5",
+                              "src": "13126:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2156,
+                            "id": 3598,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2154,
+                              "id": 3596,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13149:1:5",
+                              "src": "13149:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -21066,7 +21066,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13126:25:5",
+                            "src": "13126:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -21076,26 +21076,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2157,
+                            "id": 3599,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "13154:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "13154:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13126:42:5",
+                          "src": "13126:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2159,
+                        "id": 3601,
                         "nodeType": "ExpressionStatement",
-                        "src": "13126:42:5"
+                        "src": "13126:42:7"
                       }
                     ]
                   }
@@ -21104,24 +21104,24 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2165,
+                    "id": 3607,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2162,
+                      "id": 3604,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1918,
-                      "src": "13193:11:5",
+                      "referencedDeclaration": 3360,
+                      "src": "13193:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -21131,18 +21131,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2163,
+                        "id": 3605,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "13208:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "13208:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2164,
+                      "id": 3606,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -21150,26 +21150,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "13208:19:5",
+                      "src": "13208:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "13193:34:5",
+                    "src": "13193:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2326,
+                  "id": 3768,
                   "nodeType": "IfStatement",
-                  "src": "13189:1389:5",
+                  "src": "13189:1389:7",
                   "trueBody": {
-                    "id": 2325,
+                    "id": 3767,
                     "nodeType": "Block",
-                    "src": "13229:1349:5",
+                    "src": "13229:1349:7",
                     "statements": [
                       {
                         "eventCall": {
@@ -21181,26 +21181,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2167,
+                                  "id": 3609,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13273:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13273:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2169,
+                                "id": 3611,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2168,
+                                  "id": 3610,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13288:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13288:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21211,24 +21211,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13273:22:5",
+                                "src": "13273:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2171,
+                              "id": 3613,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 2170,
+                                "id": 3612,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13296:1:5",
+                                "src": "13296:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -21241,7 +21241,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13273:25:5",
+                              "src": "13273:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21255,18 +21255,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2166,
+                            "id": 3608,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "13248:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "13248:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2172,
+                          "id": 3614,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21274,20 +21274,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13248:51:5",
+                          "src": "13248:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2173,
+                        "id": 3615,
                         "nodeType": "EmitStatement",
-                        "src": "13243:56:5"
+                        "src": "13243:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2184,
+                          "id": 3626,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21298,44 +21298,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2174,
+                                "id": 3616,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "13313:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "13313:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 2180,
+                              "id": 3622,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 2175,
+                                    "id": 3617,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "13322:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "13322:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 2177,
+                                  "id": 3619,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 2176,
+                                    "id": 3618,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "13337:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "13337:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -21346,24 +21346,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "13322:22:5",
+                                  "src": "13322:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 2179,
+                                "id": 3621,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2178,
+                                  "id": 3620,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13345:1:5",
+                                  "src": "13345:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -21376,7 +21376,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13322:25:5",
+                                "src": "13322:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21387,23 +21387,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13313:35:5",
+                              "src": "13313:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 2181,
+                            "id": 3623,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "13313:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "13313:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -21413,18 +21413,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2182,
+                              "id": 3624,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "13358:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "13358:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 2183,
+                            "id": 3625,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -21432,26 +21432,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13358:30:5",
+                            "src": "13358:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "13313:75:5",
+                          "src": "13313:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 2185,
+                        "id": 3627,
                         "nodeType": "ExpressionStatement",
-                        "src": "13313:75:5"
+                        "src": "13313:75:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2192,
+                          "id": 3634,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21462,26 +21462,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2186,
+                                "id": 3628,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "13402:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "13402:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2189,
+                              "id": 3631,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2187,
+                                "id": 3629,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "13417:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "13417:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21492,24 +21492,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13402:22:5",
+                              "src": "13402:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2190,
+                            "id": 3632,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 2188,
+                              "id": 3630,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13425:1:5",
+                              "src": "13425:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -21522,7 +21522,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13402:25:5",
+                            "src": "13402:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -21532,45 +21532,45 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2191,
+                            "id": 3633,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "13430:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "13430:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13402:42:5",
+                          "src": "13402:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2193,
+                        "id": 3635,
                         "nodeType": "ExpressionStatement",
-                        "src": "13402:42:5"
+                        "src": "13402:42:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2202,
+                          "id": 3644,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2194,
+                            "id": 3636,
                             "name": "matchingRequest",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1990,
-                            "src": "13458:15:5",
+                            "referencedDeclaration": 3432,
+                            "src": "13458:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
@@ -21580,44 +21580,44 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2195,
+                              "id": 3637,
                               "name": "requests",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 909,
-                              "src": "13476:8:5",
+                              "referencedDeclaration": 2351,
+                              "src": "13476:8:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                               }
                             },
-                            "id": 2201,
+                            "id": 3643,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2196,
+                                  "id": 3638,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13485:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13485:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2198,
+                                "id": 3640,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2197,
+                                  "id": 3639,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13500:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13500:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21628,24 +21628,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13485:22:5",
+                                "src": "13485:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2200,
+                              "id": 3642,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 2199,
+                                "id": 3641,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13508:1:5",
+                                "src": "13508:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -21658,7 +21658,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13485:25:5",
+                              "src": "13485:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21669,21 +21669,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "13476:35:5",
+                            "src": "13476:35:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                               "typeString": "struct Market.ChangeRequest storage ref"
                             }
                           },
-                          "src": "13458:53:5",
+                          "src": "13458:53:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                             "typeString": "struct Market.ChangeRequest memory"
                           }
                         },
-                        "id": 2203,
+                        "id": 3645,
                         "nodeType": "ExpressionStatement",
-                        "src": "13458:53:5"
+                        "src": "13458:53:7"
                       },
                       {
                         "condition": {
@@ -21692,7 +21692,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2216,
+                          "id": 3658,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21703,19 +21703,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2209,
+                            "id": 3651,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2204,
+                              "id": 3646,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1858,
-                              "src": "13530:11:5",
+                              "referencedDeclaration": 3300,
+                              "src": "13530:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21729,26 +21729,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2205,
+                                  "id": 3647,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "13545:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "13545:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2207,
+                                "id": 3649,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2206,
+                                  "id": 3648,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13551:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13551:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21759,27 +21759,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13545:13:5",
+                                "src": "13545:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2208,
+                              "id": 3650,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 755,
-                              "src": "13545:22:5",
+                              "referencedDeclaration": 2197,
+                              "src": "13545:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13530:37:5",
+                            "src": "13530:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -21793,19 +21793,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2215,
+                            "id": 3657,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2210,
+                              "id": 3652,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1856,
-                              "src": "13571:8:5",
+                              "referencedDeclaration": 3298,
+                              "src": "13571:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21819,26 +21819,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2211,
+                                  "id": 3653,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "13582:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "13582:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2213,
+                                "id": 3655,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2212,
+                                  "id": 3654,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13588:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13588:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21849,33 +21849,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13582:13:5",
+                                "src": "13582:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2214,
+                              "id": 3656,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 757,
-                              "src": "13582:19:5",
+                              "referencedDeclaration": 2199,
+                              "src": "13582:19:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13571:30:5",
+                            "src": "13571:30:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "13530:71:5",
+                          "src": "13530:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -21888,7 +21888,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 2263,
+                            "id": 3705,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -21899,7 +21899,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2258,
+                              "id": 3700,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -21907,10 +21907,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 2253,
+                                "id": 3695,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -21919,28 +21919,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2249,
+                                    "id": 3691,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "13898:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "13898:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2250,
+                                  "id": 3692,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "13898:22:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "13898:22:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -21950,18 +21950,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2251,
+                                    "id": 3693,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "13924:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "13924:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2252,
+                                  "id": 3694,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -21969,13 +21969,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13924:29:5",
+                                  "src": "13924:29:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13898:55:5",
+                                "src": "13898:55:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -21989,7 +21989,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 2257,
+                                "id": 3699,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -21998,26 +21998,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2254,
+                                    "id": 3696,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "13957:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "13957:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2255,
+                                  "id": 3697,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 807,
-                                  "src": "13957:24:5",
+                                  "referencedDeclaration": 2249,
+                                  "src": "13957:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -22027,24 +22027,24 @@
                                 "operator": "<=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2256,
+                                  "id": 3698,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1858,
-                                  "src": "13985:11:5",
+                                  "referencedDeclaration": 3300,
+                                  "src": "13985:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13957:39:5",
+                                "src": "13957:39:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "13898:98:5",
+                              "src": "13898:98:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -22058,7 +22058,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2262,
+                              "id": 3704,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -22067,26 +22067,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2259,
+                                  "id": 3701,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1990,
-                                  "src": "14000:15:5",
+                                  "referencedDeclaration": 3432,
+                                  "src": "14000:15:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2260,
+                                "id": 3702,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 805,
-                                "src": "14000:21:5",
+                                "referencedDeclaration": 2247,
+                                "src": "14000:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -22096,67 +22096,67 @@
                               "operator": ">=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2261,
+                                "id": 3703,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1856,
-                                "src": "14025:8:5",
+                                "referencedDeclaration": 3298,
+                                "src": "14025:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "14000:33:5",
+                              "src": "14000:33:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "13898:135:5",
+                            "src": "13898:135:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2322,
+                            "id": 3764,
                             "nodeType": "Block",
-                            "src": "14514:54:5",
+                            "src": "14514:54:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2320,
+                                  "id": 3762,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 888,
-                                  "src": "14539:14:5",
+                                  "referencedDeclaration": 2330,
+                                  "src": "14539:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 1862,
-                                "id": 2321,
+                                "functionReturnParameters": 3304,
+                                "id": 3763,
                                 "nodeType": "Return",
-                                "src": "14532:21:5"
+                                "src": "14532:21:7"
                               }
                             ]
                           },
-                          "id": 2323,
+                          "id": 3765,
                           "nodeType": "IfStatement",
-                          "src": "13894:674:5",
+                          "src": "13894:674:7",
                           "trueBody": {
-                            "id": 2319,
+                            "id": 3761,
                             "nodeType": "Block",
-                            "src": "14035:473:5",
+                            "src": "14035:473:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2270,
+                                  "id": 3712,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22167,26 +22167,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2264,
+                                        "id": 3706,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "14053:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "14053:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2266,
+                                      "id": 3708,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2265,
+                                        "id": 3707,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 888,
-                                        "src": "14062:14:5",
+                                        "referencedDeclaration": 2330,
+                                        "src": "14062:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22197,23 +22197,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14053:24:5",
+                                      "src": "14053:24:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2267,
+                                    "id": 3709,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "14053:31:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "14053:31:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -22223,18 +22223,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2268,
+                                      "id": 3710,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "14087:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "14087:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2269,
+                                    "id": 3711,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -22242,21 +22242,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "14087:30:5",
+                                    "src": "14087:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "14053:64:5",
+                                  "src": "14053:64:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2271,
+                                "id": 3713,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14053:64:5"
+                                "src": "14053:64:7"
                               },
                               {
                                 "eventCall": {
@@ -22268,26 +22268,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 2273,
+                                          "id": 3715,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 915,
-                                          "src": "14165:14:5",
+                                          "referencedDeclaration": 2357,
+                                          "src": "14165:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 2275,
+                                        "id": 3717,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 2274,
+                                          "id": 3716,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1854,
-                                          "src": "14180:6:5",
+                                          "referencedDeclaration": 3296,
+                                          "src": "14180:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -22298,24 +22298,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "14165:22:5",
+                                        "src": "14165:22:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 2277,
+                                      "id": 3719,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 2276,
+                                        "id": 3718,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "14188:1:5",
+                                        "src": "14188:1:7",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_1_by_1",
@@ -22328,7 +22328,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14165:25:5",
+                                      "src": "14165:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22342,18 +22342,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2272,
+                                    "id": 3714,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "14140:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "14140:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2278,
+                                  "id": 3720,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22361,20 +22361,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14140:51:5",
+                                  "src": "14140:51:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2279,
+                                "id": 3721,
                                 "nodeType": "EmitStatement",
-                                "src": "14135:56:5"
+                                "src": "14135:56:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2286,
+                                  "id": 3728,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22385,26 +22385,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2280,
+                                        "id": 3722,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "14209:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "14209:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2283,
+                                      "id": 3725,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2281,
+                                        "id": 3723,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14224:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14224:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22415,24 +22415,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14209:22:5",
+                                      "src": "14209:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2284,
+                                    "id": 3726,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 2282,
+                                      "id": 3724,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14232:1:5",
+                                      "src": "14232:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -22445,7 +22445,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14209:25:5",
+                                    "src": "14209:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22456,14 +22456,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2285,
+                                    "id": 3727,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14237:1:5",
+                                    "src": "14237:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -22471,20 +22471,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14209:29:5",
+                                  "src": "14209:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2287,
+                                "id": 3729,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14209:29:5"
+                                "src": "14209:29:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2294,
+                                  "id": 3736,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22495,26 +22495,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2288,
+                                        "id": 3730,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "14256:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "14256:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2291,
+                                      "id": 3733,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2289,
+                                        "id": 3731,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14271:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14271:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22525,24 +22525,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14256:22:5",
+                                      "src": "14256:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2292,
+                                    "id": 3734,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2290,
+                                      "id": 3732,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14279:1:5",
+                                      "src": "14279:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -22555,7 +22555,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14256:25:5",
+                                    "src": "14256:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22566,14 +22566,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2293,
+                                    "id": 3735,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14284:1:5",
+                                    "src": "14284:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -22581,15 +22581,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14256:29:5",
+                                  "src": "14256:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2295,
+                                "id": 3737,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14256:29:5"
+                                "src": "14256:29:7"
                               },
                               {
                                 "expression": {
@@ -22597,12 +22597,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2297,
+                                      "id": 3739,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "14308:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "14308:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22616,18 +22616,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2296,
+                                    "id": 3738,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1852,
-                                    "src": "14303:4:5",
+                                    "referencedDeclaration": 3294,
+                                    "src": "14303:4:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 2298,
+                                  "id": 3740,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22635,20 +22635,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14303:12:5",
+                                  "src": "14303:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 2299,
+                                "id": 3741,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14303:12:5"
+                                "src": "14303:12:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2305,
+                                  "id": 3747,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22659,26 +22659,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2300,
+                                        "id": 3742,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "14333:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "14333:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2302,
+                                      "id": 3744,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2301,
+                                        "id": 3743,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14339:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14339:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22689,21 +22689,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14333:13:5",
+                                      "src": "14333:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2303,
+                                    "id": 3745,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 757,
-                                    "src": "14333:19:5",
+                                    "referencedDeclaration": 2199,
+                                    "src": "14333:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22713,31 +22713,31 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2304,
+                                    "id": 3746,
                                     "name": "newPrice",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1856,
-                                    "src": "14355:8:5",
+                                    "referencedDeclaration": 3298,
+                                    "src": "14355:8:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14333:30:5",
+                                  "src": "14333:30:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2306,
+                                "id": 3748,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14333:30:5"
+                                "src": "14333:30:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2313,
+                                  "id": 3755,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22748,26 +22748,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2307,
+                                        "id": 3749,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "14381:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "14381:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2309,
+                                      "id": 3751,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2308,
+                                        "id": 3750,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14387:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14387:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22778,21 +22778,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14381:13:5",
+                                      "src": "14381:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2310,
+                                    "id": 3752,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 755,
-                                    "src": "14381:22:5",
+                                    "referencedDeclaration": 2197,
+                                    "src": "14381:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22804,40 +22804,40 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2311,
+                                      "id": 3753,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1990,
-                                      "src": "14406:15:5",
+                                      "referencedDeclaration": 3432,
+                                      "src": "14406:15:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 2312,
+                                    "id": 3754,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 807,
-                                    "src": "14406:24:5",
+                                    "referencedDeclaration": 2249,
+                                    "src": "14406:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14381:49:5",
+                                  "src": "14381:49:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2314,
+                                "id": 3756,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14381:49:5"
+                                "src": "14381:49:7"
                               },
                               {
                                 "eventCall": {
@@ -22845,12 +22845,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2316,
+                                      "id": 3758,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "14478:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "14478:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22864,18 +22864,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2315,
+                                    "id": 3757,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "14453:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "14453:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2317,
+                                  "id": 3759,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22883,31 +22883,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14453:40:5",
+                                  "src": "14453:40:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2318,
+                                "id": 3760,
                                 "nodeType": "EmitStatement",
-                                "src": "14448:45:5"
+                                "src": "14448:45:7"
                               }
                             ]
                           }
                         },
-                        "id": 2324,
+                        "id": 3766,
                         "nodeType": "IfStatement",
-                        "src": "13526:1042:5",
+                        "src": "13526:1042:7",
                         "trueBody": {
-                          "id": 2248,
+                          "id": 3690,
                           "nodeType": "Block",
-                          "src": "13603:285:5",
+                          "src": "13603:285:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2223,
+                                "id": 3665,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -22918,26 +22918,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2217,
+                                      "id": 3659,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "13621:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "13621:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2219,
+                                    "id": 3661,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2218,
+                                      "id": 3660,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "13630:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "13630:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22948,23 +22948,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13621:24:5",
+                                    "src": "13621:24:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2220,
+                                  "id": 3662,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "13621:31:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "13621:31:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -22974,18 +22974,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2221,
+                                    "id": 3663,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "13655:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "13655:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2222,
+                                  "id": 3664,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -22993,21 +22993,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13655:30:5",
+                                  "src": "13655:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13621:64:5",
+                                "src": "13621:64:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2224,
+                              "id": 3666,
                               "nodeType": "ExpressionStatement",
-                              "src": "13621:64:5"
+                              "src": "13621:64:7"
                             },
                             {
                               "expression": {
@@ -23015,12 +23015,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2226,
+                                    "id": 3668,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "13708:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "13708:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -23034,18 +23034,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2225,
+                                  "id": 3667,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1852,
-                                  "src": "13703:4:5",
+                                  "referencedDeclaration": 3294,
+                                  "src": "13703:4:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 2227,
+                                "id": 3669,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23053,20 +23053,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13703:12:5",
+                                "src": "13703:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 2228,
+                              "id": 3670,
                               "nodeType": "ExpressionStatement",
-                              "src": "13703:12:5"
+                              "src": "13703:12:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2234,
+                                "id": 3676,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23077,26 +23077,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2229,
+                                      "id": 3671,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "13733:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "13733:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 2231,
+                                    "id": 3673,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2230,
+                                      "id": 3672,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "13739:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "13739:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -23107,21 +23107,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13733:13:5",
+                                    "src": "13733:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 2232,
+                                  "id": 3674,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "13733:19:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "13733:19:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23131,31 +23131,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2233,
+                                  "id": 3675,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1856,
-                                  "src": "13755:8:5",
+                                  "referencedDeclaration": 3298,
+                                  "src": "13755:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13733:30:5",
+                                "src": "13733:30:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2235,
+                              "id": 3677,
                               "nodeType": "ExpressionStatement",
-                              "src": "13733:30:5"
+                              "src": "13733:30:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2242,
+                                "id": 3684,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23166,26 +23166,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2236,
+                                      "id": 3678,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 915,
-                                      "src": "13781:14:5",
+                                      "referencedDeclaration": 2357,
+                                      "src": "13781:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 2239,
+                                    "id": 3681,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2237,
+                                      "id": 3679,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "13796:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "13796:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -23196,24 +23196,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13781:22:5",
+                                    "src": "13781:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 2240,
+                                  "id": 3682,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2238,
+                                    "id": 3680,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "13804:1:5",
+                                    "src": "13804:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -23226,7 +23226,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "13781:25:5",
+                                  "src": "13781:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23237,14 +23237,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2241,
+                                  "id": 3683,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13809:1:5",
+                                  "src": "13809:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -23252,15 +23252,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "13781:29:5",
+                                "src": "13781:29:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2243,
+                              "id": 3685,
                               "nodeType": "ExpressionStatement",
-                              "src": "13781:29:5"
+                              "src": "13781:29:7"
                             },
                             {
                               "eventCall": {
@@ -23268,12 +23268,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2245,
+                                    "id": 3687,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 888,
-                                    "src": "13858:14:5",
+                                    "referencedDeclaration": 2330,
+                                    "src": "13858:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -23287,18 +23287,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2244,
+                                  "id": 3686,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 840,
-                                  "src": "13833:24:5",
+                                  "referencedDeclaration": 2282,
+                                  "src": "13833:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 2246,
+                                "id": 3688,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23306,15 +23306,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13833:40:5",
+                                "src": "13833:40:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 2247,
+                              "id": 3689,
                               "nodeType": "EmitStatement",
-                              "src": "13828:45:5"
+                              "src": "13828:45:7"
                             }
                           ]
                         }
@@ -23325,7 +23325,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2341,
+                    "id": 3783,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -23336,26 +23336,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2327,
+                          "id": 3769,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "14588:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "14588:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 2329,
+                        "id": 3771,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2328,
+                          "id": 3770,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "14594:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "14594:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23366,21 +23366,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "14588:13:5",
+                        "src": "14588:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 2330,
+                      "id": 3772,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 761,
-                      "src": "14588:21:5",
+                      "referencedDeclaration": 2203,
+                      "src": "14588:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -23397,26 +23397,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2336,
+                              "id": 3778,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "14640:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "14640:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2338,
+                            "id": 3780,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2337,
+                              "id": 3779,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "14646:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "14646:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -23427,21 +23427,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14640:13:5",
+                            "src": "14640:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2339,
+                          "id": 3781,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 755,
-                          "src": "14640:22:5",
+                          "referencedDeclaration": 2197,
+                          "src": "14640:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23461,26 +23461,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2331,
+                              "id": 3773,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "14612:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "14612:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2333,
+                            "id": 3775,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2332,
+                              "id": 3774,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "14618:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "14618:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -23491,41 +23491,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14612:13:5",
+                            "src": "14612:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2334,
+                          "id": 3776,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 759,
-                          "src": "14612:23:5",
+                          "referencedDeclaration": 2201,
+                          "src": "14612:23:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2335,
+                        "id": 3777,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "14612:27:5",
+                        "referencedDeclaration": 10795,
+                        "src": "14612:27:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 2340,
+                      "id": 3782,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -23533,45 +23533,45 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "14612:51:5",
+                      "src": "14612:51:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "14588:75:5",
+                    "src": "14588:75:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2342,
+                  "id": 3784,
                   "nodeType": "ExpressionStatement",
-                  "src": "14588:75:5"
+                  "src": "14588:75:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2343,
+                    "id": 3785,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 888,
-                    "src": "14680:14:5",
+                    "referencedDeclaration": 2330,
+                    "src": "14680:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1862,
-                  "id": 2344,
+                  "functionReturnParameters": 3304,
+                  "id": 3786,
                   "nodeType": "Return",
-                  "src": "14673:21:5"
+                  "src": "14673:21:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2346,
+            "id": 3788,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -23579,16 +23579,16 @@
             "name": "CreateChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1859,
+              "id": 3301,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1854,
+                  "id": 3296,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10643:11:5",
+                  "scope": 3788,
+                  "src": "10643:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23596,10 +23596,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1853,
+                    "id": 3295,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10643:4:5",
+                    "src": "10643:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23610,11 +23610,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1856,
+                  "id": 3298,
                   "name": "newPrice",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10656:13:5",
+                  "scope": 3788,
+                  "src": "10656:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23622,10 +23622,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1855,
+                    "id": 3297,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10656:4:5",
+                    "src": "10656:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23636,11 +23636,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1858,
+                  "id": 3300,
                   "name": "newDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10671:16:5",
+                  "scope": 3788,
+                  "src": "10671:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23648,10 +23648,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1857,
+                    "id": 3299,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10671:4:5",
+                    "src": "10671:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23661,20 +23661,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10642:46:5"
+              "src": "10642:46:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1862,
+              "id": 3304,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1861,
+                  "id": 3303,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10705:20:5",
+                  "scope": 3788,
+                  "src": "10705:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23682,10 +23682,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1860,
+                    "id": 3302,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10705:4:5",
+                    "src": "10705:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23695,47 +23695,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10704:22:5"
+              "src": "10704:22:7"
             },
-            "scope": 3787,
-            "src": "10614:4087:5",
+            "scope": 5229,
+            "src": "10614:4087:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2492,
+              "id": 3934,
               "nodeType": "Block",
-              "src": "14780:1218:5",
+              "src": "14780:1218:7",
               "statements": [
                 {
                   "assignments": [
-                    2354
+                    3796
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2354,
+                      "id": 3796,
                       "name": "request",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2493,
-                      "src": "14790:28:5",
+                      "scope": 3935,
+                      "src": "14790:28:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                         "typeString": "struct Market.ChangeRequest"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2353,
+                        "id": 3795,
                         "name": "ChangeRequest",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 810,
-                        "src": "14790:13:5",
+                        "referencedDeclaration": 2252,
+                        "src": "14790:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                           "typeString": "struct Market.ChangeRequest"
                         }
                       },
@@ -23743,31 +23743,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2358,
+                  "id": 3800,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2355,
+                      "id": 3797,
                       "name": "requests",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 909,
-                      "src": "14821:8:5",
+                      "referencedDeclaration": 2351,
+                      "src": "14821:8:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                       }
                     },
-                    "id": 2357,
+                    "id": 3799,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2356,
+                      "id": 3798,
                       "name": "changeRequestID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2348,
-                      "src": "14830:15:5",
+                      "referencedDeclaration": 3790,
+                      "src": "14830:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -23778,14 +23778,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "14821:25:5",
+                    "src": "14821:25:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "14790:56:5"
+                  "src": "14790:56:7"
                 },
                 {
                   "expression": {
@@ -23797,7 +23797,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2385,
+                        "id": 3827,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -23808,7 +23808,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2376,
+                          "id": 3818,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -23819,7 +23819,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2367,
+                            "id": 3809,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -23828,18 +23828,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2360,
+                                "id": 3802,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "14864:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "14864:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2361,
+                              "id": 3803,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -23847,7 +23847,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14864:10:5",
+                              "src": "14864:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -23861,42 +23861,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2362,
+                                  "id": 3804,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "14878:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "14878:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2365,
+                                "id": 3807,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2363,
+                                    "id": 3805,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2354,
-                                    "src": "14884:7:5",
+                                    "referencedDeclaration": 3796,
+                                    "src": "14884:7:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2364,
+                                  "id": 3806,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 801,
-                                  "src": "14884:14:5",
+                                  "referencedDeclaration": 2243,
+                                  "src": "14884:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23907,27 +23907,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14878:21:5",
+                                "src": "14878:21:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2366,
+                              "id": 3808,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "14878:32:5",
+                              "referencedDeclaration": 2187,
+                              "src": "14878:32:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14864:46:5",
+                            "src": "14864:46:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -23941,7 +23941,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2375,
+                            "id": 3817,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -23950,18 +23950,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2368,
+                                "id": 3810,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "14914:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "14914:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2369,
+                              "id": 3811,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -23969,7 +23969,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14914:10:5",
+                              "src": "14914:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -23983,42 +23983,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2370,
+                                  "id": 3812,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "14928:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "14928:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2373,
+                                "id": 3815,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2371,
+                                    "id": 3813,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2354,
-                                    "src": "14934:7:5",
+                                    "referencedDeclaration": 3796,
+                                    "src": "14934:7:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2372,
+                                  "id": 3814,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 801,
-                                  "src": "14934:14:5",
+                                  "referencedDeclaration": 2243,
+                                  "src": "14934:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -24029,33 +24029,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14928:21:5",
+                                "src": "14928:21:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2374,
+                              "id": 3816,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 749,
-                              "src": "14928:30:5",
+                              "referencedDeclaration": 2191,
+                              "src": "14928:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14914:44:5",
+                            "src": "14914:44:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "14864:94:5",
+                          "src": "14864:94:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -24069,7 +24069,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2384,
+                          "id": 3826,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24078,18 +24078,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2377,
+                              "id": 3819,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "14962:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "14962:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2378,
+                            "id": 3820,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -24097,7 +24097,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "14962:10:5",
+                            "src": "14962:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -24111,42 +24111,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2379,
+                                "id": 3821,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "14976:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "14976:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2382,
+                              "id": 3824,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2380,
+                                  "id": 3822,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "14982:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "14982:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2381,
+                                "id": 3823,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "14982:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "14982:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24157,33 +24157,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "14976:21:5",
+                              "src": "14976:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2383,
+                            "id": 3825,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "14976:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "14976:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "14962:46:5",
+                          "src": "14962:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "14864:144:5",
+                        "src": "14864:144:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -24197,21 +24197,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2359,
+                      "id": 3801,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "14856:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "14856:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2386,
+                    "id": 3828,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24219,15 +24219,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "14856:153:5",
+                    "src": "14856:153:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2387,
+                  "id": 3829,
                   "nodeType": "ExpressionStatement",
-                  "src": "14856:153:5"
+                  "src": "14856:153:7"
                 },
                 {
                   "expression": {
@@ -24236,10 +24236,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$736",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
                           "typeString": "enum Market.RequestStatus"
                         },
-                        "id": 2393,
+                        "id": 3835,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -24248,28 +24248,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2389,
+                            "id": 3831,
                             "name": "request",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2354,
-                            "src": "15027:7:5",
+                            "referencedDeclaration": 3796,
+                            "src": "15027:7:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
-                          "id": 2390,
+                          "id": 3832,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 809,
-                          "src": "15027:14:5",
+                          "referencedDeclaration": 2251,
+                          "src": "15027:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
@@ -24279,18 +24279,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2391,
+                            "id": 3833,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 736,
-                            "src": "15045:13:5",
+                            "referencedDeclaration": 2178,
+                            "src": "15045:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 2392,
+                          "id": 3834,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -24298,13 +24298,13 @@
                           "memberName": "REQUEST_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "15045:30:5",
+                          "src": "15045:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "src": "15027:48:5",
+                        "src": "15027:48:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -24318,21 +24318,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2388,
+                      "id": 3830,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "15019:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "15019:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2394,
+                    "id": 3836,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24340,24 +24340,24 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "15019:57:5",
+                    "src": "15019:57:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2395,
+                  "id": 3837,
                   "nodeType": "ExpressionStatement",
-                  "src": "15019:57:5"
+                  "src": "15019:57:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2400,
+                    "id": 3842,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24366,28 +24366,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2396,
+                        "id": 3838,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2354,
-                        "src": "15091:7:5",
+                        "referencedDeclaration": 3796,
+                        "src": "15091:7:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 2397,
+                      "id": 3839,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 803,
-                      "src": "15091:19:5",
+                      "referencedDeclaration": 2245,
+                      "src": "15091:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -24397,18 +24397,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2398,
+                        "id": 3840,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "15114:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "15114:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2399,
+                      "id": 3841,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -24416,26 +24416,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15114:19:5",
+                      "src": "15114:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15091:42:5",
+                    "src": "15091:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2442,
+                  "id": 3884,
                   "nodeType": "IfStatement",
-                  "src": "15087:437:5",
+                  "src": "15087:437:7",
                   "trueBody": {
-                    "id": 2441,
+                    "id": 3883,
                     "nodeType": "Block",
-                    "src": "15135:389:5",
+                    "src": "15135:389:7",
                     "statements": [
                       {
                         "condition": {
@@ -24444,7 +24444,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2408,
+                          "id": 3850,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24453,18 +24453,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2401,
+                              "id": 3843,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "15153:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "15153:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2402,
+                            "id": 3844,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -24472,7 +24472,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15153:10:5",
+                            "src": "15153:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -24486,42 +24486,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2403,
+                                "id": 3845,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "15167:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "15167:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2406,
+                              "id": 3848,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2404,
+                                  "id": 3846,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15173:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15173:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2405,
+                                "id": 3847,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15173:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15173:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24532,41 +24532,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15167:21:5",
+                              "src": "15167:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2407,
+                            "id": 3849,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "15167:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "15167:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15153:46:5",
+                          "src": "15153:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 2426,
+                          "id": 3868,
                           "nodeType": "Block",
-                          "src": "15305:98:5",
+                          "src": "15305:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2424,
+                                "id": 3866,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -24577,26 +24577,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2418,
+                                      "id": 3860,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15323:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15323:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2420,
+                                    "id": 3862,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2419,
+                                      "id": 3861,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15332:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15332:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -24607,23 +24607,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15323:25:5",
+                                    "src": "15323:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2421,
+                                  "id": 3863,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15323:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15323:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -24633,18 +24633,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2422,
+                                    "id": 3864,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15358:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15358:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2423,
+                                  "id": 3865,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -24652,36 +24652,36 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15358:30:5",
+                                  "src": "15358:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15323:65:5",
+                                "src": "15323:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2425,
+                              "id": 3867,
                               "nodeType": "ExpressionStatement",
-                              "src": "15323:65:5"
+                              "src": "15323:65:7"
                             }
                           ]
                         },
-                        "id": 2427,
+                        "id": 3869,
                         "nodeType": "IfStatement",
-                        "src": "15149:254:5",
+                        "src": "15149:254:7",
                         "trueBody": {
-                          "id": 2417,
+                          "id": 3859,
                           "nodeType": "Block",
-                          "src": "15201:98:5",
+                          "src": "15201:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2415,
+                                "id": 3857,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -24692,26 +24692,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2409,
+                                      "id": 3851,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15219:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15219:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2411,
+                                    "id": 3853,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2410,
+                                      "id": 3852,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15228:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15228:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -24722,23 +24722,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15219:25:5",
+                                    "src": "15219:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2412,
+                                  "id": 3854,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15219:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15219:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -24748,18 +24748,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2413,
+                                    "id": 3855,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15254:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15254:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2414,
+                                  "id": 3856,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -24767,21 +24767,21 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15254:30:5",
+                                  "src": "15254:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15219:65:5",
+                                "src": "15219:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2416,
+                              "id": 3858,
                               "nodeType": "ExpressionStatement",
-                              "src": "15219:65:5"
+                              "src": "15219:65:7"
                             }
                           ]
                         }
@@ -24789,7 +24789,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2435,
+                          "id": 3877,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24800,42 +24800,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2428,
+                                "id": 3870,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "15416:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "15416:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2432,
+                              "id": 3874,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2429,
+                                  "id": 3871,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15431:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15431:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2430,
+                                "id": 3872,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15431:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15431:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24846,24 +24846,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15416:30:5",
+                              "src": "15416:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2433,
+                            "id": 3875,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 2431,
+                              "id": 3873,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15447:1:5",
+                              "src": "15447:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -24876,7 +24876,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15416:33:5",
+                            "src": "15416:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -24887,14 +24887,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2434,
+                            "id": 3876,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15452:1:5",
+                            "src": "15452:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -24902,15 +24902,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15416:37:5",
+                          "src": "15416:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2436,
+                        "id": 3878,
                         "nodeType": "ExpressionStatement",
-                        "src": "15416:37:5"
+                        "src": "15416:37:7"
                       },
                       {
                         "eventCall": {
@@ -24918,12 +24918,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2438,
+                              "id": 3880,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2348,
-                              "src": "15497:15:5",
+                              "referencedDeclaration": 3790,
+                              "src": "15497:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -24937,18 +24937,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2437,
+                            "id": 3879,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "15472:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "15472:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2439,
+                          "id": 3881,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24956,15 +24956,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15472:41:5",
+                          "src": "15472:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2440,
+                        "id": 3882,
                         "nodeType": "EmitStatement",
-                        "src": "15467:46:5"
+                        "src": "15467:46:7"
                       }
                     ]
                   }
@@ -24973,10 +24973,10 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2447,
+                    "id": 3889,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24985,28 +24985,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2443,
+                        "id": 3885,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2354,
-                        "src": "15538:7:5",
+                        "referencedDeclaration": 3796,
+                        "src": "15538:7:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 2444,
+                      "id": 3886,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 803,
-                      "src": "15538:19:5",
+                      "referencedDeclaration": 2245,
+                      "src": "15538:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -25016,18 +25016,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2445,
+                        "id": 3887,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "15561:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "15561:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2446,
+                      "id": 3888,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -25035,26 +25035,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15561:19:5",
+                      "src": "15561:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15538:42:5",
+                    "src": "15538:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2489,
+                  "id": 3931,
                   "nodeType": "IfStatement",
-                  "src": "15534:437:5",
+                  "src": "15534:437:7",
                   "trueBody": {
-                    "id": 2488,
+                    "id": 3930,
                     "nodeType": "Block",
-                    "src": "15582:389:5",
+                    "src": "15582:389:7",
                     "statements": [
                       {
                         "condition": {
@@ -25063,7 +25063,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2455,
+                          "id": 3897,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25072,18 +25072,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2448,
+                              "id": 3890,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "15600:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "15600:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2449,
+                            "id": 3891,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -25091,7 +25091,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15600:10:5",
+                            "src": "15600:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -25105,42 +25105,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2450,
+                                "id": 3892,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "15614:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "15614:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2453,
+                              "id": 3895,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2451,
+                                  "id": 3893,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15620:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15620:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2452,
+                                "id": 3894,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15620:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15620:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -25151,41 +25151,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15614:21:5",
+                              "src": "15614:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2454,
+                            "id": 3896,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "15614:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "15614:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15600:46:5",
+                          "src": "15600:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 2473,
+                          "id": 3915,
                           "nodeType": "Block",
-                          "src": "15752:98:5",
+                          "src": "15752:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2471,
+                                "id": 3913,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -25196,26 +25196,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2465,
+                                      "id": 3907,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15770:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15770:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2467,
+                                    "id": 3909,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2466,
+                                      "id": 3908,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15779:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15779:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -25226,23 +25226,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15770:25:5",
+                                    "src": "15770:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2468,
+                                  "id": 3910,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15770:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15770:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -25252,18 +25252,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2469,
+                                    "id": 3911,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15805:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15805:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2470,
+                                  "id": 3912,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -25271,36 +25271,36 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15805:30:5",
+                                  "src": "15805:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15770:65:5",
+                                "src": "15770:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2472,
+                              "id": 3914,
                               "nodeType": "ExpressionStatement",
-                              "src": "15770:65:5"
+                              "src": "15770:65:7"
                             }
                           ]
                         },
-                        "id": 2474,
+                        "id": 3916,
                         "nodeType": "IfStatement",
-                        "src": "15596:254:5",
+                        "src": "15596:254:7",
                         "trueBody": {
-                          "id": 2464,
+                          "id": 3906,
                           "nodeType": "Block",
-                          "src": "15648:98:5",
+                          "src": "15648:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2462,
+                                "id": 3904,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -25311,26 +25311,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2456,
+                                      "id": 3898,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15666:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15666:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2458,
+                                    "id": 3900,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2457,
+                                      "id": 3899,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15675:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15675:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -25341,23 +25341,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15666:25:5",
+                                    "src": "15666:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2459,
+                                  "id": 3901,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15666:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15666:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -25367,18 +25367,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2460,
+                                    "id": 3902,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15701:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15701:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2461,
+                                  "id": 3903,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -25386,21 +25386,21 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15701:30:5",
+                                  "src": "15701:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15666:65:5",
+                                "src": "15666:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2463,
+                              "id": 3905,
                               "nodeType": "ExpressionStatement",
-                              "src": "15666:65:5"
+                              "src": "15666:65:7"
                             }
                           ]
                         }
@@ -25408,7 +25408,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2482,
+                          "id": 3924,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25419,42 +25419,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2475,
+                                "id": 3917,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "15863:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "15863:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2479,
+                              "id": 3921,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2476,
+                                  "id": 3918,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15878:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15878:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2477,
+                                "id": 3919,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15878:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15878:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -25465,24 +25465,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15863:30:5",
+                              "src": "15863:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2480,
+                            "id": 3922,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2478,
+                              "id": 3920,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15894:1:5",
+                              "src": "15894:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -25495,7 +25495,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15863:33:5",
+                            "src": "15863:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -25506,14 +25506,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2481,
+                            "id": 3923,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15899:1:5",
+                            "src": "15899:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -25521,15 +25521,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15863:37:5",
+                          "src": "15863:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2483,
+                        "id": 3925,
                         "nodeType": "ExpressionStatement",
-                        "src": "15863:37:5"
+                        "src": "15863:37:7"
                       },
                       {
                         "eventCall": {
@@ -25537,12 +25537,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2485,
+                              "id": 3927,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2348,
-                              "src": "15944:15:5",
+                              "referencedDeclaration": 3790,
+                              "src": "15944:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -25556,18 +25556,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2484,
+                            "id": 3926,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "15919:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "15919:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2486,
+                          "id": 3928,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25575,15 +25575,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15919:41:5",
+                          "src": "15919:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2487,
+                        "id": 3929,
                         "nodeType": "EmitStatement",
-                        "src": "15914:46:5"
+                        "src": "15914:46:7"
                       }
                     ]
                   }
@@ -25592,14 +25592,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2490,
+                    "id": 3932,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "15987:4:5",
+                    "src": "15987:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -25607,15 +25607,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2352,
-                  "id": 2491,
+                  "functionReturnParameters": 3794,
+                  "id": 3933,
                   "nodeType": "Return",
-                  "src": "15980:11:5"
+                  "src": "15980:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2493,
+            "id": 3935,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -25623,16 +25623,16 @@
             "name": "CancelChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2349,
+              "id": 3791,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2348,
+                  "id": 3790,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2493,
-                  "src": "14736:20:5",
+                  "scope": 3935,
+                  "src": "14736:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25640,10 +25640,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2347,
+                    "id": 3789,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14736:4:5",
+                    "src": "14736:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -25653,20 +25653,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14735:22:5"
+              "src": "14735:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2352,
+              "id": 3794,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2351,
+                  "id": 3793,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2493,
-                  "src": "14774:4:5",
+                  "scope": 3935,
+                  "src": "14774:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25674,10 +25674,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2350,
+                    "id": 3792,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14774:4:5",
+                    "src": "14774:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -25687,19 +25687,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14773:6:5"
+              "src": "14773:6:7"
             },
-            "scope": 3787,
-            "src": "14707:1291:5",
+            "scope": 5229,
+            "src": "14707:1291:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2546,
+              "id": 3988,
               "nodeType": "Block",
-              "src": "16113:280:5",
+              "src": "16113:280:7",
               "statements": [
                 {
                   "expression": {
@@ -25711,7 +25711,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2509,
+                        "id": 3951,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -25723,18 +25723,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2504,
+                                "id": 3946,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "16141:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "16141:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2505,
+                              "id": 3947,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -25742,7 +25742,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16141:10:5",
+                              "src": "16141:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -25756,18 +25756,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 2503,
+                            "id": 3945,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2856,
-                            "src": "16131:9:5",
+                            "referencedDeclaration": 4298,
+                            "src": "16131:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 2506,
+                          "id": 3948,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25775,7 +25775,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16131:21:5",
+                          "src": "16131:21:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -25787,18 +25787,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2507,
+                            "id": 3949,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "16156:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "16156:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2508,
+                          "id": 3950,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25806,13 +25806,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16156:10:5",
+                          "src": "16156:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16131:35:5",
+                        "src": "16131:35:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -25826,21 +25826,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2502,
+                      "id": 3944,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16123:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16123:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2510,
+                    "id": 3952,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -25848,15 +25848,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16123:44:5",
+                    "src": "16123:44:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2511,
+                  "id": 3953,
                   "nodeType": "ExpressionStatement",
-                  "src": "16123:44:5"
+                  "src": "16123:44:7"
                 },
                 {
                   "expression": {
@@ -25868,7 +25868,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2518,
+                        "id": 3960,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -25877,34 +25877,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2513,
+                            "id": 3955,
                             "name": "isMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 923,
-                            "src": "16185:8:5",
+                            "referencedDeclaration": 2365,
+                            "src": "16185:8:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 2516,
+                          "id": 3958,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2514,
+                              "id": 3956,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "16194:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "16194:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2515,
+                            "id": 3957,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -25912,7 +25912,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "16194:10:5",
+                            "src": "16194:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -25923,7 +25923,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16185:20:5",
+                          "src": "16185:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -25934,14 +25934,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 2517,
+                          "id": 3959,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16209:5:5",
+                          "src": "16209:5:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -25949,7 +25949,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "16185:29:5",
+                        "src": "16185:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -25963,21 +25963,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2512,
+                      "id": 3954,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16177:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16177:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2519,
+                    "id": 3961,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -25985,15 +25985,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16177:38:5",
+                    "src": "16177:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2520,
+                  "id": 3962,
                   "nodeType": "ExpressionStatement",
-                  "src": "16177:38:5"
+                  "src": "16177:38:7"
                 },
                 {
                   "expression": {
@@ -26005,7 +26005,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2526,
+                        "id": 3968,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26015,12 +26015,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2523,
+                              "id": 3965,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2495,
-                              "src": "16243:7:5",
+                              "referencedDeclaration": 3937,
+                              "src": "16243:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -26034,18 +26034,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 2522,
+                            "id": 3964,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2856,
-                            "src": "16233:9:5",
+                            "referencedDeclaration": 4298,
+                            "src": "16233:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 2524,
+                          "id": 3966,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -26053,7 +26053,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16233:18:5",
+                          "src": "16233:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26063,18 +26063,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2525,
+                          "id": 3967,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2495,
-                          "src": "16255:7:5",
+                          "referencedDeclaration": 3937,
+                          "src": "16255:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16233:29:5",
+                        "src": "16233:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -26088,21 +26088,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2521,
+                      "id": 3963,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16225:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16225:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2527,
+                    "id": 3969,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26110,20 +26110,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16225:38:5",
+                    "src": "16225:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2528,
+                  "id": 3970,
                   "nodeType": "ExpressionStatement",
-                  "src": "16225:38:5"
+                  "src": "16225:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2536,
+                    "id": 3978,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26134,26 +26134,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2529,
+                          "id": 3971,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 929,
-                          "src": "16273:13:5",
+                          "referencedDeclaration": 2371,
+                          "src": "16273:13:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 2533,
+                        "id": 3975,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2530,
+                          "id": 3972,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2495,
-                          "src": "16287:7:5",
+                          "referencedDeclaration": 3937,
+                          "src": "16287:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26164,29 +26164,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16273:22:5",
+                        "src": "16273:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2534,
+                      "id": 3976,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2531,
+                          "id": 3973,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16296:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16296:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2532,
+                        "id": 3974,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26194,7 +26194,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16296:10:5",
+                        "src": "16296:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26205,7 +26205,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16273:34:5",
+                      "src": "16273:34:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26216,14 +26216,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 2535,
+                      "id": 3977,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16310:4:5",
+                      "src": "16310:4:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -26231,15 +26231,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "16273:41:5",
+                    "src": "16273:41:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2537,
+                  "id": 3979,
                   "nodeType": "ExpressionStatement",
-                  "src": "16273:41:5"
+                  "src": "16273:41:7"
                 },
                 {
                   "eventCall": {
@@ -26249,18 +26249,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2539,
+                          "id": 3981,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16345:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16345:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2540,
+                        "id": 3982,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26268,7 +26268,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16345:10:5",
+                        "src": "16345:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26276,12 +26276,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2541,
+                        "id": 3983,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2495,
-                        "src": "16357:7:5",
+                        "referencedDeclaration": 3937,
+                        "src": "16357:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26299,18 +26299,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2538,
+                      "id": 3980,
                       "name": "WorkerAnnounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 846,
-                      "src": "16329:15:5",
+                      "referencedDeclaration": 2288,
+                      "src": "16329:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2542,
+                    "id": 3984,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26318,28 +26318,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16329:36:5",
+                    "src": "16329:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2543,
+                  "id": 3985,
                   "nodeType": "EmitStatement",
-                  "src": "16324:41:5"
+                  "src": "16324:41:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2544,
+                    "id": 3986,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16382:4:5",
+                    "src": "16382:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -26347,52 +26347,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2501,
-                  "id": 2545,
+                  "functionReturnParameters": 3943,
+                  "id": 3987,
                   "nodeType": "Return",
-                  "src": "16375:11:5"
+                  "src": "16375:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2547,
+            "id": 3989,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2498,
+                "id": 3940,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2497,
+                  "id": 3939,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16084:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16084:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16084:13:5"
+                "src": "16084:13:7"
               }
             ],
             "name": "RegisterWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2496,
+              "id": 3938,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2495,
+                  "id": 3937,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2547,
-                  "src": "16060:15:5",
+                  "scope": 3989,
+                  "src": "16060:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -26400,10 +26400,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2494,
+                    "id": 3936,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16060:7:5",
+                    "src": "16060:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -26413,20 +26413,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16059:17:5"
+              "src": "16059:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2501,
+              "id": 3943,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2500,
+                  "id": 3942,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2547,
-                  "src": "16107:4:5",
+                  "scope": 3989,
+                  "src": "16107:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -26434,10 +26434,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2499,
+                    "id": 3941,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16107:4:5",
+                    "src": "16107:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -26447,19 +26447,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16106:6:5"
+              "src": "16106:6:7"
             },
-            "scope": 3787,
-            "src": "16036:357:5",
+            "scope": 5229,
+            "src": "16036:357:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2597,
+              "id": 4039,
               "nodeType": "Block",
-              "src": "16475:268:5",
+              "src": "16475:268:7",
               "statements": [
                 {
                   "expression": {
@@ -26471,7 +26471,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2564,
+                        "id": 4006,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26482,34 +26482,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2557,
+                              "id": 3999,
                               "name": "masterRequest",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 929,
-                              "src": "16493:13:5",
+                              "referencedDeclaration": 2371,
+                              "src": "16493:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 2560,
+                            "id": 4002,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2558,
+                                "id": 4000,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "16507:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "16507:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2559,
+                              "id": 4001,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -26517,7 +26517,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16507:10:5",
+                              "src": "16507:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -26528,21 +26528,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "16493:25:5",
+                            "src": "16493:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 2562,
+                          "id": 4004,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2561,
+                            "id": 4003,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2549,
-                            "src": "16519:7:5",
+                            "referencedDeclaration": 3991,
+                            "src": "16519:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -26553,7 +26553,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16493:34:5",
+                          "src": "16493:34:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -26564,14 +26564,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 2563,
+                          "id": 4005,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16531:4:5",
+                          "src": "16531:4:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -26579,7 +26579,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "16493:42:5",
+                        "src": "16493:42:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -26593,21 +26593,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2556,
+                      "id": 3998,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16485:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16485:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2565,
+                    "id": 4007,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26615,20 +26615,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16485:51:5",
+                    "src": "16485:51:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2566,
+                  "id": 4008,
                   "nodeType": "ExpressionStatement",
-                  "src": "16485:51:5"
+                  "src": "16485:51:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2572,
+                    "id": 4014,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26637,26 +26637,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2567,
+                        "id": 4009,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 919,
-                        "src": "16546:8:5",
+                        "referencedDeclaration": 2361,
+                        "src": "16546:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 2569,
+                      "id": 4011,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2568,
+                        "id": 4010,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16555:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16555:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26667,7 +26667,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16546:17:5",
+                      "src": "16546:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -26679,18 +26679,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2570,
+                        "id": 4012,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "16566:3:5",
+                        "referencedDeclaration": 11315,
+                        "src": "16566:3:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 2571,
+                      "id": 4013,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -26698,26 +26698,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "16566:10:5",
+                      "src": "16566:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "16546:30:5",
+                    "src": "16546:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 2573,
+                  "id": 4015,
                   "nodeType": "ExpressionStatement",
-                  "src": "16546:30:5"
+                  "src": "16546:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2579,
+                    "id": 4021,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26726,34 +26726,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2574,
+                        "id": 4016,
                         "name": "isMaster",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 923,
-                        "src": "16586:8:5",
+                        "referencedDeclaration": 2365,
+                        "src": "16586:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2577,
+                      "id": 4019,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2575,
+                          "id": 4017,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16595:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16595:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2576,
+                        "id": 4018,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26761,7 +26761,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16595:10:5",
+                        "src": "16595:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26772,7 +26772,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16586:20:5",
+                      "src": "16586:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26783,14 +26783,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 2578,
+                      "id": 4020,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16609:4:5",
+                      "src": "16609:4:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -26798,20 +26798,20 @@
                       },
                       "value": "true"
                     },
-                    "src": "16586:27:5",
+                    "src": "16586:27:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2580,
+                  "id": 4022,
                   "nodeType": "ExpressionStatement",
-                  "src": "16586:27:5"
+                  "src": "16586:27:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2587,
+                    "id": 4029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26819,41 +26819,41 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16623:41:5",
+                    "src": "16623:41:7",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2581,
+                          "id": 4023,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 929,
-                          "src": "16630:13:5",
+                          "referencedDeclaration": 2371,
+                          "src": "16630:13:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 2584,
+                        "id": 4026,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2582,
+                            "id": 4024,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "16644:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "16644:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2583,
+                          "id": 4025,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -26861,7 +26861,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16644:10:5",
+                          "src": "16644:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26872,21 +26872,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16630:25:5",
+                        "src": "16630:25:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2586,
+                      "id": 4028,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2585,
+                        "id": 4027,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16656:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16656:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26897,7 +26897,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16630:34:5",
+                      "src": "16630:34:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26908,9 +26908,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2588,
+                  "id": 4030,
                   "nodeType": "ExpressionStatement",
-                  "src": "16623:41:5"
+                  "src": "16623:41:7"
                 },
                 {
                   "eventCall": {
@@ -26918,12 +26918,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2590,
+                        "id": 4032,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16695:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16695:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26933,18 +26933,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2591,
+                          "id": 4033,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16704:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16704:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2592,
+                        "id": 4034,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26952,7 +26952,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16704:10:5",
+                        "src": "16704:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26970,18 +26970,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2589,
+                      "id": 4031,
                       "name": "WorkerConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 852,
-                      "src": "16679:15:5",
+                      "referencedDeclaration": 2294,
+                      "src": "16679:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2593,
+                    "id": 4035,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26989,28 +26989,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16679:36:5",
+                    "src": "16679:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2594,
+                  "id": 4036,
                   "nodeType": "EmitStatement",
-                  "src": "16674:41:5"
+                  "src": "16674:41:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2595,
+                    "id": 4037,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16732:4:5",
+                    "src": "16732:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -27018,52 +27018,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2555,
-                  "id": 2596,
+                  "functionReturnParameters": 3997,
+                  "id": 4038,
                   "nodeType": "Return",
-                  "src": "16725:11:5"
+                  "src": "16725:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2598,
+            "id": 4040,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2552,
+                "id": 3994,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2551,
+                  "id": 3993,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16446:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16446:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16446:13:5"
+                "src": "16446:13:7"
               }
             ],
             "name": "ConfirmWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2550,
+              "id": 3992,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2549,
+                  "id": 3991,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2598,
-                  "src": "16422:15:5",
+                  "scope": 4040,
+                  "src": "16422:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27071,10 +27071,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2548,
+                    "id": 3990,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16422:7:5",
+                    "src": "16422:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27084,20 +27084,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16421:17:5"
+              "src": "16421:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2555,
+              "id": 3997,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2554,
+                  "id": 3996,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2598,
-                  "src": "16469:4:5",
+                  "scope": 4040,
+                  "src": "16469:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27105,10 +27105,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2553,
+                    "id": 3995,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16469:4:5",
+                    "src": "16469:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -27118,19 +27118,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16468:6:5"
+              "src": "16468:6:7"
             },
-            "scope": 3787,
-            "src": "16399:344:5",
+            "scope": 5229,
+            "src": "16399:344:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2640,
+              "id": 4082,
               "nodeType": "Block",
-              "src": "16841:208:5",
+              "src": "16841:208:7",
               "statements": [
                 {
                   "expression": {
@@ -27142,7 +27142,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2625,
+                        "id": 4067,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -27153,7 +27153,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2614,
+                          "id": 4056,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -27163,12 +27163,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 2611,
+                                "id": 4053,
                                 "name": "_worker",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2600,
-                                "src": "16869:7:5",
+                                "referencedDeclaration": 4042,
+                                "src": "16869:7:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -27182,18 +27182,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 2610,
+                              "id": 4052,
                               "name": "GetMaster",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2856,
-                              "src": "16859:9:5",
+                              "referencedDeclaration": 4298,
+                              "src": "16859:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                 "typeString": "function (address) view returns (address)"
                               }
                             },
-                            "id": 2612,
+                            "id": 4054,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -27201,7 +27201,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "16859:18:5",
+                            "src": "16859:18:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -27211,18 +27211,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 2613,
+                            "id": 4055,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2602,
-                            "src": "16881:7:5",
+                            "referencedDeclaration": 4044,
+                            "src": "16881:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "16859:29:5",
+                          "src": "16859:29:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -27239,7 +27239,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2623,
+                              "id": 4065,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -27250,7 +27250,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 2618,
+                                "id": 4060,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -27259,18 +27259,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2615,
+                                    "id": 4057,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "16893:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "16893:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2616,
+                                  "id": 4058,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -27278,7 +27278,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16893:10:5",
+                                  "src": "16893:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -27288,18 +27288,18 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2617,
+                                  "id": 4059,
                                   "name": "_worker",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2600,
-                                  "src": "16907:7:5",
+                                  "referencedDeclaration": 4042,
+                                  "src": "16907:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16893:21:5",
+                                "src": "16893:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -27313,7 +27313,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 2622,
+                                "id": 4064,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -27322,18 +27322,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2619,
+                                    "id": 4061,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "16918:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "16918:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2620,
+                                  "id": 4062,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -27341,7 +27341,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16918:10:5",
+                                  "src": "16918:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -27351,44 +27351,44 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2621,
+                                  "id": 4063,
                                   "name": "_master",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2602,
-                                  "src": "16932:7:5",
+                                  "referencedDeclaration": 4044,
+                                  "src": "16932:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16918:21:5",
+                                "src": "16918:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "16893:46:5",
+                              "src": "16893:46:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 2624,
+                          "id": 4066,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "16892:48:5",
+                          "src": "16892:48:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "16859:81:5",
+                        "src": "16859:81:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -27402,21 +27402,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2609,
+                      "id": 4051,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16851:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16851:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2626,
+                    "id": 4068,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27424,20 +27424,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16851:90:5",
+                    "src": "16851:90:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2627,
+                  "id": 4069,
                   "nodeType": "ExpressionStatement",
-                  "src": "16851:90:5"
+                  "src": "16851:90:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2631,
+                    "id": 4073,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27445,31 +27445,31 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16951:24:5",
+                    "src": "16951:24:7",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2628,
+                        "id": 4070,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 919,
-                        "src": "16958:8:5",
+                        "referencedDeclaration": 2361,
+                        "src": "16958:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 2630,
+                      "id": 4072,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2629,
+                        "id": 4071,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2600,
-                        "src": "16967:7:5",
+                        "referencedDeclaration": 4042,
+                        "src": "16967:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27480,7 +27480,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16958:17:5",
+                      "src": "16958:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -27491,9 +27491,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2632,
+                  "id": 4074,
                   "nodeType": "ExpressionStatement",
-                  "src": "16951:24:5"
+                  "src": "16951:24:7"
                 },
                 {
                   "eventCall": {
@@ -27501,12 +27501,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2634,
+                        "id": 4076,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2600,
-                        "src": "17004:7:5",
+                        "referencedDeclaration": 4042,
+                        "src": "17004:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27514,12 +27514,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2635,
+                        "id": 4077,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2602,
-                        "src": "17013:7:5",
+                        "referencedDeclaration": 4044,
+                        "src": "17013:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27537,18 +27537,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2633,
+                      "id": 4075,
                       "name": "WorkerRemoved",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 858,
-                      "src": "16990:13:5",
+                      "referencedDeclaration": 2300,
+                      "src": "16990:13:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2636,
+                    "id": 4078,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27556,28 +27556,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16990:31:5",
+                    "src": "16990:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2637,
+                  "id": 4079,
                   "nodeType": "EmitStatement",
-                  "src": "16985:36:5"
+                  "src": "16985:36:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2638,
+                    "id": 4080,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "17038:4:5",
+                    "src": "17038:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -27585,52 +27585,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2608,
-                  "id": 2639,
+                  "functionReturnParameters": 4050,
+                  "id": 4081,
                   "nodeType": "Return",
-                  "src": "17031:11:5"
+                  "src": "17031:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2641,
+            "id": 4083,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2605,
+                "id": 4047,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2604,
+                  "id": 4046,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16812:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16812:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16812:13:5"
+                "src": "16812:13:7"
               }
             ],
             "name": "RemoveWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2603,
+              "id": 4045,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2600,
+                  "id": 4042,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16771:15:5",
+                  "scope": 4083,
+                  "src": "16771:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27638,10 +27638,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2599,
+                    "id": 4041,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16771:7:5",
+                    "src": "16771:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27652,11 +27652,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2602,
+                  "id": 4044,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16788:15:5",
+                  "scope": 4083,
+                  "src": "16788:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27664,10 +27664,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2601,
+                    "id": 4043,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16788:7:5",
+                    "src": "16788:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27677,20 +27677,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16770:34:5"
+              "src": "16770:34:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2608,
+              "id": 4050,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2607,
+                  "id": 4049,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16835:4:5",
+                  "scope": 4083,
+                  "src": "16835:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27698,10 +27698,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2606,
+                    "id": 4048,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16835:4:5",
+                    "src": "16835:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -27711,47 +27711,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16834:6:5"
+              "src": "16834:6:7"
             },
-            "scope": 3787,
-            "src": "16749:300:5",
+            "scope": 5229,
+            "src": "16749:300:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2700,
+              "id": 4142,
               "nodeType": "Block",
-              "src": "17442:348:5",
+              "src": "17442:348:7",
               "statements": [
                 {
                   "assignments": [
-                    2671
+                    4113
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2671,
+                      "id": 4113,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2701,
-                      "src": "17452:18:5",
+                      "scope": 4143,
+                      "src": "17452:18:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2670,
+                        "id": 4112,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "17452:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "17452:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -27759,31 +27759,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2675,
+                  "id": 4117,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2672,
+                      "id": 4114,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "17473:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "17473:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2674,
+                    "id": 4116,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2673,
+                      "id": 4115,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2643,
-                      "src": "17480:7:5",
+                      "referencedDeclaration": 4085,
+                      "src": "17480:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -27794,14 +27794,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17473:15:5",
+                    "src": "17473:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17452:36:5"
+                  "src": "17452:36:7"
                 },
                 {
                   "expression": {
@@ -27811,28 +27811,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2676,
+                          "id": 4118,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17515:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17515:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2677,
+                        "id": 4119,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 772,
-                        "src": "17515:15:5",
+                        "referencedDeclaration": 2214,
+                        "src": "17515:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -27840,26 +27840,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2678,
+                          "id": 4120,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17540:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17540:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2679,
+                        "id": 4121,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 776,
-                        "src": "17540:12:5",
+                        "referencedDeclaration": 2218,
+                        "src": "17540:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27869,26 +27869,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2680,
+                          "id": 4122,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17562:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17562:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2681,
+                        "id": 4123,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "counterparty",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 778,
-                        "src": "17562:18:5",
+                        "referencedDeclaration": 2220,
+                        "src": "17562:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27898,26 +27898,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2682,
+                          "id": 4124,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17590:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17590:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2683,
+                        "id": 4125,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 780,
-                        "src": "17590:14:5",
+                        "referencedDeclaration": 2222,
+                        "src": "17590:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -27927,26 +27927,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2684,
+                          "id": 4126,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17614:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17614:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2685,
+                        "id": 4127,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 782,
-                        "src": "17614:11:5",
+                        "referencedDeclaration": 2224,
+                        "src": "17614:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -27956,26 +27956,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2686,
+                          "id": 4128,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17635:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17635:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2687,
+                        "id": 4129,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "17635:14:5",
+                        "referencedDeclaration": 2227,
+                        "src": "17635:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -27985,28 +27985,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2688,
+                          "id": 4130,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17659:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17659:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2689,
+                        "id": 4131,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "identityLevel",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 787,
-                        "src": "17659:19:5",
+                        "referencedDeclaration": 2229,
+                        "src": "17659:19:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -28014,26 +28014,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2690,
+                          "id": 4132,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17688:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17688:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2691,
+                        "id": 4133,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blacklist",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 789,
-                        "src": "17688:15:5",
+                        "referencedDeclaration": 2231,
+                        "src": "17688:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28043,26 +28043,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2692,
+                          "id": 4134,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17713:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17713:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2693,
+                        "id": 4135,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "tag",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 791,
-                        "src": "17713:9:5",
+                        "referencedDeclaration": 2233,
+                        "src": "17713:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -28072,26 +28072,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2694,
+                          "id": 4136,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17732:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17732:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2695,
+                        "id": 4137,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "17732:16:5",
+                        "referencedDeclaration": 2236,
+                        "src": "17732:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -28101,54 +28101,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2696,
+                          "id": 4138,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17758:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17758:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2697,
+                        "id": 4139,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "frozenSum",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 796,
-                        "src": "17758:15:5",
+                        "referencedDeclaration": 2238,
+                        "src": "17758:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2698,
+                    "id": 4140,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17505:278:5",
+                    "src": "17505:278:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$726_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$4931_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$2168_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderType,address,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2669,
-                  "id": 2699,
+                  "functionReturnParameters": 4111,
+                  "id": 4141,
                   "nodeType": "Return",
-                  "src": "17498:285:5"
+                  "src": "17498:285:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2701,
+            "id": 4143,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -28156,16 +28156,16 @@
             "name": "GetOrderInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2644,
+              "id": 4086,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2643,
+                  "id": 4085,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17093:12:5",
+                  "scope": 4143,
+                  "src": "17093:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28173,10 +28173,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2642,
+                    "id": 4084,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17093:4:5",
+                    "src": "17093:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28186,35 +28186,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17092:14:5"
+              "src": "17092:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2669,
+              "id": 4111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2646,
+                  "id": 4088,
                   "name": "orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17141:19:5",
+                  "scope": 4143,
+                  "src": "17141:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2645,
+                    "id": 4087,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "17141:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "17141:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -28223,11 +28223,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2648,
+                  "id": 4090,
                   "name": "author",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17170:14:5",
+                  "scope": 4143,
+                  "src": "17170:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28235,10 +28235,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2647,
+                    "id": 4089,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17170:7:5",
+                    "src": "17170:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28249,11 +28249,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2650,
+                  "id": 4092,
                   "name": "counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17194:20:5",
+                  "scope": 4143,
+                  "src": "17194:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28261,10 +28261,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2649,
+                    "id": 4091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17194:7:5",
+                    "src": "17194:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28275,11 +28275,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2652,
+                  "id": 4094,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17224:13:5",
+                  "scope": 4143,
+                  "src": "17224:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28287,10 +28287,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2651,
+                    "id": 4093,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17224:4:5",
+                    "src": "17224:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28301,11 +28301,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2654,
+                  "id": 4096,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17247:10:5",
+                  "scope": 4143,
+                  "src": "17247:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28313,10 +28313,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2653,
+                    "id": 4095,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17247:4:5",
+                    "src": "17247:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28327,11 +28327,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2657,
+                  "id": 4099,
                   "name": "netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17267:15:5",
+                  "scope": 4143,
+                  "src": "17267:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28340,19 +28340,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2655,
+                      "id": 4097,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17267:4:5",
+                      "src": "17267:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 2656,
+                    "id": 4098,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17267:6:5",
+                    "src": "17267:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -28363,26 +28363,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2659,
+                  "id": 4101,
                   "name": "identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17292:43:5",
+                  "scope": 4143,
+                  "src": "17292:43:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2658,
+                    "id": 4100,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "17292:29:5",
+                    "referencedDeclaration": 9497,
+                    "src": "17292:29:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -28391,11 +28391,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2661,
+                  "id": 4103,
                   "name": "blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17345:17:5",
+                  "scope": 4143,
+                  "src": "17345:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28403,10 +28403,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2660,
+                    "id": 4102,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17345:7:5",
+                    "src": "17345:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28417,11 +28417,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2663,
+                  "id": 4105,
                   "name": "tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17372:11:5",
+                  "scope": 4143,
+                  "src": "17372:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28429,10 +28429,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 2662,
+                    "id": 4104,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17372:7:5",
+                    "src": "17372:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -28443,11 +28443,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2666,
+                  "id": 4108,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17393:19:5",
+                  "scope": 4143,
+                  "src": "17393:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28456,19 +28456,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2664,
+                      "id": 4106,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17393:6:5",
+                      "src": "17393:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2665,
+                    "id": 4107,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17393:8:5",
+                    "src": "17393:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -28479,11 +28479,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2668,
+                  "id": 4110,
                   "name": "frozenSum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17422:14:5",
+                  "scope": 4143,
+                  "src": "17422:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28491,10 +28491,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2667,
+                    "id": 4109,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17422:4:5",
+                    "src": "17422:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28504,47 +28504,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17131:311:5"
+              "src": "17131:311:7"
             },
-            "scope": 3787,
-            "src": "17071:719:5",
+            "scope": 5229,
+            "src": "17071:719:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2722,
+              "id": 4164,
               "nodeType": "Block",
-              "src": "17919:129:5",
+              "src": "17919:129:7",
               "statements": [
                 {
                   "assignments": [
-                    2711
+                    4153
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2711,
+                      "id": 4153,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2723,
-                      "src": "17929:18:5",
+                      "scope": 4165,
+                      "src": "17929:18:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2710,
+                        "id": 4152,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "17929:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "17929:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -28552,31 +28552,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2715,
+                  "id": 4157,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2712,
+                      "id": 4154,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "17950:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "17950:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2714,
+                    "id": 4156,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2713,
+                      "id": 4155,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2703,
-                      "src": "17957:7:5",
+                      "referencedDeclaration": 4145,
+                      "src": "17957:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -28587,14 +28587,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17950:15:5",
+                    "src": "17950:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17929:36:5"
+                  "src": "17929:36:7"
                 },
                 {
                   "expression": {
@@ -28604,28 +28604,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2716,
+                          "id": 4158,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2711,
-                          "src": "17992:5:5",
+                          "referencedDeclaration": 4153,
+                          "src": "17992:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2717,
+                        "id": 4159,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderStatus",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 774,
-                        "src": "17992:17:5",
+                        "referencedDeclaration": 2216,
+                        "src": "17992:17:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         }
                       },
@@ -28633,54 +28633,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2718,
+                          "id": 4160,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2711,
-                          "src": "18019:5:5",
+                          "referencedDeclaration": 4153,
+                          "src": "18019:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2719,
+                        "id": 4161,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 798,
-                        "src": "18019:12:5",
+                        "referencedDeclaration": 2240,
+                        "src": "18019:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2720,
+                    "id": 4162,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17982:59:5",
+                    "src": "17982:59:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$730_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$2172_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderStatus,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2709,
-                  "id": 2721,
+                  "functionReturnParameters": 4151,
+                  "id": 4163,
                   "nodeType": "Return",
-                  "src": "17975:66:5"
+                  "src": "17975:66:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2723,
+            "id": 4165,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -28688,16 +28688,16 @@
             "name": "GetOrderParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2704,
+              "id": 4146,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2703,
+                  "id": 4145,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17821:12:5",
+                  "scope": 4165,
+                  "src": "17821:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28705,10 +28705,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2702,
+                    "id": 4144,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17821:4:5",
+                    "src": "17821:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28718,35 +28718,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17820:14:5"
+              "src": "17820:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2709,
+              "id": 4151,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2706,
+                  "id": 4148,
                   "name": "orderStatus",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17869:23:5",
+                  "scope": 4165,
+                  "src": "17869:23:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$730",
+                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
                     "typeString": "enum Market.OrderStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2705,
+                    "id": 4147,
                     "name": "OrderStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 730,
-                    "src": "17869:11:5",
+                    "referencedDeclaration": 2172,
+                    "src": "17869:11:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
@@ -28755,11 +28755,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2708,
+                  "id": 4150,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17902:11:5",
+                  "scope": 4165,
+                  "src": "17902:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28767,10 +28767,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2707,
+                    "id": 4149,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17902:4:5",
+                    "src": "17902:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28780,19 +28780,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17859:60:5"
+              "src": "17859:60:7"
             },
-            "scope": 3787,
-            "src": "17797:251:5",
+            "scope": 5229,
+            "src": "17797:251:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2773,
+              "id": 4215,
               "nodeType": "Block",
-              "src": "18293:260:5",
+              "src": "18293:260:7",
               "statements": [
                 {
                   "expression": {
@@ -28804,26 +28804,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2743,
+                            "id": 4185,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18320:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18320:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2745,
+                          "id": 4187,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2744,
+                            "id": 4186,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18326:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18326:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28834,21 +28834,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18320:13:5",
+                          "src": "18320:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2746,
+                        "id": 4188,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 743,
-                        "src": "18320:24:5",
+                        "referencedDeclaration": 2185,
+                        "src": "18320:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage",
                           "typeString": "uint64[] storage ref"
@@ -28860,26 +28860,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2747,
+                            "id": 4189,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18354:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18354:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2749,
+                          "id": 4191,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2748,
+                            "id": 4190,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18360:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18360:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28890,21 +28890,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18354:13:5",
+                          "src": "18354:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2750,
+                        "id": 4192,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "supplierID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 745,
-                        "src": "18354:24:5",
+                        "referencedDeclaration": 2187,
+                        "src": "18354:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28916,26 +28916,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2751,
+                            "id": 4193,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18388:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18388:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2753,
+                          "id": 4195,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2752,
+                            "id": 4194,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18394:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18394:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28946,21 +28946,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18388:13:5",
+                          "src": "18388:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2754,
+                        "id": 4196,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "consumerID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 747,
-                        "src": "18388:24:5",
+                        "referencedDeclaration": 2189,
+                        "src": "18388:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28972,26 +28972,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2755,
+                            "id": 4197,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18422:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18422:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2757,
+                          "id": 4199,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2756,
+                            "id": 4198,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18428:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18428:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29002,21 +29002,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18422:13:5",
+                          "src": "18422:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2758,
+                        "id": 4200,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "masterID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 749,
-                        "src": "18422:22:5",
+                        "referencedDeclaration": 2191,
+                        "src": "18422:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -29028,26 +29028,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2759,
+                            "id": 4201,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18454:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18454:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2761,
+                          "id": 4203,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2760,
+                            "id": 4202,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18460:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18460:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29058,21 +29058,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18454:13:5",
+                          "src": "18454:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2762,
+                        "id": 4204,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "askID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 751,
-                        "src": "18454:19:5",
+                        "referencedDeclaration": 2193,
+                        "src": "18454:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29084,26 +29084,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2763,
+                            "id": 4205,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18483:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18483:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2765,
+                          "id": 4207,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2764,
+                            "id": 4206,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18489:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18489:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29114,21 +29114,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18483:13:5",
+                          "src": "18483:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2766,
+                        "id": 4208,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "bidID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 753,
-                        "src": "18483:19:5",
+                        "referencedDeclaration": 2195,
+                        "src": "18483:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29140,26 +29140,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2767,
+                            "id": 4209,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18512:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18512:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2769,
+                          "id": 4211,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2768,
+                            "id": 4210,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18518:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18518:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29170,49 +29170,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18512:13:5",
+                          "src": "18512:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2770,
+                        "id": 4212,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "startTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 759,
-                        "src": "18512:23:5",
+                        "referencedDeclaration": 2201,
+                        "src": "18512:23:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2771,
+                    "id": 4213,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18310:236:5",
+                    "src": "18310:236:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_array$_t_uint64_$dyn_storage_$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint64[] storage ref,address,address,address,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2742,
-                  "id": 2772,
+                  "functionReturnParameters": 4184,
+                  "id": 4214,
                   "nodeType": "Return",
-                  "src": "18303:243:5"
+                  "src": "18303:243:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2774,
+            "id": 4216,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -29220,16 +29220,16 @@
             "name": "GetDealInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2726,
+              "id": 4168,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2725,
+                  "id": 4167,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18075:11:5",
+                  "scope": 4216,
+                  "src": "18075:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29237,10 +29237,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2724,
+                    "id": 4166,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18075:4:5",
+                    "src": "18075:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29250,20 +29250,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18074:13:5"
+              "src": "18074:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2742,
+              "id": 4184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2729,
+                  "id": 4171,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18122:19:5",
+                  "scope": 4216,
+                  "src": "18122:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29272,19 +29272,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2727,
+                      "id": 4169,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "18122:6:5",
+                      "src": "18122:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2728,
+                    "id": 4170,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "18122:8:5",
+                    "src": "18122:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -29295,11 +29295,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2731,
+                  "id": 4173,
                   "name": "supplierID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18151:18:5",
+                  "scope": 4216,
+                  "src": "18151:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29307,10 +29307,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2730,
+                    "id": 4172,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18151:7:5",
+                    "src": "18151:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29321,11 +29321,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2733,
+                  "id": 4175,
                   "name": "consumerID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18179:18:5",
+                  "scope": 4216,
+                  "src": "18179:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29333,10 +29333,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2732,
+                    "id": 4174,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18179:7:5",
+                    "src": "18179:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29347,11 +29347,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2735,
+                  "id": 4177,
                   "name": "masterID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18207:16:5",
+                  "scope": 4216,
+                  "src": "18207:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29359,10 +29359,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2734,
+                    "id": 4176,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18207:7:5",
+                    "src": "18207:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29373,11 +29373,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2737,
+                  "id": 4179,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18233:10:5",
+                  "scope": 4216,
+                  "src": "18233:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29385,10 +29385,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2736,
+                    "id": 4178,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18233:4:5",
+                    "src": "18233:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29399,11 +29399,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2739,
+                  "id": 4181,
                   "name": "bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18253:10:5",
+                  "scope": 4216,
+                  "src": "18253:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29411,10 +29411,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2738,
+                    "id": 4180,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18253:4:5",
+                    "src": "18253:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29425,11 +29425,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2741,
+                  "id": 4183,
                   "name": "startTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18273:14:5",
+                  "scope": 4216,
+                  "src": "18273:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29437,10 +29437,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2740,
+                    "id": 4182,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18273:4:5",
+                    "src": "18273:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29450,19 +29450,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18112:181:5"
+              "src": "18112:181:7"
             },
-            "scope": 3787,
-            "src": "18054:499:5",
+            "scope": 5229,
+            "src": "18054:499:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2823,
+              "id": 4265,
               "nodeType": "Block",
-              "src": "18797:263:5",
+              "src": "18797:263:7",
               "statements": [
                 {
                   "expression": {
@@ -29474,26 +29474,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2793,
+                            "id": 4235,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18824:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18824:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2795,
+                          "id": 4237,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2794,
+                            "id": 4236,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18830:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18830:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29504,21 +29504,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18824:13:5",
+                          "src": "18824:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2796,
+                        "id": 4238,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 755,
-                        "src": "18824:22:5",
+                        "referencedDeclaration": 2197,
+                        "src": "18824:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29530,26 +29530,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2797,
+                            "id": 4239,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18856:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18856:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2799,
+                          "id": 4241,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2798,
+                            "id": 4240,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18862:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18862:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29560,21 +29560,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18856:13:5",
+                          "src": "18856:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2800,
+                        "id": 4242,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 757,
-                        "src": "18856:19:5",
+                        "referencedDeclaration": 2199,
+                        "src": "18856:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29586,26 +29586,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2801,
+                            "id": 4243,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18885:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18885:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2803,
+                          "id": 4245,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2802,
+                            "id": 4244,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18891:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18891:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29616,21 +29616,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18885:13:5",
+                          "src": "18885:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2804,
+                        "id": 4246,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 761,
-                        "src": "18885:21:5",
+                        "referencedDeclaration": 2203,
+                        "src": "18885:21:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29642,26 +29642,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2805,
+                            "id": 4247,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18916:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18916:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2807,
+                          "id": 4249,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2806,
+                            "id": 4248,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18922:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18922:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29672,23 +29672,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18916:13:5",
+                          "src": "18916:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2808,
+                        "id": 4250,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 763,
-                        "src": "18916:20:5",
+                        "referencedDeclaration": 2205,
+                        "src": "18916:20:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         }
                       },
@@ -29698,26 +29698,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2809,
+                            "id": 4251,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18946:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18946:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2811,
+                          "id": 4253,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2810,
+                            "id": 4252,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18952:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18952:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29728,21 +29728,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18946:13:5",
+                          "src": "18946:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2812,
+                        "id": 4254,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blockedBalance",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 765,
-                        "src": "18946:28:5",
+                        "referencedDeclaration": 2207,
+                        "src": "18946:28:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29754,26 +29754,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2813,
+                            "id": 4255,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18984:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18984:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2815,
+                          "id": 4257,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2814,
+                            "id": 4256,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18990:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18990:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29784,21 +29784,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18984:13:5",
+                          "src": "18984:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2816,
+                        "id": 4258,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "totalPayout",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 767,
-                        "src": "18984:25:5",
+                        "referencedDeclaration": 2209,
+                        "src": "18984:25:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29810,26 +29810,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2817,
+                            "id": 4259,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "19019:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "19019:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2819,
+                          "id": 4261,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2818,
+                            "id": 4260,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "19025:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "19025:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29840,49 +29840,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19019:13:5",
+                          "src": "19019:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2820,
+                        "id": 4262,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 769,
-                        "src": "19019:24:5",
+                        "referencedDeclaration": 2211,
+                        "src": "19019:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2821,
+                    "id": 4263,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18814:239:5",
+                    "src": "18814:239:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$722_$_t_uint256_$_t_uint256_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$2164_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint256,uint256,uint256,enum Market.DealStatus,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2792,
-                  "id": 2822,
+                  "functionReturnParameters": 4234,
+                  "id": 4264,
                   "nodeType": "Return",
-                  "src": "18807:246:5"
+                  "src": "18807:246:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2824,
+            "id": 4266,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -29890,16 +29890,16 @@
             "name": "GetDealParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2777,
+              "id": 4219,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2776,
+                  "id": 4218,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18582:11:5",
+                  "scope": 4266,
+                  "src": "18582:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29907,10 +29907,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2775,
+                    "id": 4217,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18582:4:5",
+                    "src": "18582:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29920,20 +29920,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18581:13:5"
+              "src": "18581:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2792,
+              "id": 4234,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2779,
+                  "id": 4221,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18629:13:5",
+                  "scope": 4266,
+                  "src": "18629:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29941,10 +29941,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2778,
+                    "id": 4220,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18629:4:5",
+                    "src": "18629:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29955,11 +29955,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2781,
+                  "id": 4223,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18652:10:5",
+                  "scope": 4266,
+                  "src": "18652:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29967,10 +29967,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2780,
+                    "id": 4222,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18652:4:5",
+                    "src": "18652:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29981,11 +29981,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2783,
+                  "id": 4225,
                   "name": "endTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18672:12:5",
+                  "scope": 4266,
+                  "src": "18672:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29993,10 +29993,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2782,
+                    "id": 4224,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18672:4:5",
+                    "src": "18672:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30007,26 +30007,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2785,
+                  "id": 4227,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18694:17:5",
+                  "scope": 4266,
+                  "src": "18694:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$722",
+                    "typeIdentifier": "t_enum$_DealStatus_$2164",
                     "typeString": "enum Market.DealStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2784,
+                    "id": 4226,
                     "name": "DealStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 722,
-                    "src": "18694:10:5",
+                    "referencedDeclaration": 2164,
+                    "src": "18694:10:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
@@ -30035,11 +30035,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2787,
+                  "id": 4229,
                   "name": "blockedBalance",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18721:19:5",
+                  "scope": 4266,
+                  "src": "18721:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30047,10 +30047,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2786,
+                    "id": 4228,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18721:4:5",
+                    "src": "18721:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30061,11 +30061,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2789,
+                  "id": 4231,
                   "name": "totalPayout",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18750:16:5",
+                  "scope": 4266,
+                  "src": "18750:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30073,10 +30073,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2788,
+                    "id": 4230,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18750:4:5",
+                    "src": "18750:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30087,11 +30087,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2791,
+                  "id": 4233,
                   "name": "lastBillTS",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18776:15:5",
+                  "scope": 4266,
+                  "src": "18776:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30099,10 +30099,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2790,
+                    "id": 4232,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18776:4:5",
+                    "src": "18776:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30112,19 +30112,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18619:178:5"
+              "src": "18619:178:7"
             },
-            "scope": 3787,
-            "src": "18559:501:5",
+            "scope": 5229,
+            "src": "18559:501:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2855,
+              "id": 4297,
               "nodeType": "Block",
-              "src": "19139:176:5",
+              "src": "19139:176:7",
               "statements": [
                 {
                   "condition": {
@@ -30133,7 +30133,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 2841,
+                    "id": 4283,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -30144,7 +30144,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 2835,
+                      "id": 4277,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -30153,26 +30153,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2831,
+                          "id": 4273,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 919,
-                          "src": "19153:8:5",
+                          "referencedDeclaration": 2361,
+                          "src": "19153:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 2833,
+                        "id": 4275,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2832,
+                          "id": 4274,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2826,
-                          "src": "19162:7:5",
+                          "referencedDeclaration": 4268,
+                          "src": "19162:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -30183,7 +30183,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19153:17:5",
+                        "src": "19153:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -30194,14 +30194,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "307830",
-                        "id": 2834,
+                        "id": 4276,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "19174:3:5",
+                        "src": "19174:3:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -30209,7 +30209,7 @@
                         },
                         "value": "0x0"
                       },
-                      "src": "19153:24:5",
+                      "src": "19153:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -30223,7 +30223,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 2840,
+                      "id": 4282,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -30232,26 +30232,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2836,
+                          "id": 4278,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 919,
-                          "src": "19181:8:5",
+                          "referencedDeclaration": 2361,
+                          "src": "19181:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 2838,
+                        "id": 4280,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2837,
+                          "id": 4279,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2826,
-                          "src": "19190:7:5",
+                          "referencedDeclaration": 4268,
+                          "src": "19190:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -30262,7 +30262,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19181:17:5",
+                        "src": "19181:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -30272,50 +30272,50 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 2839,
+                        "id": 4281,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2826,
-                        "src": "19202:7:5",
+                        "referencedDeclaration": 4268,
+                        "src": "19202:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "19181:28:5",
+                      "src": "19181:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "19153:56:5",
+                    "src": "19153:56:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 2853,
+                    "id": 4295,
                     "nodeType": "Block",
-                    "src": "19258:51:5",
+                    "src": "19258:51:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2851,
+                          "id": 4293,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2847,
+                            "id": 4289,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2829,
-                            "src": "19272:6:5",
+                            "referencedDeclaration": 4271,
+                            "src": "19272:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -30327,26 +30327,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2848,
+                              "id": 4290,
                               "name": "masterOf",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 919,
-                              "src": "19281:8:5",
+                              "referencedDeclaration": 2361,
+                              "src": "19281:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                                 "typeString": "mapping(address => address)"
                               }
                             },
-                            "id": 2850,
+                            "id": 4292,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2849,
+                              "id": 4291,
                               "name": "_worker",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2826,
-                              "src": "19290:7:5",
+                              "referencedDeclaration": 4268,
+                              "src": "19290:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -30357,48 +30357,48 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "19281:17:5",
+                            "src": "19281:17:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19272:26:5",
+                          "src": "19272:26:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 2852,
+                        "id": 4294,
                         "nodeType": "ExpressionStatement",
-                        "src": "19272:26:5"
+                        "src": "19272:26:7"
                       }
                     ]
                   },
-                  "id": 2854,
+                  "id": 4296,
                   "nodeType": "IfStatement",
-                  "src": "19149:160:5",
+                  "src": "19149:160:7",
                   "trueBody": {
-                    "id": 2846,
+                    "id": 4288,
                     "nodeType": "Block",
-                    "src": "19211:41:5",
+                    "src": "19211:41:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2844,
+                          "id": 4286,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2842,
+                            "id": 4284,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2829,
-                            "src": "19225:6:5",
+                            "referencedDeclaration": 4271,
+                            "src": "19225:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -30408,26 +30408,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2843,
+                            "id": 4285,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2826,
-                            "src": "19234:7:5",
+                            "referencedDeclaration": 4268,
+                            "src": "19234:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19225:16:5",
+                          "src": "19225:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 2845,
+                        "id": 4287,
                         "nodeType": "ExpressionStatement",
-                        "src": "19225:16:5"
+                        "src": "19225:16:7"
                       }
                     ]
                   }
@@ -30435,7 +30435,7 @@
               ]
             },
             "documentation": null,
-            "id": 2856,
+            "id": 4298,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -30443,16 +30443,16 @@
             "name": "GetMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2827,
+              "id": 4269,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2826,
+                  "id": 4268,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2856,
-                  "src": "19085:15:5",
+                  "scope": 4298,
+                  "src": "19085:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30460,10 +30460,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2825,
+                    "id": 4267,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19085:7:5",
+                    "src": "19085:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -30473,20 +30473,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19084:17:5"
+              "src": "19084:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2830,
+              "id": 4272,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2829,
+                  "id": 4271,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2856,
-                  "src": "19123:14:5",
+                  "scope": 4298,
+                  "src": "19123:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30494,10 +30494,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2828,
+                    "id": 4270,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19123:7:5",
+                    "src": "19123:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -30507,19 +30507,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19122:16:5"
+              "src": "19122:16:7"
             },
-            "scope": 3787,
-            "src": "19066:249:5",
+            "scope": 5229,
+            "src": "19066:249:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2893,
+              "id": 4335,
               "nodeType": "Block",
-              "src": "19528:250:5",
+              "src": "19528:250:7",
               "statements": [
                 {
                   "expression": {
@@ -30531,26 +30531,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2871,
+                            "id": 4313,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19555:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19555:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2873,
+                          "id": 4315,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2872,
+                            "id": 4314,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19564:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19564:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30561,21 +30561,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19555:25:5",
+                          "src": "19555:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2874,
+                        "id": 4316,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 801,
-                        "src": "19555:32:5",
+                        "referencedDeclaration": 2243,
+                        "src": "19555:32:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30587,26 +30587,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2875,
+                            "id": 4317,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19597:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19597:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2877,
+                          "id": 4319,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2876,
+                            "id": 4318,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19606:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19606:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30617,23 +30617,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19597:25:5",
+                          "src": "19597:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2878,
+                        "id": 4320,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "requestType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 803,
-                        "src": "19597:37:5",
+                        "referencedDeclaration": 2245,
+                        "src": "19597:37:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -30643,26 +30643,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2879,
+                            "id": 4321,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19644:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19644:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2881,
+                          "id": 4323,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2880,
+                            "id": 4322,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19653:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19653:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30673,21 +30673,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19644:25:5",
+                          "src": "19644:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2882,
+                        "id": 4324,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 805,
-                        "src": "19644:31:5",
+                        "referencedDeclaration": 2247,
+                        "src": "19644:31:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30699,26 +30699,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2883,
+                            "id": 4325,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19685:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19685:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2885,
+                          "id": 4327,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2884,
+                            "id": 4326,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19694:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19694:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30729,21 +30729,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19685:25:5",
+                          "src": "19685:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2886,
+                        "id": 4328,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 807,
-                        "src": "19685:34:5",
+                        "referencedDeclaration": 2249,
+                        "src": "19685:34:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30755,26 +30755,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2887,
+                            "id": 4329,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19729:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19729:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2889,
+                          "id": 4331,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2888,
+                            "id": 4330,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19738:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19738:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30785,49 +30785,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19729:25:5",
+                          "src": "19729:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2890,
+                        "id": 4332,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 809,
-                        "src": "19729:32:5",
+                        "referencedDeclaration": 2251,
+                        "src": "19729:32:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$736",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
                           "typeString": "enum Market.RequestStatus"
                         }
                       }
                     ],
-                    "id": 2891,
+                    "id": 4333,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "19545:226:5",
+                    "src": "19545:226:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$726_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$736_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$2168_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2178_$",
                       "typeString": "tuple(uint256,enum Market.OrderType,uint256,uint256,enum Market.RequestStatus)"
                     }
                   },
-                  "functionReturnParameters": 2870,
-                  "id": 2892,
+                  "functionReturnParameters": 4312,
+                  "id": 4334,
                   "nodeType": "Return",
-                  "src": "19538:233:5"
+                  "src": "19538:233:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2894,
+            "id": 4336,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -30835,16 +30835,16 @@
             "name": "GetChangeRequestInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2859,
+              "id": 4301,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2858,
+                  "id": 4300,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19351:20:5",
+                  "scope": 4336,
+                  "src": "19351:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30852,10 +30852,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2857,
+                    "id": 4299,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19351:4:5",
+                    "src": "19351:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30865,20 +30865,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19350:22:5"
+              "src": "19350:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2870,
+              "id": 4312,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2861,
+                  "id": 4303,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19407:11:5",
+                  "scope": 4336,
+                  "src": "19407:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30886,10 +30886,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2860,
+                    "id": 4302,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19407:4:5",
+                    "src": "19407:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30900,26 +30900,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2863,
+                  "id": 4305,
                   "name": "requestType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19428:21:5",
+                  "scope": 4336,
+                  "src": "19428:21:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2862,
+                    "id": 4304,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "19428:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "19428:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -30928,11 +30928,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2865,
+                  "id": 4307,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19459:10:5",
+                  "scope": 4336,
+                  "src": "19459:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30940,10 +30940,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2864,
+                    "id": 4306,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19459:4:5",
+                    "src": "19459:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30954,11 +30954,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2867,
+                  "id": 4309,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19479:13:5",
+                  "scope": 4336,
+                  "src": "19479:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30966,10 +30966,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2866,
+                    "id": 4308,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19479:4:5",
+                    "src": "19479:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30980,26 +30980,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2869,
+                  "id": 4311,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19502:20:5",
+                  "scope": 4336,
+                  "src": "19502:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                     "typeString": "enum Market.RequestStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2868,
+                    "id": 4310,
                     "name": "RequestStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 736,
-                    "src": "19502:13:5",
+                    "referencedDeclaration": 2178,
+                    "src": "19502:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                       "typeString": "enum Market.RequestStatus"
                     }
                   },
@@ -31007,43 +31007,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19397:131:5"
+              "src": "19397:131:7"
             },
-            "scope": 3787,
-            "src": "19321:457:5",
+            "scope": 5229,
+            "src": "19321:457:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2901,
+              "id": 4343,
               "nodeType": "Block",
-              "src": "19836:34:5",
+              "src": "19836:34:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2899,
+                    "id": 4341,
                     "name": "dealAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 885,
-                    "src": "19853:10:5",
+                    "referencedDeclaration": 2327,
+                    "src": "19853:10:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2898,
-                  "id": 2900,
+                  "functionReturnParameters": 4340,
+                  "id": 4342,
                   "nodeType": "Return",
-                  "src": "19846:17:5"
+                  "src": "19846:17:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2902,
+            "id": 4344,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31051,23 +31051,23 @@
             "name": "GetDealsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2895,
+              "id": 4337,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19807:2:5"
+              "src": "19807:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2898,
+              "id": 4340,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2897,
+                  "id": 4339,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2902,
-                  "src": "19831:4:5",
+                  "scope": 4344,
+                  "src": "19831:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31075,10 +31075,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2896,
+                    "id": 4338,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19831:4:5",
+                    "src": "19831:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31088,43 +31088,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19830:6:5"
+              "src": "19830:6:7"
             },
-            "scope": 3787,
-            "src": "19784:86:5",
+            "scope": 5229,
+            "src": "19784:86:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2909,
+              "id": 4351,
               "nodeType": "Block",
-              "src": "19929:36:5",
+              "src": "19929:36:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2907,
+                    "id": 4349,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 882,
-                    "src": "19946:12:5",
+                    "referencedDeclaration": 2324,
+                    "src": "19946:12:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2906,
-                  "id": 2908,
+                  "functionReturnParameters": 4348,
+                  "id": 4350,
                   "nodeType": "Return",
-                  "src": "19939:19:5"
+                  "src": "19939:19:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2910,
+            "id": 4352,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31132,23 +31132,23 @@
             "name": "GetOrdersAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2903,
+              "id": 4345,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19900:2:5"
+              "src": "19900:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2906,
+              "id": 4348,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2905,
+                  "id": 4347,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2910,
-                  "src": "19924:4:5",
+                  "scope": 4352,
+                  "src": "19924:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31156,10 +31156,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2904,
+                    "id": 4346,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19924:4:5",
+                    "src": "19924:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31169,43 +31169,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19923:6:5"
+              "src": "19923:6:7"
             },
-            "scope": 3787,
-            "src": "19876:89:5",
+            "scope": 5229,
+            "src": "19876:89:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2917,
+              "id": 4359,
               "nodeType": "Block",
-              "src": "20032:38:5",
+              "src": "20032:38:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2915,
+                    "id": 4357,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 888,
-                    "src": "20049:14:5",
+                    "referencedDeclaration": 2330,
+                    "src": "20049:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2914,
-                  "id": 2916,
+                  "functionReturnParameters": 4356,
+                  "id": 4358,
                   "nodeType": "Return",
-                  "src": "20042:21:5"
+                  "src": "20042:21:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2918,
+            "id": 4360,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31213,23 +31213,23 @@
             "name": "GetChangeRequestsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2911,
+              "id": 4353,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20003:2:5"
+              "src": "20003:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2914,
+              "id": 4356,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2913,
+                  "id": 4355,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2918,
-                  "src": "20027:4:5",
+                  "scope": 4360,
+                  "src": "20027:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31237,10 +31237,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2912,
+                    "id": 4354,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20027:4:5",
+                    "src": "20027:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31250,43 +31250,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20026:6:5"
+              "src": "20026:6:7"
             },
-            "scope": 3787,
-            "src": "19971:99:5",
+            "scope": 5229,
+            "src": "19971:99:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2925,
+              "id": 4367,
               "nodeType": "Block",
-              "src": "20136:42:5",
+              "src": "20136:42:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2923,
+                    "id": 4365,
                     "name": "benchmarksQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 890,
-                    "src": "20153:18:5",
+                    "referencedDeclaration": 2332,
+                    "src": "20153:18:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2922,
-                  "id": 2924,
+                  "functionReturnParameters": 4364,
+                  "id": 4366,
                   "nodeType": "Return",
-                  "src": "20146:25:5"
+                  "src": "20146:25:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2926,
+            "id": 4368,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31294,23 +31294,23 @@
             "name": "GetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2919,
+              "id": 4361,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20106:2:5"
+              "src": "20106:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2922,
+              "id": 4364,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2921,
+                  "id": 4363,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2926,
-                  "src": "20130:4:5",
+                  "scope": 4368,
+                  "src": "20130:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31318,10 +31318,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2920,
+                    "id": 4362,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20130:4:5",
+                    "src": "20130:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31331,43 +31331,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20129:6:5"
+              "src": "20129:6:7"
             },
-            "scope": 3787,
-            "src": "20076:102:5",
+            "scope": 5229,
+            "src": "20076:102:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2933,
+              "id": 4375,
               "nodeType": "Block",
-              "src": "20242:40:5",
+              "src": "20242:40:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2931,
+                    "id": 4373,
                     "name": "netflagsQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 892,
-                    "src": "20259:16:5",
+                    "referencedDeclaration": 2334,
+                    "src": "20259:16:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2930,
-                  "id": 2932,
+                  "functionReturnParameters": 4372,
+                  "id": 4374,
                   "nodeType": "Return",
-                  "src": "20252:23:5"
+                  "src": "20252:23:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2934,
+            "id": 4376,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31375,23 +31375,23 @@
             "name": "GetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2927,
+              "id": 4369,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20212:2:5"
+              "src": "20212:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2930,
+              "id": 4372,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2929,
+                  "id": 4371,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2934,
-                  "src": "20236:4:5",
+                  "scope": 4376,
+                  "src": "20236:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31399,10 +31399,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2928,
+                    "id": 4370,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20236:4:5",
+                    "src": "20236:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31412,19 +31412,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20235:6:5"
+              "src": "20235:6:7"
             },
-            "scope": 3787,
-            "src": "20184:98:5",
+            "scope": 5229,
+            "src": "20184:98:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3199,
+              "id": 4641,
               "nodeType": "Block",
-              "src": "20364:1917:5",
+              "src": "20364:1917:7",
               "statements": [
                 {
                   "expression": {
@@ -31433,10 +31433,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 2948,
+                        "id": 4390,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -31447,26 +31447,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2942,
+                              "id": 4384,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "20382:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "20382:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2944,
+                            "id": 4386,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2943,
+                              "id": 4385,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "20388:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "20388:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -31477,23 +31477,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "20382:13:5",
+                            "src": "20382:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2945,
+                          "id": 4387,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 763,
-                          "src": "20382:20:5",
+                          "referencedDeclaration": 2205,
+                          "src": "20382:20:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -31503,18 +31503,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2946,
+                            "id": 4388,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "20406:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "20406:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 2947,
+                          "id": 4389,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -31522,13 +31522,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "20406:26:5",
+                          "src": "20406:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "20382:50:5",
+                        "src": "20382:50:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -31542,21 +31542,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2941,
+                      "id": 4383,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "20374:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "20374:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2949,
+                    "id": 4391,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -31564,15 +31564,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20374:59:5",
+                    "src": "20374:59:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2950,
+                  "id": 4392,
                   "nodeType": "ExpressionStatement",
-                  "src": "20374:59:5"
+                  "src": "20374:59:7"
                 },
                 {
                   "expression": {
@@ -31584,7 +31584,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2974,
+                        "id": 4416,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -31595,7 +31595,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2966,
+                          "id": 4408,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -31606,7 +31606,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2958,
+                            "id": 4400,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31615,18 +31615,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2952,
+                                "id": 4394,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "20451:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "20451:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2953,
+                              "id": 4395,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -31634,7 +31634,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20451:10:5",
+                              "src": "20451:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -31648,26 +31648,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2954,
+                                  "id": 4396,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "20465:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "20465:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2956,
+                                "id": 4398,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2955,
+                                  "id": 4397,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2936,
-                                  "src": "20471:6:5",
+                                  "referencedDeclaration": 4378,
+                                  "src": "20471:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -31678,27 +31678,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20465:13:5",
+                                "src": "20465:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2957,
+                              "id": 4399,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "20465:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "20465:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20451:38:5",
+                            "src": "20451:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -31712,7 +31712,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2965,
+                            "id": 4407,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31721,18 +31721,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2959,
+                                "id": 4401,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "20493:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "20493:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2960,
+                              "id": 4402,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -31740,7 +31740,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20493:10:5",
+                              "src": "20493:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -31754,26 +31754,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2961,
+                                  "id": 4403,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "20507:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "20507:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2963,
+                                "id": 4405,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2962,
+                                  "id": 4404,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2936,
-                                  "src": "20513:6:5",
+                                  "referencedDeclaration": 4378,
+                                  "src": "20513:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -31784,33 +31784,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20507:13:5",
+                                "src": "20507:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2964,
+                              "id": 4406,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "20507:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "20507:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20493:38:5",
+                            "src": "20493:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "20451:80:5",
+                          "src": "20451:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -31824,7 +31824,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2973,
+                          "id": 4415,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -31833,18 +31833,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2967,
+                              "id": 4409,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "20535:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "20535:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2968,
+                            "id": 4410,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31852,7 +31852,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20535:10:5",
+                            "src": "20535:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -31866,26 +31866,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2969,
+                                "id": 4411,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "20549:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "20549:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2971,
+                              "id": 4413,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2970,
+                                "id": 4412,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2936,
-                                "src": "20555:6:5",
+                                "referencedDeclaration": 4378,
+                                "src": "20555:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -31896,33 +31896,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "20549:13:5",
+                              "src": "20549:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2972,
+                            "id": 4414,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "20549:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "20549:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "20535:36:5",
+                          "src": "20535:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20451:120:5",
+                        "src": "20451:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -31936,21 +31936,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2951,
+                      "id": 4393,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "20443:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "20443:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2975,
+                    "id": 4417,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -31958,43 +31958,43 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20443:129:5",
+                    "src": "20443:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2976,
+                  "id": 4418,
                   "nodeType": "ExpressionStatement",
-                  "src": "20443:129:5"
+                  "src": "20443:129:7"
                 },
                 {
                   "assignments": [
-                    2978
+                    4420
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2978,
+                      "id": 4420,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3200,
-                      "src": "20582:16:5",
+                      "scope": 4642,
+                      "src": "20582:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2977,
+                        "id": 4419,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 770,
-                        "src": "20582:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "20582:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -32002,31 +32002,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2982,
+                  "id": 4424,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2979,
+                      "id": 4421,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 900,
-                      "src": "20601:5:5",
+                      "referencedDeclaration": 2342,
+                      "src": "20601:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 2981,
+                    "id": 4423,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2980,
+                      "id": 4422,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2936,
-                      "src": "20607:6:5",
+                      "referencedDeclaration": 4378,
+                      "src": "20607:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -32037,25 +32037,25 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "20601:13:5",
+                    "src": "20601:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20582:32:5"
+                  "src": "20582:32:7"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2984,
+                      "id": 4426,
                       "name": "paidAmount",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3200,
-                      "src": "20625:15:5",
+                      "scope": 4642,
+                      "src": "20625:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -32063,10 +32063,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2983,
+                        "id": 4425,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "20625:4:5",
+                        "src": "20625:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -32076,10 +32076,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2985,
+                  "id": 4427,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20625:15:5"
+                  "src": "20625:15:7"
                 },
                 {
                   "condition": {
@@ -32088,14 +32088,14 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 2995,
+                    "id": 4437,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2989,
+                      "id": 4431,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32103,18 +32103,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "!",
                       "prefix": true,
-                      "src": "20655:15:5",
+                      "src": "20655:15:7",
                       "subExpression": {
                         "argumentTypes": null,
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 2987,
+                            "id": 4429,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2936,
-                            "src": "20663:6:5",
+                            "referencedDeclaration": 4378,
+                            "src": "20663:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -32128,18 +32128,18 @@
                               "typeString": "uint256"
                             }
                           ],
-                          "id": 2986,
+                          "id": 4428,
                           "name": "IsSpot",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3401,
-                          "src": "20656:6:5",
+                          "referencedDeclaration": 4843,
+                          "src": "20656:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (uint256) view returns (bool)"
                           }
                         },
-                        "id": 2988,
+                        "id": 4430,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -32147,7 +32147,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "20656:14:5",
+                        "src": "20656:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -32166,7 +32166,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 2994,
+                      "id": 4436,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32175,26 +32175,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2990,
+                          "id": 4432,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2978,
-                          "src": "20674:4:5",
+                          "referencedDeclaration": 4420,
+                          "src": "20674:4:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 2991,
+                        "id": 4433,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 769,
-                        "src": "20674:15:5",
+                        "referencedDeclaration": 2211,
+                        "src": "20674:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -32206,38 +32206,38 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2992,
+                          "id": 4434,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2978,
-                          "src": "20693:4:5",
+                          "referencedDeclaration": 4420,
+                          "src": "20693:4:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 2993,
+                        "id": 4435,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 761,
-                        "src": "20693:12:5",
+                        "referencedDeclaration": 2203,
+                        "src": "20693:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "20674:31:5",
+                      "src": "20674:31:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "20655:50:5",
+                    "src": "20655:50:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -32250,7 +32250,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 3014,
+                      "id": 4456,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32261,14 +32261,14 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3008,
+                        "id": 4450,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3002,
+                          "id": 4444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -32276,18 +32276,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "20811:15:5",
+                          "src": "20811:15:7",
                           "subExpression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3000,
+                                "id": 4442,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2936,
-                                "src": "20819:6:5",
+                                "referencedDeclaration": 4378,
+                                "src": "20819:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -32301,18 +32301,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 2999,
+                              "id": 4441,
                               "name": "IsSpot",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3401,
-                              "src": "20812:6:5",
+                              "referencedDeclaration": 4843,
+                              "src": "20812:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                                 "typeString": "function (uint256) view returns (bool)"
                               }
                             },
-                            "id": 3001,
+                            "id": 4443,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -32320,7 +32320,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "20812:14:5",
+                            "src": "20812:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -32339,7 +32339,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3007,
+                          "id": 4449,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -32348,18 +32348,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3003,
+                              "id": 4445,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "20830:5:5",
+                              "referencedDeclaration": 11305,
+                              "src": "20830:5:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 3004,
+                            "id": 4446,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -32367,7 +32367,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20830:15:5",
+                            "src": "20830:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -32379,38 +32379,38 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3005,
+                              "id": 4447,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2978,
-                              "src": "20848:4:5",
+                              "referencedDeclaration": 4420,
+                              "src": "20848:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3006,
+                            "id": 4448,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 761,
-                            "src": "20848:12:5",
+                            "referencedDeclaration": 2203,
+                            "src": "20848:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "20830:30:5",
+                          "src": "20830:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20811:49:5",
+                        "src": "20811:49:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -32424,7 +32424,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3013,
+                        "id": 4455,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -32433,26 +32433,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3009,
+                            "id": 4451,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2978,
-                            "src": "20864:4:5",
+                            "referencedDeclaration": 4420,
+                            "src": "20864:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3010,
+                          "id": 4452,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lastBillTS",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 769,
-                          "src": "20864:15:5",
+                          "referencedDeclaration": 2211,
+                          "src": "20864:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -32464,64 +32464,64 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3011,
+                            "id": 4453,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2978,
-                            "src": "20882:4:5",
+                            "referencedDeclaration": 4420,
+                            "src": "20882:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3012,
+                          "id": 4454,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "endTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 761,
-                          "src": "20882:12:5",
+                          "referencedDeclaration": 2203,
+                          "src": "20882:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "20864:30:5",
+                        "src": "20864:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "20811:83:5",
+                      "src": "20811:83:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": {
-                      "id": 3042,
+                      "id": 4484,
                       "nodeType": "Block",
-                      "src": "21003:104:5",
+                      "src": "21003:104:7",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3040,
+                            "id": 4482,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 3029,
+                              "id": 4471,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2984,
-                              "src": "21017:10:5",
+                              "referencedDeclaration": 4426,
+                              "src": "21017:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -32536,26 +32536,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3031,
+                                    "id": 4473,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2978,
-                                    "src": "21047:4:5",
+                                    "referencedDeclaration": 4420,
+                                    "src": "21047:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3032,
+                                  "id": 4474,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "21047:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "21047:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32568,26 +32568,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3036,
+                                        "id": 4478,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "21079:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "21079:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3037,
+                                      "id": 4479,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 769,
-                                      "src": "21079:15:5",
+                                      "referencedDeclaration": 2211,
+                                      "src": "21079:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -32605,18 +32605,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3033,
+                                        "id": 4475,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7759,
-                                        "src": "21059:5:5",
+                                        "referencedDeclaration": 11305,
+                                        "src": "21059:5:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 3034,
+                                      "id": 4476,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -32624,27 +32624,27 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "21059:15:5",
+                                      "src": "21059:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3035,
+                                    "id": 4477,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "21059:19:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "21059:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3038,
+                                  "id": 4480,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -32652,7 +32652,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21059:36:5",
+                                  "src": "21059:36:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32670,18 +32670,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3030,
+                                "id": 4472,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "21030:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "21030:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3039,
+                              "id": 4481,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -32689,48 +32689,48 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "21030:66:5",
+                              "src": "21030:66:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "21017:79:5",
+                            "src": "21017:79:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3041,
+                          "id": 4483,
                           "nodeType": "ExpressionStatement",
-                          "src": "21017:79:5"
+                          "src": "21017:79:7"
                         }
                       ]
                     },
-                    "id": 3043,
+                    "id": 4485,
                     "nodeType": "IfStatement",
-                    "src": "20807:300:5",
+                    "src": "20807:300:7",
                     "trueBody": {
-                      "id": 3028,
+                      "id": 4470,
                       "nodeType": "Block",
-                      "src": "20896:101:5",
+                      "src": "20896:101:7",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3026,
+                            "id": 4468,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 3015,
+                              "id": 4457,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2984,
-                              "src": "20910:10:5",
+                              "referencedDeclaration": 4426,
+                              "src": "20910:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -32745,26 +32745,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3017,
+                                    "id": 4459,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2978,
-                                    "src": "20940:4:5",
+                                    "referencedDeclaration": 4420,
+                                    "src": "20940:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3018,
+                                  "id": 4460,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "20940:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "20940:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32777,26 +32777,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3022,
+                                        "id": 4464,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "20969:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "20969:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3023,
+                                      "id": 4465,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 769,
-                                      "src": "20969:15:5",
+                                      "referencedDeclaration": 2211,
+                                      "src": "20969:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -32814,46 +32814,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3019,
+                                        "id": 4461,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "20952:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "20952:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3020,
+                                      "id": 4462,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 761,
-                                      "src": "20952:12:5",
+                                      "referencedDeclaration": 2203,
+                                      "src": "20952:12:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3021,
+                                    "id": 4463,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "20952:16:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "20952:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3024,
+                                  "id": 4466,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -32861,7 +32861,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "20952:33:5",
+                                  "src": "20952:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32879,18 +32879,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3016,
+                                "id": 4458,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "20923:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "20923:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3025,
+                              "id": 4467,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -32898,45 +32898,45 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "20923:63:5",
+                              "src": "20923:63:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "20910:76:5",
+                            "src": "20910:76:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3027,
+                          "id": 4469,
                           "nodeType": "ExpressionStatement",
-                          "src": "20910:76:5"
+                          "src": "20910:76:7"
                         }
                       ]
                     }
                   },
-                  "id": 3044,
+                  "id": 4486,
                   "nodeType": "IfStatement",
-                  "src": "20651:456:5",
+                  "src": "20651:456:7",
                   "trueBody": {
-                    "id": 2998,
+                    "id": 4440,
                     "nodeType": "Block",
-                    "src": "20707:94:5",
+                    "src": "20707:94:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 2996,
+                          "id": 4438,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "20786:4:5",
+                          "src": "20786:4:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -32944,10 +32944,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 2940,
-                        "id": 2997,
+                        "functionReturnParameters": 4382,
+                        "id": 4439,
                         "nodeType": "Return",
-                        "src": "20779:11:5"
+                        "src": "20779:11:7"
                       }
                     ]
                   }
@@ -32959,19 +32959,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3048,
+                    "id": 4490,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3045,
+                      "id": 4487,
                       "name": "paidAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2984,
-                      "src": "21121:10:5",
+                      "referencedDeclaration": 4426,
+                      "src": "21121:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -32983,45 +32983,45 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3046,
+                        "id": 4488,
                         "name": "deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2978,
-                        "src": "21134:4:5",
+                        "referencedDeclaration": 4420,
+                        "src": "21134:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                           "typeString": "struct Market.Deal memory"
                         }
                       },
-                      "id": 3047,
+                      "id": 4489,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "21134:19:5",
+                      "referencedDeclaration": 2207,
+                      "src": "21134:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "21121:32:5",
+                    "src": "21121:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3148,
+                  "id": 4590,
                   "nodeType": "IfStatement",
-                  "src": "21117:820:5",
+                  "src": "21117:820:7",
                   "trueBody": {
-                    "id": 3147,
+                    "id": 4589,
                     "nodeType": "Block",
-                    "src": "21155:782:5",
+                    "src": "21155:782:7",
                     "statements": [
                       {
                         "condition": {
@@ -33030,7 +33030,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3059,
+                          "id": 4501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -33042,26 +33042,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3051,
+                                  "id": 4493,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2978,
-                                  "src": "21189:4:5",
+                                  "referencedDeclaration": 4420,
+                                  "src": "21189:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3052,
+                                "id": 4494,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "21189:15:5",
+                                "referencedDeclaration": 2189,
+                                "src": "21189:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -33077,32 +33077,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3049,
+                                "id": 4491,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 873,
-                                "src": "21173:5:5",
+                                "referencedDeclaration": 2315,
+                                "src": "21173:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 3050,
+                              "id": 4492,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "21173:15:5",
+                              "referencedDeclaration": 10977,
+                              "src": "21173:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 3053,
+                            "id": 4495,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -33110,7 +33110,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21173:32:5",
+                            "src": "21173:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -33125,26 +33125,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3056,
+                                  "id": 4498,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2978,
-                                  "src": "21224:4:5",
+                                  "referencedDeclaration": 4420,
+                                  "src": "21224:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3057,
+                                "id": 4499,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "blockedBalance",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 765,
-                                "src": "21224:19:5",
+                                "referencedDeclaration": 2207,
+                                "src": "21224:19:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -33160,32 +33160,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3054,
+                                "id": 4496,
                                 "name": "paidAmount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2984,
-                                "src": "21209:10:5",
+                                "referencedDeclaration": 4426,
+                                "src": "21209:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3055,
+                              "id": 4497,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "21209:14:5",
+                              "referencedDeclaration": 10771,
+                              "src": "21209:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3058,
+                            "id": 4500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -33193,22 +33193,22 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21209:35:5",
+                            "src": "21209:35:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "21173:71:5",
+                          "src": "21173:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3145,
+                          "id": 4587,
                           "nodeType": "Block",
-                          "src": "21490:437:5",
+                          "src": "21490:437:7",
                           "statements": [
                             {
                               "eventCall": {
@@ -33216,12 +33216,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3093,
+                                    "id": 4535,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2936,
-                                    "src": "21520:6:5",
+                                    "referencedDeclaration": 4378,
+                                    "src": "21520:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33233,26 +33233,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3094,
+                                        "id": 4536,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "21528:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "21528:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3096,
+                                      "id": 4538,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3095,
+                                        "id": 4537,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2936,
-                                        "src": "21534:6:5",
+                                        "referencedDeclaration": 4378,
+                                        "src": "21534:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -33263,21 +33263,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "21528:13:5",
+                                      "src": "21528:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3097,
+                                    "id": 4539,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 765,
-                                    "src": "21528:28:5",
+                                    "referencedDeclaration": 2207,
+                                    "src": "21528:28:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33295,18 +33295,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3092,
+                                  "id": 4534,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 832,
-                                  "src": "21513:6:5",
+                                  "referencedDeclaration": 2274,
+                                  "src": "21513:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 3098,
+                                "id": 4540,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33314,15 +33314,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21513:44:5",
+                                "src": "21513:44:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3099,
+                              "id": 4541,
                               "nodeType": "EmitStatement",
-                              "src": "21508:49:5"
+                              "src": "21508:49:7"
                             },
                             {
                               "expression": {
@@ -33330,12 +33330,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3101,
+                                    "id": 4543,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2936,
-                                    "src": "21593:6:5",
+                                    "referencedDeclaration": 4378,
+                                    "src": "21593:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33349,18 +33349,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3100,
+                                  "id": 4542,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3562,
-                                  "src": "21575:17:5",
+                                  "referencedDeclaration": 5004,
+                                  "src": "21575:17:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3102,
+                                "id": 4544,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33368,15 +33368,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21575:25:5",
+                                "src": "21575:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3103,
+                              "id": 4545,
                               "nodeType": "ExpressionStatement",
-                              "src": "21575:25:5"
+                              "src": "21575:25:7"
                             },
                             {
                               "expression": {
@@ -33389,26 +33389,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3107,
+                                          "id": 4549,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21641:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21641:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3108,
+                                        "id": 4550,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "masterID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 749,
-                                        "src": "21641:13:5",
+                                        "referencedDeclaration": 2191,
+                                        "src": "21641:13:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -33418,26 +33418,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3109,
+                                          "id": 4551,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21656:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21656:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3110,
+                                        "id": 4552,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "blockedBalance",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 765,
-                                        "src": "21656:19:5",
+                                        "referencedDeclaration": 2207,
+                                        "src": "21656:19:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -33457,32 +33457,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3105,
+                                        "id": 4547,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "21626:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "21626:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3106,
+                                      "id": 4548,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transfer",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7419,
-                                      "src": "21626:14:5",
+                                      "referencedDeclaration": 10965,
+                                      "src": "21626:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3111,
+                                    "id": 4553,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -33490,7 +33490,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21626:50:5",
+                                    "src": "21626:50:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -33504,21 +33504,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3104,
+                                  "id": 4546,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "21618:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "21618:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3112,
+                                "id": 4554,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33526,20 +33526,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21618:59:5",
+                                "src": "21618:59:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3113,
+                              "id": 4555,
                               "nodeType": "ExpressionStatement",
-                              "src": "21618:59:5"
+                              "src": "21618:59:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3120,
+                                "id": 4562,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33550,26 +33550,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3114,
+                                      "id": 4556,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21695:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21695:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3116,
+                                    "id": 4558,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3115,
+                                      "id": 4557,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21701:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21701:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33580,21 +33580,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21695:13:5",
+                                    "src": "21695:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3117,
+                                  "id": 4559,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "lastBillTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 769,
-                                  "src": "21695:24:5",
+                                  "referencedDeclaration": 2211,
+                                  "src": "21695:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33606,18 +33606,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3118,
+                                    "id": 4560,
                                     "name": "block",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7759,
-                                    "src": "21722:5:5",
+                                    "referencedDeclaration": 11305,
+                                    "src": "21722:5:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_block",
                                       "typeString": "block"
                                     }
                                   },
-                                  "id": 3119,
+                                  "id": 4561,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -33625,26 +33625,26 @@
                                   "memberName": "timestamp",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "21722:15:5",
+                                  "src": "21722:15:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21695:42:5",
+                                "src": "21695:42:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3121,
+                              "id": 4563,
                               "nodeType": "ExpressionStatement",
-                              "src": "21695:42:5"
+                              "src": "21695:42:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3134,
+                                "id": 4576,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33655,26 +33655,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3122,
+                                      "id": 4564,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21755:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21755:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3124,
+                                    "id": 4566,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3123,
+                                      "id": 4565,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21761:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21761:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33685,21 +33685,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21755:13:5",
+                                    "src": "21755:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3125,
+                                  "id": 4567,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "totalPayout",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 767,
-                                  "src": "21755:25:5",
+                                  "referencedDeclaration": 2209,
+                                  "src": "21755:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33714,26 +33714,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3131,
+                                        "id": 4573,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "21813:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "21813:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3132,
+                                      "id": 4574,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "21813:19:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "21813:19:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33753,26 +33753,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3126,
+                                          "id": 4568,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "21783:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "21783:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3128,
+                                        "id": 4570,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3127,
+                                          "id": 4569,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2936,
-                                          "src": "21789:6:5",
+                                          "referencedDeclaration": 4378,
+                                          "src": "21789:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -33783,41 +33783,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21783:13:5",
+                                        "src": "21783:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3129,
+                                      "id": 4571,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "totalPayout",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 767,
-                                      "src": "21783:25:5",
+                                      "referencedDeclaration": 2209,
+                                      "src": "21783:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3130,
+                                    "id": 4572,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "21783:29:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "21783:29:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3133,
+                                  "id": 4575,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -33825,26 +33825,26 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21783:50:5",
+                                  "src": "21783:50:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21755:78:5",
+                                "src": "21755:78:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3135,
+                              "id": 4577,
                               "nodeType": "ExpressionStatement",
-                              "src": "21755:78:5"
+                              "src": "21755:78:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3141,
+                                "id": 4583,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33855,26 +33855,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3136,
+                                      "id": 4578,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21851:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21851:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3138,
+                                    "id": 4580,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3137,
+                                      "id": 4579,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21857:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21857:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33885,21 +33885,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21851:13:5",
+                                    "src": "21851:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3139,
+                                  "id": 4581,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "21851:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "21851:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33910,14 +33910,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3140,
+                                  "id": 4582,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "21882:1:5",
+                                  "src": "21882:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -33925,28 +33925,28 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "21851:32:5",
+                                "src": "21851:32:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3142,
+                              "id": 4584,
                               "nodeType": "ExpressionStatement",
-                              "src": "21851:32:5"
+                              "src": "21851:32:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3143,
+                                "id": 4585,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "21908:4:5",
+                                "src": "21908:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -33954,20 +33954,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 2940,
-                              "id": 3144,
+                              "functionReturnParameters": 4382,
+                              "id": 4586,
                               "nodeType": "Return",
-                              "src": "21901:11:5"
+                              "src": "21901:11:7"
                             }
                           ]
                         },
-                        "id": 3146,
+                        "id": 4588,
                         "nodeType": "IfStatement",
-                        "src": "21169:758:5",
+                        "src": "21169:758:7",
                         "trueBody": {
-                          "id": 3091,
+                          "id": 4533,
                           "nodeType": "Block",
-                          "src": "21246:238:5",
+                          "src": "21246:238:7",
                           "statements": [
                             {
                               "expression": {
@@ -33980,26 +33980,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3063,
+                                          "id": 4505,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21291:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21291:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3064,
+                                        "id": 4506,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 747,
-                                        "src": "21291:15:5",
+                                        "referencedDeclaration": 2189,
+                                        "src": "21291:15:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -34007,14 +34007,14 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3065,
+                                        "id": 4507,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7814,
-                                        "src": "21308:4:5",
+                                        "referencedDeclaration": 11366,
+                                        "src": "21308:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         }
                                       },
@@ -34025,26 +34025,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 3068,
+                                              "id": 4510,
                                               "name": "deal",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 2978,
-                                              "src": "21329:4:5",
+                                              "referencedDeclaration": 4420,
+                                              "src": "21329:4:7",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                                 "typeString": "struct Market.Deal memory"
                                               }
                                             },
-                                            "id": 3069,
+                                            "id": 4511,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "blockedBalance",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 765,
-                                            "src": "21329:19:5",
+                                            "referencedDeclaration": 2207,
+                                            "src": "21329:19:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -34060,32 +34060,32 @@
                                           ],
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 3066,
+                                            "id": 4508,
                                             "name": "paidAmount",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2984,
-                                            "src": "21314:10:5",
+                                            "referencedDeclaration": 4426,
+                                            "src": "21314:10:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             }
                                           },
-                                          "id": 3067,
+                                          "id": 4509,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "sub",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 7225,
-                                          "src": "21314:14:5",
+                                          "referencedDeclaration": 10771,
+                                          "src": "21314:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                                           }
                                         },
-                                        "id": 3070,
+                                        "id": 4512,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -34093,7 +34093,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "21314:35:5",
+                                        "src": "21314:35:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -34107,7 +34107,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -34117,32 +34117,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3061,
+                                        "id": 4503,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "21272:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "21272:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3062,
+                                      "id": 4504,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7607,
-                                      "src": "21272:18:5",
+                                      "referencedDeclaration": 11153,
+                                      "src": "21272:18:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3071,
+                                    "id": 4513,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -34150,7 +34150,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21272:78:5",
+                                    "src": "21272:78:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -34164,21 +34164,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3060,
+                                  "id": 4502,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "21264:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "21264:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3072,
+                                "id": 4514,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -34186,20 +34186,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21264:87:5",
+                                "src": "21264:87:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3073,
+                              "id": 4515,
                               "nodeType": "ExpressionStatement",
-                              "src": "21264:87:5"
+                              "src": "21264:87:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3089,
+                                "id": 4531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -34210,26 +34210,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3074,
+                                      "id": 4516,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21369:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21369:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3076,
+                                    "id": 4518,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3075,
+                                      "id": 4517,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21375:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21375:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -34240,21 +34240,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21369:13:5",
+                                    "src": "21369:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3077,
+                                  "id": 4519,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "21369:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "21369:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -34272,26 +34272,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 3085,
+                                            "id": 4527,
                                             "name": "deal",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2978,
-                                            "src": "21448:4:5",
+                                            "referencedDeclaration": 4420,
+                                            "src": "21448:4:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                               "typeString": "struct Market.Deal memory"
                                             }
                                           },
-                                          "id": 3086,
+                                          "id": 4528,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blockedBalance",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 765,
-                                          "src": "21448:19:5",
+                                          "referencedDeclaration": 2207,
+                                          "src": "21448:19:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -34307,32 +34307,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3083,
+                                          "id": 4525,
                                           "name": "paidAmount",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2984,
-                                          "src": "21433:10:5",
+                                          "referencedDeclaration": 4426,
+                                          "src": "21433:10:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
                                           }
                                         },
-                                        "id": 3084,
+                                        "id": 4526,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "sub",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 7225,
-                                        "src": "21433:14:5",
+                                        "referencedDeclaration": 10771,
+                                        "src": "21433:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                                         }
                                       },
-                                      "id": 3087,
+                                      "id": 4529,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -34340,7 +34340,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "21433:35:5",
+                                      "src": "21433:35:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -34360,26 +34360,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3078,
+                                          "id": 4520,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "21400:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "21400:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3080,
+                                        "id": 4522,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3079,
+                                          "id": 4521,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2936,
-                                          "src": "21406:6:5",
+                                          "referencedDeclaration": 4378,
+                                          "src": "21406:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -34390,41 +34390,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21400:13:5",
+                                        "src": "21400:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3081,
+                                      "id": 4523,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "21400:28:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "21400:28:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3082,
+                                    "id": 4524,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "21400:32:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "21400:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3088,
+                                  "id": 4530,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -34432,21 +34432,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21400:69:5",
+                                  "src": "21400:69:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21369:100:5",
+                                "src": "21369:100:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3090,
+                              "id": 4532,
                               "nodeType": "ExpressionStatement",
-                              "src": "21369:100:5"
+                              "src": "21369:100:7"
                             }
                           ]
                         }
@@ -34465,26 +34465,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3152,
+                              "id": 4594,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2978,
-                              "src": "21969:4:5",
+                              "referencedDeclaration": 4420,
+                              "src": "21969:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3153,
+                            "id": 4595,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "21969:13:5",
+                            "referencedDeclaration": 2191,
+                            "src": "21969:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -34492,12 +34492,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 3154,
+                            "id": 4596,
                             "name": "paidAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2984,
-                            "src": "21984:10:5",
+                            "referencedDeclaration": 4426,
+                            "src": "21984:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -34517,32 +34517,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3150,
+                            "id": 4592,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "21954:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "21954:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 3151,
+                          "id": 4593,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "21954:14:5",
+                          "referencedDeclaration": 10965,
+                          "src": "21954:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 3155,
+                        "id": 4597,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -34550,7 +34550,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "21954:41:5",
+                        "src": "21954:41:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -34564,21 +34564,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3149,
+                      "id": 4591,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "21946:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "21946:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3156,
+                    "id": 4598,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34586,20 +34586,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "21946:50:5",
+                    "src": "21946:50:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3157,
+                  "id": 4599,
                   "nodeType": "ExpressionStatement",
-                  "src": "21946:50:5"
+                  "src": "21946:50:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3169,
+                    "id": 4611,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34610,26 +34610,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3158,
+                          "id": 4600,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22006:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22006:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3160,
+                        "id": 4602,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3159,
+                          "id": 4601,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22012:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22012:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34640,21 +34640,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22006:13:5",
+                        "src": "22006:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3161,
+                      "id": 4603,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "22006:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "22006:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -34667,12 +34667,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3167,
+                          "id": 4609,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2984,
-                          "src": "22070:10:5",
+                          "referencedDeclaration": 4426,
+                          "src": "22070:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34692,26 +34692,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3162,
+                              "id": 4604,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "22037:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "22037:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3164,
+                            "id": 4606,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3163,
+                              "id": 4605,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "22043:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "22043:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -34722,41 +34722,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22037:13:5",
+                            "src": "22037:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3165,
+                          "id": 4607,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "blockedBalance",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 765,
-                          "src": "22037:28:5",
+                          "referencedDeclaration": 2207,
+                          "src": "22037:28:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3166,
+                        "id": 4608,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "22037:32:5",
+                        "referencedDeclaration": 10771,
+                        "src": "22037:32:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3168,
+                      "id": 4610,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -34764,26 +34764,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22037:44:5",
+                      "src": "22037:44:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22006:75:5",
+                    "src": "22006:75:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3170,
+                  "id": 4612,
                   "nodeType": "ExpressionStatement",
-                  "src": "22006:75:5"
+                  "src": "22006:75:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3182,
+                    "id": 4624,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34794,26 +34794,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3171,
+                          "id": 4613,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22091:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22091:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3173,
+                        "id": 4615,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3172,
+                          "id": 4614,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22097:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22097:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34824,21 +34824,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22091:13:5",
+                        "src": "22091:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3174,
+                      "id": 4616,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "totalPayout",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 767,
-                      "src": "22091:25:5",
+                      "referencedDeclaration": 2209,
+                      "src": "22091:25:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -34851,12 +34851,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3180,
+                          "id": 4622,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2984,
-                          "src": "22149:10:5",
+                          "referencedDeclaration": 4426,
+                          "src": "22149:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34876,26 +34876,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3175,
+                              "id": 4617,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "22119:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "22119:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3177,
+                            "id": 4619,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3176,
+                              "id": 4618,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "22125:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "22125:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -34906,41 +34906,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22119:13:5",
+                            "src": "22119:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3178,
+                          "id": 4620,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "totalPayout",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 767,
-                          "src": "22119:25:5",
+                          "referencedDeclaration": 2209,
+                          "src": "22119:25:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3179,
+                        "id": 4621,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "22119:29:5",
+                        "referencedDeclaration": 10795,
+                        "src": "22119:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3181,
+                      "id": 4623,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -34948,26 +34948,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22119:41:5",
+                      "src": "22119:41:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22091:69:5",
+                    "src": "22091:69:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3183,
+                  "id": 4625,
                   "nodeType": "ExpressionStatement",
-                  "src": "22091:69:5"
+                  "src": "22091:69:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3190,
+                    "id": 4632,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34978,26 +34978,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3184,
+                          "id": 4626,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22170:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22170:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3186,
+                        "id": 4628,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3185,
+                          "id": 4627,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22176:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22176:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -35008,21 +35008,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22170:13:5",
+                        "src": "22170:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3187,
+                      "id": 4629,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lastBillTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 769,
-                      "src": "22170:24:5",
+                      "referencedDeclaration": 2211,
+                      "src": "22170:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -35034,18 +35034,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3188,
+                        "id": 4630,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "22197:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "22197:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3189,
+                      "id": 4631,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -35053,21 +35053,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "22197:15:5",
+                      "src": "22197:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22170:42:5",
+                    "src": "22170:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3191,
+                  "id": 4633,
                   "nodeType": "ExpressionStatement",
-                  "src": "22170:42:5"
+                  "src": "22170:42:7"
                 },
                 {
                   "eventCall": {
@@ -35075,12 +35075,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3193,
+                        "id": 4635,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2936,
-                        "src": "22234:6:5",
+                        "referencedDeclaration": 4378,
+                        "src": "22234:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35088,12 +35088,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3194,
+                        "id": 4636,
                         "name": "paidAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2984,
-                        "src": "22242:10:5",
+                        "referencedDeclaration": 4426,
+                        "src": "22242:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35111,18 +35111,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3192,
+                      "id": 4634,
                       "name": "Billed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 832,
-                      "src": "22227:6:5",
+                      "referencedDeclaration": 2274,
+                      "src": "22227:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 3195,
+                    "id": 4637,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -35130,28 +35130,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22227:26:5",
+                    "src": "22227:26:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3196,
+                  "id": 4638,
                   "nodeType": "EmitStatement",
-                  "src": "22222:31:5"
+                  "src": "22222:31:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3197,
+                    "id": 4639,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "22270:4:5",
+                    "src": "22270:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -35159,15 +35159,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2940,
-                  "id": 3198,
+                  "functionReturnParameters": 4382,
+                  "id": 4640,
                   "nodeType": "Return",
-                  "src": "22263:11:5"
+                  "src": "22263:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3200,
+            "id": 4642,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -35175,16 +35175,16 @@
             "name": "InternalBill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2937,
+              "id": 4379,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2936,
+                  "id": 4378,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3200,
-                  "src": "20328:11:5",
+                  "scope": 4642,
+                  "src": "20328:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -35192,10 +35192,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2935,
+                    "id": 4377,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20328:4:5",
+                    "src": "20328:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -35205,20 +35205,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20327:13:5"
+              "src": "20327:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2940,
+              "id": 4382,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2939,
+                  "id": 4381,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3200,
-                  "src": "20359:4:5",
+                  "scope": 4642,
+                  "src": "20359:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -35226,10 +35226,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2938,
+                    "id": 4380,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20359:4:5",
+                    "src": "20359:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -35239,30 +35239,30 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20358:6:5"
+              "src": "20358:6:7"
             },
-            "scope": 3787,
-            "src": "20306:1975:5",
+            "scope": 5229,
+            "src": "20306:1975:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3347,
+              "id": 4789,
               "nodeType": "Block",
-              "src": "22356:1314:5",
+              "src": "22356:1314:7",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3208,
+                      "id": 4650,
                       "name": "nextPeriod",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3348,
-                      "src": "22366:15:5",
+                      "scope": 4790,
+                      "src": "22366:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -35270,10 +35270,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3207,
+                        "id": 4649,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "22366:4:5",
+                        "src": "22366:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35283,38 +35283,38 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3209,
+                  "id": 4651,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22366:15:5"
+                  "src": "22366:15:7"
                 },
                 {
                   "assignments": [
-                    3211
+                    4653
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3211,
+                      "id": 4653,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3348,
-                      "src": "22391:16:5",
+                      "scope": 4790,
+                      "src": "22391:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3210,
+                        "id": 4652,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 770,
-                        "src": "22391:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "22391:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -35322,31 +35322,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3215,
+                  "id": 4657,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 3212,
+                      "id": 4654,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 900,
-                      "src": "22410:5:5",
+                      "referencedDeclaration": 2342,
+                      "src": "22410:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 3214,
+                    "id": 4656,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 3213,
+                      "id": 4655,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3202,
-                      "src": "22416:6:5",
+                      "referencedDeclaration": 4644,
+                      "src": "22416:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -35357,14 +35357,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "22410:13:5",
+                    "src": "22410:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22391:32:5"
+                  "src": "22391:32:7"
                 },
                 {
                   "condition": {
@@ -35372,12 +35372,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3217,
+                        "id": 4659,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3202,
-                        "src": "22445:6:5",
+                        "referencedDeclaration": 4644,
+                        "src": "22445:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35391,18 +35391,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3216,
+                      "id": 4658,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3401,
-                      "src": "22438:6:5",
+                      "referencedDeclaration": 4843,
+                      "src": "22438:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 3218,
+                    "id": 4660,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -35410,16 +35410,16 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22438:14:5",
+                    "src": "22438:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 3266,
+                    "id": 4708,
                     "nodeType": "Block",
-                    "src": "22607:360:5",
+                    "src": "22607:360:7",
                     "statements": [
                       {
                         "condition": {
@@ -35428,7 +35428,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3237,
+                          "id": 4679,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35437,18 +35437,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3233,
+                              "id": 4675,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "22625:5:5",
+                              "referencedDeclaration": 11305,
+                              "src": "22625:5:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 3234,
+                            "id": 4676,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -35456,7 +35456,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22625:15:5",
+                            "src": "22625:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -35468,58 +35468,58 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3235,
+                              "id": 4677,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3211,
-                              "src": "22643:4:5",
+                              "referencedDeclaration": 4653,
+                              "src": "22643:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3236,
+                            "id": 4678,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 761,
-                            "src": "22643:12:5",
+                            "referencedDeclaration": 2203,
+                            "src": "22643:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "22625:30:5",
+                          "src": "22625:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 3241,
+                        "id": 4683,
                         "nodeType": "IfStatement",
-                        "src": "22621:138:5",
+                        "src": "22621:138:7",
                         "trueBody": {
-                          "id": 3240,
+                          "id": 4682,
                           "nodeType": "Block",
-                          "src": "22657:102:5",
+                          "src": "22657:102:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3238,
+                                "id": 4680,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22740:4:5",
+                                "src": "22740:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -35527,10 +35527,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3239,
+                              "functionReturnParameters": 4648,
+                              "id": 4681,
                               "nodeType": "Return",
-                              "src": "22733:11:5"
+                              "src": "22733:11:7"
                             }
                           ]
                         }
@@ -35542,7 +35542,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3249,
+                          "id": 4691,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35554,18 +35554,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3245,
+                                  "id": 4687,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7759,
-                                  "src": "22793:5:5",
+                                  "referencedDeclaration": 11305,
+                                  "src": "22793:5:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 3246,
+                                "id": 4688,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -35573,7 +35573,7 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "22793:15:5",
+                                "src": "22793:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -35591,46 +35591,46 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3242,
+                                  "id": 4684,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3211,
-                                  "src": "22776:4:5",
+                                  "referencedDeclaration": 4653,
+                                  "src": "22776:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3243,
+                                "id": 4685,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "endTime",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 761,
-                                "src": "22776:12:5",
+                                "referencedDeclaration": 2203,
+                                "src": "22776:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3244,
+                              "id": 4686,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "22776:16:5",
+                              "referencedDeclaration": 10771,
+                              "src": "22776:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3247,
+                            "id": 4689,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -35638,7 +35638,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "22776:33:5",
+                            "src": "22776:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -35649,14 +35649,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 3248,
+                            "id": 4690,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22812:6:5",
+                            "src": "22812:6:7",
                             "subdenomination": "days",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_86400_by_1",
@@ -35664,33 +35664,33 @@
                             },
                             "value": "1"
                           },
-                          "src": "22776:42:5",
+                          "src": "22776:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3264,
+                          "id": 4706,
                           "nodeType": "Block",
-                          "src": "22905:52:5",
+                          "src": "22905:52:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3262,
+                                "id": 4704,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3260,
+                                  "id": 4702,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "22923:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "22923:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -35701,14 +35701,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3261,
+                                  "id": 4703,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "22936:6:5",
+                                  "src": "22936:6:7",
                                   "subdenomination": "days",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_86400_by_1",
@@ -35716,42 +35716,42 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "22923:19:5",
+                                "src": "22923:19:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3263,
+                              "id": 4705,
                               "nodeType": "ExpressionStatement",
-                              "src": "22923:19:5"
+                              "src": "22923:19:7"
                             }
                           ]
                         },
-                        "id": 3265,
+                        "id": 4707,
                         "nodeType": "IfStatement",
-                        "src": "22772:185:5",
+                        "src": "22772:185:7",
                         "trueBody": {
-                          "id": 3259,
+                          "id": 4701,
                           "nodeType": "Block",
-                          "src": "22820:79:5",
+                          "src": "22820:79:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3257,
+                                "id": 4699,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3250,
+                                  "id": 4692,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "22838:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "22838:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -35766,18 +35766,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3254,
+                                        "id": 4696,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7759,
-                                        "src": "22868:5:5",
+                                        "referencedDeclaration": 11305,
+                                        "src": "22868:5:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 3255,
+                                      "id": 4697,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -35785,7 +35785,7 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "22868:15:5",
+                                      "src": "22868:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -35803,46 +35803,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3251,
+                                        "id": 4693,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3211,
-                                        "src": "22851:4:5",
+                                        "referencedDeclaration": 4653,
+                                        "src": "22851:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3252,
+                                      "id": 4694,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 761,
-                                      "src": "22851:12:5",
+                                      "referencedDeclaration": 2203,
+                                      "src": "22851:12:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3253,
+                                    "id": 4695,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "22851:16:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "22851:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3256,
+                                  "id": 4698,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -35850,43 +35850,43 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "22851:33:5",
+                                  "src": "22851:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "22838:46:5",
+                                "src": "22838:46:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3258,
+                              "id": 4700,
                               "nodeType": "ExpressionStatement",
-                              "src": "22838:46:5"
+                              "src": "22838:46:7"
                             }
                           ]
                         }
                       }
                     ]
                   },
-                  "id": 3267,
+                  "id": 4709,
                   "nodeType": "IfStatement",
-                  "src": "22434:533:5",
+                  "src": "22434:533:7",
                   "trueBody": {
-                    "id": 3232,
+                    "id": 4674,
                     "nodeType": "Block",
-                    "src": "22454:147:5",
+                    "src": "22454:147:7",
                     "statements": [
                       {
                         "condition": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           },
-                          "id": 3223,
+                          "id": 4665,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35895,28 +35895,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3219,
+                              "id": 4661,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3211,
-                              "src": "22472:4:5",
+                              "referencedDeclaration": 4653,
+                              "src": "22472:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3220,
+                            "id": 4662,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 763,
-                            "src": "22472:11:5",
+                            "referencedDeclaration": 2205,
+                            "src": "22472:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
@@ -35926,18 +35926,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3221,
+                              "id": 4663,
                               "name": "DealStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 722,
-                              "src": "22487:10:5",
+                              "referencedDeclaration": 2164,
+                              "src": "22487:10:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                 "typeString": "type(enum Market.DealStatus)"
                               }
                             },
-                            "id": 3222,
+                            "id": 4664,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -35945,39 +35945,39 @@
                             "memberName": "STATUS_CLOSED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22487:24:5",
+                            "src": "22487:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
-                          "src": "22472:39:5",
+                          "src": "22472:39:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 3227,
+                        "id": 4669,
                         "nodeType": "IfStatement",
-                        "src": "22468:89:5",
+                        "src": "22468:89:7",
                         "trueBody": {
-                          "id": 3226,
+                          "id": 4668,
                           "nodeType": "Block",
-                          "src": "22513:44:5",
+                          "src": "22513:44:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3224,
+                                "id": 4666,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22538:4:5",
+                                "src": "22538:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -35985,10 +35985,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3225,
+                              "functionReturnParameters": 4648,
+                              "id": 4667,
                               "nodeType": "Return",
-                              "src": "22531:11:5"
+                              "src": "22531:11:7"
                             }
                           ]
                         }
@@ -35996,19 +35996,19 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3230,
+                          "id": 4672,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3228,
+                            "id": 4670,
                             "name": "nextPeriod",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3208,
-                            "src": "22570:10:5",
+                            "referencedDeclaration": 4650,
+                            "src": "22570:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -36019,14 +36019,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 3229,
+                            "id": 4671,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22583:7:5",
+                            "src": "22583:7:7",
                             "subdenomination": "hours",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_3600_by_1",
@@ -36034,15 +36034,15 @@
                             },
                             "value": "1"
                           },
-                          "src": "22570:20:5",
+                          "src": "22570:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3231,
+                        "id": 4673,
                         "nodeType": "ExpressionStatement",
-                        "src": "22570:20:5"
+                        "src": "22570:20:7"
                       }
                     ]
                   }
@@ -36054,7 +36054,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3277,
+                    "id": 4719,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -36066,26 +36066,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3269,
+                            "id": 4711,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3211,
-                            "src": "22998:4:5",
+                            "referencedDeclaration": 4653,
+                            "src": "22998:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3270,
+                          "id": 4712,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 757,
-                          "src": "22998:10:5",
+                          "referencedDeclaration": 2199,
+                          "src": "22998:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36093,12 +36093,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3271,
+                          "id": 4713,
                           "name": "nextPeriod",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3208,
-                          "src": "23010:10:5",
+                          "referencedDeclaration": 4650,
+                          "src": "23010:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36116,18 +36116,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 3268,
+                        "id": 4710,
                         "name": "CalculatePayment",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3428,
-                        "src": "22981:16:5",
+                        "referencedDeclaration": 4870,
+                        "src": "22981:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                           "typeString": "function (uint256,uint256) view returns (uint256)"
                         }
                       },
-                      "id": 3272,
+                      "id": 4714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -36135,7 +36135,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22981:40:5",
+                      "src": "22981:40:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -36149,26 +36149,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3273,
+                          "id": 4715,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "23024:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "23024:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3275,
+                        "id": 4717,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3274,
+                          "id": 4716,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3202,
-                          "src": "23030:6:5",
+                          "referencedDeclaration": 4644,
+                          "src": "23030:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36179,53 +36179,53 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23024:13:5",
+                        "src": "23024:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3276,
+                      "id": 4718,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "23024:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "23024:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22981:71:5",
+                    "src": "22981:71:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3344,
+                  "id": 4786,
                   "nodeType": "IfStatement",
-                  "src": "22977:666:5",
+                  "src": "22977:666:7",
                   "trueBody": {
-                    "id": 3343,
+                    "id": 4785,
                     "nodeType": "Block",
-                    "src": "23054:589:5",
+                    "src": "23054:589:7",
                     "statements": [
                       {
                         "assignments": [
-                          3279
+                          4721
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 3279,
+                            "id": 4721,
                             "name": "nextPeriodSum",
                             "nodeType": "VariableDeclaration",
-                            "scope": 3348,
-                            "src": "23068:18:5",
+                            "scope": 4790,
+                            "src": "23068:18:7",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -36233,10 +36233,10 @@
                               "typeString": "uint256"
                             },
                             "typeName": {
-                              "id": 3278,
+                              "id": 4720,
                               "name": "uint",
                               "nodeType": "ElementaryTypeName",
-                              "src": "23068:4:5",
+                              "src": "23068:4:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -36246,7 +36246,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 3291,
+                        "id": 4733,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -36256,26 +36256,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3286,
+                                  "id": 4728,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23134:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23134:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3288,
+                                "id": 4730,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3287,
+                                  "id": 4729,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3202,
-                                  "src": "23140:6:5",
+                                  "referencedDeclaration": 4644,
+                                  "src": "23140:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36286,21 +36286,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23134:13:5",
+                                "src": "23134:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3289,
+                              "id": 4731,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 765,
-                              "src": "23134:28:5",
+                              "referencedDeclaration": 2207,
+                              "src": "23134:28:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -36321,26 +36321,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3281,
+                                    "id": 4723,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3211,
-                                    "src": "23106:4:5",
+                                    "referencedDeclaration": 4653,
+                                    "src": "23106:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3282,
+                                  "id": 4724,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "23106:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "23106:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36348,12 +36348,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 3283,
+                                  "id": 4725,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "23118:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "23118:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36371,18 +36371,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3280,
+                                "id": 4722,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "23089:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "23089:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3284,
+                              "id": 4726,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -36390,27 +36390,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "23089:40:5",
+                              "src": "23089:40:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 3285,
+                            "id": 4727,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "sub",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7225,
-                            "src": "23089:44:5",
+                            "referencedDeclaration": 10771,
+                            "src": "23089:44:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 3290,
+                          "id": 4732,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -36418,14 +36418,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23089:74:5",
+                          "src": "23089:74:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "23068:95:5"
+                        "src": "23068:95:7"
                       },
                       {
                         "condition": {
@@ -36434,7 +36434,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3298,
+                          "id": 4740,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -36446,26 +36446,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3294,
+                                  "id": 4736,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3211,
-                                  "src": "23198:4:5",
+                                  "referencedDeclaration": 4653,
+                                  "src": "23198:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3295,
+                                "id": 4737,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "23198:15:5",
+                                "referencedDeclaration": 2189,
+                                "src": "23198:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -36481,32 +36481,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3292,
+                                "id": 4734,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 873,
-                                "src": "23182:5:5",
+                                "referencedDeclaration": 2315,
+                                "src": "23182:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 3293,
+                              "id": 4735,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "23182:15:5",
+                              "referencedDeclaration": 10977,
+                              "src": "23182:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 3296,
+                            "id": 4738,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -36514,7 +36514,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "23182:32:5",
+                            "src": "23182:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -36524,27 +36524,27 @@
                           "operator": ">=",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 3297,
+                            "id": 4739,
                             "name": "nextPeriodSum",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3279,
-                            "src": "23218:13:5",
+                            "referencedDeclaration": 4721,
+                            "src": "23218:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "23182:49:5",
+                          "src": "23182:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3341,
+                          "id": 4783,
                           "nodeType": "Block",
-                          "src": "23433:200:5",
+                          "src": "23433:200:7",
                           "statements": [
                             {
                               "eventCall": {
@@ -36552,12 +36552,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3324,
+                                    "id": 4766,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23463:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23463:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36569,26 +36569,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3325,
+                                        "id": 4767,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "23471:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "23471:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3327,
+                                      "id": 4769,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3326,
+                                        "id": 4768,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3202,
-                                        "src": "23477:6:5",
+                                        "referencedDeclaration": 4644,
+                                        "src": "23477:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -36599,21 +36599,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "23471:13:5",
+                                      "src": "23471:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3328,
+                                    "id": 4770,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 765,
-                                    "src": "23471:28:5",
+                                    "referencedDeclaration": 2207,
+                                    "src": "23471:28:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36631,18 +36631,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3323,
+                                  "id": 4765,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 832,
-                                  "src": "23456:6:5",
+                                  "referencedDeclaration": 2274,
+                                  "src": "23456:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 3329,
+                                "id": 4771,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36650,15 +36650,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23456:44:5",
+                                "src": "23456:44:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3330,
+                              "id": 4772,
                               "nodeType": "EmitStatement",
-                              "src": "23451:49:5"
+                              "src": "23451:49:7"
                             },
                             {
                               "expression": {
@@ -36666,12 +36666,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3332,
+                                    "id": 4774,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23536:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23536:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36685,18 +36685,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3331,
+                                  "id": 4773,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3562,
-                                  "src": "23518:17:5",
+                                  "referencedDeclaration": 5004,
+                                  "src": "23518:17:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3333,
+                                "id": 4775,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36704,15 +36704,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23518:25:5",
+                                "src": "23518:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3334,
+                              "id": 4776,
                               "nodeType": "ExpressionStatement",
-                              "src": "23518:25:5"
+                              "src": "23518:25:7"
                             },
                             {
                               "expression": {
@@ -36720,12 +36720,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3336,
+                                    "id": 4778,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23582:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23582:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36739,18 +36739,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3335,
+                                  "id": 4777,
                                   "name": "RefundRemainingFunds",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3386,
-                                  "src": "23561:20:5",
+                                  "referencedDeclaration": 4828,
+                                  "src": "23561:20:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3337,
+                                "id": 4779,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36758,28 +36758,28 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23561:28:5",
+                                "src": "23561:28:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3338,
+                              "id": 4780,
                               "nodeType": "ExpressionStatement",
-                              "src": "23561:28:5"
+                              "src": "23561:28:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3339,
+                                "id": 4781,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "23614:4:5",
+                                "src": "23614:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -36787,20 +36787,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3340,
+                              "functionReturnParameters": 4648,
+                              "id": 4782,
                               "nodeType": "Return",
-                              "src": "23607:11:5"
+                              "src": "23607:11:7"
                             }
                           ]
                         },
-                        "id": 3342,
+                        "id": 4784,
                         "nodeType": "IfStatement",
-                        "src": "23178:455:5",
+                        "src": "23178:455:7",
                         "trueBody": {
-                          "id": 3322,
+                          "id": 4764,
                           "nodeType": "Block",
-                          "src": "23233:194:5",
+                          "src": "23233:194:7",
                           "statements": [
                             {
                               "expression": {
@@ -36813,26 +36813,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3302,
+                                          "id": 4744,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3211,
-                                          "src": "23278:4:5",
+                                          "referencedDeclaration": 4653,
+                                          "src": "23278:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3303,
+                                        "id": 4745,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 747,
-                                        "src": "23278:15:5",
+                                        "referencedDeclaration": 2189,
+                                        "src": "23278:15:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -36840,25 +36840,25 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3304,
+                                        "id": 4746,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7814,
-                                        "src": "23295:4:5",
+                                        "referencedDeclaration": 11366,
+                                        "src": "23295:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         }
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3305,
+                                        "id": 4747,
                                         "name": "nextPeriodSum",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3279,
-                                        "src": "23301:13:5",
+                                        "referencedDeclaration": 4721,
+                                        "src": "23301:13:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -36872,7 +36872,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -36882,32 +36882,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3300,
+                                        "id": 4742,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "23259:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "23259:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3301,
+                                      "id": 4743,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7607,
-                                      "src": "23259:18:5",
+                                      "referencedDeclaration": 11153,
+                                      "src": "23259:18:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3306,
+                                    "id": 4748,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -36915,7 +36915,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "23259:56:5",
+                                    "src": "23259:56:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -36929,21 +36929,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3299,
+                                  "id": 4741,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "23251:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "23251:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3307,
+                                "id": 4749,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36951,20 +36951,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23251:65:5",
+                                "src": "23251:65:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3308,
+                              "id": 4750,
                               "nodeType": "ExpressionStatement",
-                              "src": "23251:65:5"
+                              "src": "23251:65:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3320,
+                                "id": 4762,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36975,26 +36975,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3309,
+                                      "id": 4751,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "23334:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "23334:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3311,
+                                    "id": 4753,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3310,
+                                      "id": 4752,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3202,
-                                      "src": "23340:6:5",
+                                      "referencedDeclaration": 4644,
+                                      "src": "23340:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -37005,21 +37005,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "23334:13:5",
+                                    "src": "23334:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3312,
+                                  "id": 4754,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "23334:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "23334:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37032,12 +37032,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3318,
+                                      "id": 4760,
                                       "name": "nextPeriodSum",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3279,
-                                      "src": "23398:13:5",
+                                      "referencedDeclaration": 4721,
+                                      "src": "23398:13:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -37057,26 +37057,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3313,
+                                          "id": 4755,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "23365:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "23365:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3315,
+                                        "id": 4757,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3314,
+                                          "id": 4756,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3202,
-                                          "src": "23371:6:5",
+                                          "referencedDeclaration": 4644,
+                                          "src": "23371:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -37087,41 +37087,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "23365:13:5",
+                                        "src": "23365:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3316,
+                                      "id": 4758,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "23365:28:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "23365:28:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3317,
+                                    "id": 4759,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "23365:32:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "23365:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3319,
+                                  "id": 4761,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -37129,21 +37129,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "23365:47:5",
+                                  "src": "23365:47:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "23334:78:5",
+                                "src": "23334:78:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3321,
+                              "id": 4763,
                               "nodeType": "ExpressionStatement",
-                              "src": "23334:78:5"
+                              "src": "23334:78:7"
                             }
                           ]
                         }
@@ -37155,14 +37155,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3345,
+                    "id": 4787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23659:4:5",
+                    "src": "23659:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -37170,15 +37170,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3206,
-                  "id": 3346,
+                  "functionReturnParameters": 4648,
+                  "id": 4788,
                   "nodeType": "Return",
-                  "src": "23652:11:5"
+                  "src": "23652:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3348,
+            "id": 4790,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -37186,16 +37186,16 @@
             "name": "ReserveNextPeriodFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3203,
+              "id": 4645,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3202,
+                  "id": 4644,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3348,
-                  "src": "22319:11:5",
+                  "scope": 4790,
+                  "src": "22319:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37203,10 +37203,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3201,
+                    "id": 4643,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22319:4:5",
+                    "src": "22319:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37216,20 +37216,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22318:13:5"
+              "src": "22318:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3206,
+              "id": 4648,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3205,
+                  "id": 4647,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3348,
-                  "src": "22350:4:5",
+                  "scope": 4790,
+                  "src": "22350:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37237,10 +37237,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3204,
+                    "id": 4646,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22350:4:5",
+                    "src": "22350:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37250,19 +37250,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22349:6:5"
+              "src": "22349:6:7"
             },
-            "scope": 3787,
-            "src": "22287:1383:5",
+            "scope": 5229,
+            "src": "22287:1383:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3385,
+              "id": 4827,
               "nodeType": "Block",
-              "src": "23742:217:5",
+              "src": "23742:217:7",
               "statements": [
                 {
                   "condition": {
@@ -37271,7 +37271,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3360,
+                    "id": 4802,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -37282,26 +37282,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3355,
+                          "id": 4797,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "23756:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "23756:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3357,
+                        "id": 4799,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3356,
+                          "id": 4798,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3350,
-                          "src": "23762:6:5",
+                          "referencedDeclaration": 4792,
+                          "src": "23762:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -37312,21 +37312,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23756:13:5",
+                        "src": "23756:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3358,
+                      "id": 4800,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "23756:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "23756:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -37337,14 +37337,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3359,
+                      "id": 4801,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "23788:1:5",
+                      "src": "23788:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -37352,20 +37352,20 @@
                       },
                       "value": "0"
                     },
-                    "src": "23756:33:5",
+                    "src": "23756:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3382,
+                  "id": 4824,
                   "nodeType": "IfStatement",
-                  "src": "23752:180:5",
+                  "src": "23752:180:7",
                   "trueBody": {
-                    "id": 3381,
+                    "id": 4823,
                     "nodeType": "Block",
-                    "src": "23791:141:5",
+                    "src": "23791:141:7",
                     "statements": [
                       {
                         "expression": {
@@ -37377,26 +37377,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3364,
+                                  "id": 4806,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23820:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23820:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3366,
+                                "id": 4808,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3365,
+                                  "id": 4807,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3350,
-                                  "src": "23826:6:5",
+                                  "referencedDeclaration": 4792,
+                                  "src": "23826:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37407,21 +37407,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23820:13:5",
+                                "src": "23820:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3367,
+                              "id": 4809,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "23820:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "23820:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -37433,26 +37433,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3368,
+                                  "id": 4810,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23846:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23846:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3370,
+                                "id": 4812,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3369,
+                                  "id": 4811,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3350,
-                                  "src": "23852:6:5",
+                                  "referencedDeclaration": 4792,
+                                  "src": "23852:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37463,21 +37463,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23846:13:5",
+                                "src": "23846:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3371,
+                              "id": 4813,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 765,
-                              "src": "23846:28:5",
+                              "referencedDeclaration": 2207,
+                              "src": "23846:28:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -37497,32 +37497,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3361,
+                              "id": 4803,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 873,
-                              "src": "23805:5:5",
+                              "referencedDeclaration": 2315,
+                              "src": "23805:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_SNM_$5514",
+                                "typeIdentifier": "t_contract$_SNM_$10080",
                                 "typeString": "contract SNM"
                               }
                             },
-                            "id": 3363,
+                            "id": 4805,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "transfer",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7419,
-                            "src": "23805:14:5",
+                            "referencedDeclaration": 10965,
+                            "src": "23805:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                               "typeString": "function (address,uint256) external returns (bool)"
                             }
                           },
-                          "id": 3372,
+                          "id": 4814,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -37530,20 +37530,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23805:70:5",
+                          "src": "23805:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3373,
+                        "id": 4815,
                         "nodeType": "ExpressionStatement",
-                        "src": "23805:70:5"
+                        "src": "23805:70:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3379,
+                          "id": 4821,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -37554,26 +37554,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3374,
+                                "id": 4816,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "23889:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "23889:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3376,
+                              "id": 4818,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3375,
+                                "id": 4817,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3350,
-                                "src": "23895:6:5",
+                                "referencedDeclaration": 4792,
+                                "src": "23895:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -37584,21 +37584,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "23889:13:5",
+                              "src": "23889:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3377,
+                            "id": 4819,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "blockedBalance",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 765,
-                            "src": "23889:28:5",
+                            "referencedDeclaration": 2207,
+                            "src": "23889:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -37609,14 +37609,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3378,
+                            "id": 4820,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "23920:1:5",
+                            "src": "23920:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -37624,15 +37624,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "23889:32:5",
+                          "src": "23889:32:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3380,
+                        "id": 4822,
                         "nodeType": "ExpressionStatement",
-                        "src": "23889:32:5"
+                        "src": "23889:32:7"
                       }
                     ]
                   }
@@ -37641,14 +37641,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3383,
+                    "id": 4825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23948:4:5",
+                    "src": "23948:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -37656,15 +37656,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3354,
-                  "id": 3384,
+                  "functionReturnParameters": 4796,
+                  "id": 4826,
                   "nodeType": "Return",
-                  "src": "23941:11:5"
+                  "src": "23941:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3386,
+            "id": 4828,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -37672,16 +37672,16 @@
             "name": "RefundRemainingFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3351,
+              "id": 4793,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3350,
+                  "id": 4792,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3386,
-                  "src": "23706:11:5",
+                  "scope": 4828,
+                  "src": "23706:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37689,10 +37689,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3349,
+                    "id": 4791,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23706:4:5",
+                    "src": "23706:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37702,20 +37702,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23705:13:5"
+              "src": "23705:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3354,
+              "id": 4796,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3353,
+                  "id": 4795,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3386,
-                  "src": "23737:4:5",
+                  "scope": 4828,
+                  "src": "23737:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37723,10 +37723,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3352,
+                    "id": 4794,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23737:4:5",
+                    "src": "23737:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37736,19 +37736,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23736:6:5"
+              "src": "23736:6:7"
             },
-            "scope": 3787,
-            "src": "23676:283:5",
+            "scope": 5229,
+            "src": "23676:283:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3400,
+              "id": 4842,
               "nodeType": "Block",
-              "src": "24022:51:5",
+              "src": "24022:51:7",
               "statements": [
                 {
                   "expression": {
@@ -37757,7 +37757,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3398,
+                    "id": 4840,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -37768,26 +37768,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3393,
+                          "id": 4835,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "24039:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "24039:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3395,
+                        "id": 4837,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3394,
+                          "id": 4836,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3388,
-                          "src": "24045:6:5",
+                          "referencedDeclaration": 4830,
+                          "src": "24045:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -37798,21 +37798,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24039:13:5",
+                        "src": "24039:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3396,
+                      "id": 4838,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 755,
-                      "src": "24039:22:5",
+                      "referencedDeclaration": 2197,
+                      "src": "24039:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -37823,14 +37823,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3397,
+                      "id": 4839,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "24065:1:5",
+                      "src": "24065:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -37838,21 +37838,21 @@
                       },
                       "value": "0"
                     },
-                    "src": "24039:27:5",
+                    "src": "24039:27:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 3392,
-                  "id": 3399,
+                  "functionReturnParameters": 4834,
+                  "id": 4841,
                   "nodeType": "Return",
-                  "src": "24032:34:5"
+                  "src": "24032:34:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3401,
+            "id": 4843,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -37860,16 +37860,16 @@
             "name": "IsSpot",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3389,
+              "id": 4831,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3388,
+                  "id": 4830,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3401,
-                  "src": "23981:11:5",
+                  "scope": 4843,
+                  "src": "23981:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37877,10 +37877,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3387,
+                    "id": 4829,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23981:4:5",
+                    "src": "23981:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37890,20 +37890,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23980:13:5"
+              "src": "23980:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3392,
+              "id": 4834,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3391,
+                  "id": 4833,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3401,
-                  "src": "24017:4:5",
+                  "scope": 4843,
+                  "src": "24017:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37911,10 +37911,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3390,
+                    "id": 4832,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24017:4:5",
+                    "src": "24017:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37924,32 +37924,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24016:6:5"
+              "src": "24016:6:7"
             },
-            "scope": 3787,
-            "src": "23965:108:5",
+            "scope": 5229,
+            "src": "23965:108:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3427,
+              "id": 4869,
               "nodeType": "Block",
-              "src": "24161:109:5",
+              "src": "24161:109:7",
               "statements": [
                 {
                   "assignments": [
-                    3411
+                    4853
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3411,
+                      "id": 4853,
                       "name": "rate",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3428,
-                      "src": "24171:9:5",
+                      "scope": 4870,
+                      "src": "24171:9:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -37957,10 +37957,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3410,
+                        "id": 4852,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "24171:4:5",
+                        "src": "24171:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -37970,7 +37970,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3415,
+                  "id": 4857,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [],
@@ -37978,32 +37978,32 @@
                       "argumentTypes": [],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3412,
+                        "id": 4854,
                         "name": "oracle",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 877,
-                        "src": "24183:6:5",
+                        "referencedDeclaration": 2319,
+                        "src": "24183:6:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                          "typeIdentifier": "t_contract$_OracleUSD_$8677",
                           "typeString": "contract OracleUSD"
                         }
                       },
-                      "id": 3413,
+                      "id": 4855,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "getCurrentPrice",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 4902,
-                      "src": "24183:22:5",
+                      "referencedDeclaration": 8676,
+                      "src": "24183:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                         "typeString": "function () view external returns (uint256)"
                       }
                     },
-                    "id": 3414,
+                    "id": 4856,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38011,14 +38011,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24183:24:5",
+                    "src": "24183:24:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "24171:36:5"
+                  "src": "24171:36:7"
                 },
                 {
                   "expression": {
@@ -38027,14 +38027,14 @@
                       {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 3424,
+                        "id": 4866,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "24258:4:5",
+                        "src": "24258:4:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -38055,12 +38055,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 3421,
+                            "id": 4863,
                             "name": "_period",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3405,
-                            "src": "24245:7:5",
+                            "referencedDeclaration": 4847,
+                            "src": "24245:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -38079,12 +38079,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3418,
+                                "id": 4860,
                                 "name": "_price",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3403,
-                                "src": "24233:6:5",
+                                "referencedDeclaration": 4845,
+                                "src": "24233:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -38100,32 +38100,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3416,
+                                "id": 4858,
                                 "name": "rate",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3411,
-                                "src": "24224:4:5",
+                                "referencedDeclaration": 4853,
+                                "src": "24224:4:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3417,
+                              "id": 4859,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "mul",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7191,
-                              "src": "24224:8:5",
+                              "referencedDeclaration": 10737,
+                              "src": "24224:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3419,
+                            "id": 4861,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38133,27 +38133,27 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24224:16:5",
+                            "src": "24224:16:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3420,
+                          "id": 4862,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "mul",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7191,
-                          "src": "24224:20:5",
+                          "referencedDeclaration": 10737,
+                          "src": "24224:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 3422,
+                        "id": 4864,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -38161,27 +38161,27 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "24224:29:5",
+                        "src": "24224:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "id": 3423,
+                      "id": 4865,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "div",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7205,
-                      "src": "24224:33:5",
+                      "referencedDeclaration": 10751,
+                      "src": "24224:33:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                         "typeString": "function (uint256,uint256) pure returns (uint256)"
                       }
                     },
-                    "id": 3425,
+                    "id": 4867,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38189,21 +38189,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24224:39:5",
+                    "src": "24224:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 3409,
-                  "id": 3426,
+                  "functionReturnParameters": 4851,
+                  "id": 4868,
                   "nodeType": "Return",
-                  "src": "24217:46:5"
+                  "src": "24217:46:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3428,
+            "id": 4870,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -38211,16 +38211,16 @@
             "name": "CalculatePayment",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3406,
+              "id": 4848,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3403,
+                  "id": 4845,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24105:11:5",
+                  "scope": 4870,
+                  "src": "24105:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38228,10 +38228,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3402,
+                    "id": 4844,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24105:4:5",
+                    "src": "24105:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38242,11 +38242,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3405,
+                  "id": 4847,
                   "name": "_period",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24118:12:5",
+                  "scope": 4870,
+                  "src": "24118:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38254,10 +38254,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3404,
+                    "id": 4846,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24118:4:5",
+                    "src": "24118:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38267,20 +38267,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24104:27:5"
+              "src": "24104:27:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3409,
+              "id": 4851,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3408,
+                  "id": 4850,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24155:4:5",
+                  "scope": 4870,
+                  "src": "24155:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38288,10 +38288,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3407,
+                    "id": 4849,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24155:4:5",
+                    "src": "24155:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38301,19 +38301,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24154:6:5"
+              "src": "24154:6:7"
             },
-            "scope": 3787,
-            "src": "24079:191:5",
+            "scope": 5229,
+            "src": "24079:191:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3488,
+              "id": 4930,
               "nodeType": "Block",
-              "src": "24344:418:5",
+              "src": "24344:418:7",
               "statements": [
                 {
                   "expression": {
@@ -38325,7 +38325,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3447,
+                        "id": 4889,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -38336,7 +38336,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3442,
+                          "id": 4884,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -38345,18 +38345,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3436,
+                              "id": 4878,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "24401:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "24401:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3437,
+                            "id": 4879,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38364,7 +38364,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24401:10:5",
+                            "src": "24401:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -38378,26 +38378,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3438,
+                                "id": 4880,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "24415:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "24415:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3440,
+                              "id": 4882,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3439,
+                                "id": 4881,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3430,
-                                "src": "24421:6:5",
+                                "referencedDeclaration": 4872,
+                                "src": "24421:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -38408,27 +38408,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "24415:13:5",
+                              "src": "24415:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3441,
+                            "id": 4883,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "24415:24:5",
+                            "referencedDeclaration": 2189,
+                            "src": "24415:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "24401:38:5",
+                          "src": "24401:38:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -38439,24 +38439,24 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                            "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                             "typeString": "enum Market.BlacklistPerson"
                           },
-                          "id": 3446,
+                          "id": 4888,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 3443,
+                            "id": 4885,
                             "name": "role",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3432,
-                            "src": "24443:4:5",
+                            "referencedDeclaration": 4874,
+                            "src": "24443:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
@@ -38466,18 +38466,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3444,
+                              "id": 4886,
                               "name": "BlacklistPerson",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 740,
-                              "src": "24451:15:5",
+                              "referencedDeclaration": 2182,
+                              "src": "24451:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                                 "typeString": "type(enum Market.BlacklistPerson)"
                               }
                             },
-                            "id": 3445,
+                            "id": 4887,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -38485,19 +38485,19 @@
                             "memberName": "BLACKLIST_NOBODY",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24451:32:5",
+                            "src": "24451:32:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
-                          "src": "24443:40:5",
+                          "src": "24443:40:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "24401:82:5",
+                        "src": "24401:82:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -38511,21 +38511,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3435,
+                      "id": 4877,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24393:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24393:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3448,
+                    "id": 4890,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38533,38 +38533,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24393:91:5",
+                    "src": "24393:91:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3449,
+                  "id": 4891,
                   "nodeType": "ExpressionStatement",
-                  "src": "24393:91:5"
+                  "src": "24393:91:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     },
-                    "id": 3453,
+                    "id": 4895,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3450,
+                      "id": 4892,
                       "name": "role",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3432,
-                      "src": "24498:4:5",
+                      "referencedDeclaration": 4874,
+                      "src": "24498:4:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
@@ -38574,18 +38574,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3451,
+                        "id": 4893,
                         "name": "BlacklistPerson",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 740,
-                        "src": "24506:15:5",
+                        "referencedDeclaration": 2182,
+                        "src": "24506:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                           "typeString": "type(enum Market.BlacklistPerson)"
                         }
                       },
-                      "id": 3452,
+                      "id": 4894,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -38593,13 +38593,13 @@
                       "memberName": "BLACKLIST_WORKER",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24506:32:5",
+                      "src": "24506:32:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
-                    "src": "24498:40:5",
+                    "src": "24498:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -38609,24 +38609,24 @@
                     "condition": {
                       "argumentTypes": null,
                       "commonType": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       },
-                      "id": 3471,
+                      "id": 4913,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 3468,
+                        "id": 4910,
                         "name": "role",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3432,
-                        "src": "24633:4:5",
+                        "referencedDeclaration": 4874,
+                        "src": "24633:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
@@ -38636,18 +38636,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3469,
+                          "id": 4911,
                           "name": "BlacklistPerson",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 740,
-                          "src": "24641:15:5",
+                          "referencedDeclaration": 2182,
+                          "src": "24641:15:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                             "typeString": "type(enum Market.BlacklistPerson)"
                           }
                         },
-                        "id": 3470,
+                        "id": 4912,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -38655,26 +38655,26 @@
                         "memberName": "BLACKLIST_MASTER",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "24641:32:5",
+                        "src": "24641:32:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
-                      "src": "24633:40:5",
+                      "src": "24633:40:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 3486,
+                    "id": 4928,
                     "nodeType": "IfStatement",
-                    "src": "24629:127:5",
+                    "src": "24629:127:7",
                     "trueBody": {
-                      "id": 3485,
+                      "id": 4927,
                       "nodeType": "Block",
-                      "src": "24675:81:5",
+                      "src": "24675:81:7",
                       "statements": [
                         {
                           "expression": {
@@ -38686,26 +38686,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3475,
+                                    "id": 4917,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "24696:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "24696:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3477,
+                                  "id": 4919,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3476,
+                                    "id": 4918,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3430,
-                                    "src": "24702:6:5",
+                                    "referencedDeclaration": 4872,
+                                    "src": "24702:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -38716,21 +38716,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24696:13:5",
+                                  "src": "24696:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3478,
+                                "id": 4920,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "24696:24:5",
+                                "referencedDeclaration": 2189,
+                                "src": "24696:24:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -38742,26 +38742,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3479,
+                                    "id": 4921,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "24722:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "24722:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3481,
+                                  "id": 4923,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3480,
+                                    "id": 4922,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3430,
-                                    "src": "24728:6:5",
+                                    "referencedDeclaration": 4872,
+                                    "src": "24728:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -38772,21 +38772,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24722:13:5",
+                                  "src": "24722:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3482,
+                                "id": 4924,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "masterID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 749,
-                                "src": "24722:22:5",
+                                "referencedDeclaration": 2191,
+                                "src": "24722:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -38806,32 +38806,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3472,
+                                "id": 4914,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "24689:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "24689:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 3474,
+                              "id": 4916,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 487,
-                              "src": "24689:6:5",
+                              "referencedDeclaration": 1056,
+                              "src": "24689:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) external returns (bool)"
                               }
                             },
-                            "id": 3483,
+                            "id": 4925,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38839,26 +38839,26 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24689:56:5",
+                            "src": "24689:56:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "id": 3484,
+                          "id": 4926,
                           "nodeType": "ExpressionStatement",
-                          "src": "24689:56:5"
+                          "src": "24689:56:7"
                         }
                       ]
                     }
                   },
-                  "id": 3487,
+                  "id": 4929,
                   "nodeType": "IfStatement",
-                  "src": "24494:262:5",
+                  "src": "24494:262:7",
                   "trueBody": {
-                    "id": 3467,
+                    "id": 4909,
                     "nodeType": "Block",
-                    "src": "24540:83:5",
+                    "src": "24540:83:7",
                     "statements": [
                       {
                         "expression": {
@@ -38870,26 +38870,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3457,
+                                  "id": 4899,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24561:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24561:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3459,
+                                "id": 4901,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3458,
+                                  "id": 4900,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3430,
-                                  "src": "24567:6:5",
+                                  "referencedDeclaration": 4872,
+                                  "src": "24567:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -38900,21 +38900,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24561:13:5",
+                                "src": "24561:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3460,
+                              "id": 4902,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "24561:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "24561:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -38926,26 +38926,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3461,
+                                  "id": 4903,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24587:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24587:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3463,
+                                "id": 4905,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3462,
+                                  "id": 4904,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3430,
-                                  "src": "24593:6:5",
+                                  "referencedDeclaration": 4872,
+                                  "src": "24593:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -38956,21 +38956,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24587:13:5",
+                                "src": "24587:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3464,
+                              "id": 4906,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "24587:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "24587:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -38990,32 +38990,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3454,
+                              "id": 4896,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 875,
-                              "src": "24554:2:5",
+                              "referencedDeclaration": 2317,
+                              "src": "24554:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$592",
+                                "typeIdentifier": "t_contract$_Blacklist_$1161",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 3456,
+                            "id": 4898,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 487,
-                            "src": "24554:6:5",
+                            "referencedDeclaration": 1056,
+                            "src": "24554:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) external returns (bool)"
                             }
                           },
-                          "id": 3465,
+                          "id": 4907,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39023,15 +39023,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "24554:58:5",
+                          "src": "24554:58:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3466,
+                        "id": 4908,
                         "nodeType": "ExpressionStatement",
-                        "src": "24554:58:5"
+                        "src": "24554:58:7"
                       }
                     ]
                   }
@@ -39039,7 +39039,7 @@
               ]
             },
             "documentation": null,
-            "id": 3489,
+            "id": 4931,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -39047,16 +39047,16 @@
             "name": "AddToBlacklist",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3433,
+              "id": 4875,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3430,
+                  "id": 4872,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3489,
-                  "src": "24300:11:5",
+                  "scope": 4931,
+                  "src": "24300:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -39064,10 +39064,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3429,
+                    "id": 4871,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24300:4:5",
+                    "src": "24300:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -39078,26 +39078,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 3432,
+                  "id": 4874,
                   "name": "role",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3489,
-                  "src": "24313:20:5",
+                  "scope": 4931,
+                  "src": "24313:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 3431,
+                    "id": 4873,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 740,
-                    "src": "24313:15:5",
+                    "referencedDeclaration": 2182,
+                    "src": "24313:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -39105,35 +39105,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24299:35:5"
+              "src": "24299:35:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3434,
+              "id": 4876,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24344:0:5"
+              "src": "24344:0:7"
             },
-            "scope": 3787,
-            "src": "24276:486:5",
+            "scope": 5229,
+            "src": "24276:486:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3561,
+              "id": 5003,
               "nodeType": "Block",
-              "src": "24817:451:5",
+              "src": "24817:451:7",
               "statements": [
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     },
-                    "id": 3500,
+                    "id": 4942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39144,26 +39144,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3494,
+                          "id": 4936,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "24831:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "24831:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3496,
+                        "id": 4938,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3495,
+                          "id": 4937,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "24837:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "24837:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39174,23 +39174,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24831:13:5",
+                        "src": "24831:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3497,
+                      "id": 4939,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 763,
-                      "src": "24831:20:5",
+                      "referencedDeclaration": 2205,
+                      "src": "24831:20:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -39200,18 +39200,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3498,
+                        "id": 4940,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 722,
-                        "src": "24855:10:5",
+                        "referencedDeclaration": 2164,
+                        "src": "24855:10:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 3499,
+                      "id": 4941,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -39219,33 +39219,33 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24855:24:5",
+                      "src": "24855:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "24831:48:5",
+                    "src": "24831:48:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3503,
+                  "id": 4945,
                   "nodeType": "IfStatement",
-                  "src": "24827:85:5",
+                  "src": "24827:85:7",
                   "trueBody": {
-                    "id": 3502,
+                    "id": 4944,
                     "nodeType": "Block",
-                    "src": "24881:31:5",
+                    "src": "24881:31:7",
                     "statements": [
                       {
                         "expression": null,
-                        "functionReturnParameters": 3493,
-                        "id": 3501,
+                        "functionReturnParameters": 4935,
+                        "id": 4943,
                         "nodeType": "Return",
-                        "src": "24895:7:5"
+                        "src": "24895:7:7"
                       }
                     ]
                   }
@@ -39260,10 +39260,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 3511,
+                            "id": 4953,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39274,26 +39274,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3505,
+                                  "id": 4947,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24930:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24930:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3507,
+                                "id": 4949,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3506,
+                                  "id": 4948,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "24936:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "24936:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39304,23 +39304,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24930:13:5",
+                                "src": "24930:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3508,
+                              "id": 4950,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 763,
-                              "src": "24930:20:5",
+                              "referencedDeclaration": 2205,
+                              "src": "24930:20:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -39330,18 +39330,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3509,
+                                "id": 4951,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 722,
-                                "src": "24954:10:5",
+                                "referencedDeclaration": 2164,
+                                "src": "24954:10:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 3510,
+                              "id": 4952,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -39349,27 +39349,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "24954:26:5",
+                              "src": "24954:26:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "24930:50:5",
+                            "src": "24930:50:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 3512,
+                        "id": 4954,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "24929:52:5",
+                        "src": "24929:52:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -39383,21 +39383,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3504,
+                      "id": 4946,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24921:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24921:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3513,
+                    "id": 4955,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39405,15 +39405,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24921:61:5",
+                    "src": "24921:61:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3514,
+                  "id": 4956,
                   "nodeType": "ExpressionStatement",
-                  "src": "24921:61:5"
+                  "src": "24921:61:7"
                 },
                 {
                   "expression": {
@@ -39425,7 +39425,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3538,
+                        "id": 4980,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -39436,7 +39436,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3530,
+                          "id": 4972,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39447,7 +39447,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3522,
+                            "id": 4964,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39456,18 +39456,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3516,
+                                "id": 4958,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "25000:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "25000:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3517,
+                              "id": 4959,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -39475,7 +39475,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25000:10:5",
+                              "src": "25000:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -39489,26 +39489,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3518,
+                                  "id": 4960,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "25014:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "25014:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3520,
+                                "id": 4962,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3519,
+                                  "id": 4961,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "25020:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "25020:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39519,27 +39519,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25014:13:5",
+                                "src": "25014:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3521,
+                              "id": 4963,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "25014:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "25014:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25000:38:5",
+                            "src": "25000:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -39553,7 +39553,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3529,
+                            "id": 4971,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39562,18 +39562,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3523,
+                                "id": 4965,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "25042:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "25042:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3524,
+                              "id": 4966,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -39581,7 +39581,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25042:10:5",
+                              "src": "25042:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -39595,26 +39595,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3525,
+                                  "id": 4967,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "25056:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "25056:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3527,
+                                "id": 4969,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3526,
+                                  "id": 4968,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "25062:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "25062:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39625,33 +39625,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25056:13:5",
+                                "src": "25056:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3528,
+                              "id": 4970,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "25056:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "25056:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25042:38:5",
+                            "src": "25042:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25000:80:5",
+                          "src": "25000:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -39665,7 +39665,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3537,
+                          "id": 4979,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39674,18 +39674,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3531,
+                              "id": 4973,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "25084:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "25084:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3532,
+                            "id": 4974,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39693,7 +39693,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "25084:10:5",
+                            "src": "25084:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -39707,26 +39707,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3533,
+                                "id": 4975,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "25098:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "25098:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3535,
+                              "id": 4977,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3534,
+                                "id": 4976,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3491,
-                                "src": "25104:6:5",
+                                "referencedDeclaration": 4933,
+                                "src": "25104:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -39737,33 +39737,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "25098:13:5",
+                              "src": "25098:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3536,
+                            "id": 4978,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "25098:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "25098:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "25084:36:5",
+                          "src": "25084:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "25000:120:5",
+                        "src": "25000:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -39777,21 +39777,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3515,
+                      "id": 4957,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24992:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24992:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3539,
+                    "id": 4981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39799,20 +39799,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24992:129:5",
+                    "src": "24992:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3540,
+                  "id": 4982,
                   "nodeType": "ExpressionStatement",
-                  "src": "24992:129:5"
+                  "src": "24992:129:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3547,
+                    "id": 4989,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39823,26 +39823,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3541,
+                          "id": 4983,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "25131:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "25131:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3543,
+                        "id": 4985,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3542,
+                          "id": 4984,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "25137:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "25137:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39853,23 +39853,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25131:13:5",
+                        "src": "25131:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3544,
+                      "id": 4986,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 763,
-                      "src": "25131:20:5",
+                      "referencedDeclaration": 2205,
+                      "src": "25131:20:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -39879,18 +39879,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3545,
+                        "id": 4987,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 722,
-                        "src": "25154:10:5",
+                        "referencedDeclaration": 2164,
+                        "src": "25154:10:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 3546,
+                      "id": 4988,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -39898,26 +39898,26 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25154:24:5",
+                      "src": "25154:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "25131:47:5",
+                    "src": "25131:47:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
-                  "id": 3548,
+                  "id": 4990,
                   "nodeType": "ExpressionStatement",
-                  "src": "25131:47:5"
+                  "src": "25131:47:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3555,
+                    "id": 4997,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39928,26 +39928,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3549,
+                          "id": 4991,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "25188:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "25188:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3551,
+                        "id": 4993,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3550,
+                          "id": 4992,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "25194:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "25194:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39958,21 +39958,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25188:13:5",
+                        "src": "25188:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3552,
+                      "id": 4994,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 761,
-                      "src": "25188:21:5",
+                      "referencedDeclaration": 2203,
+                      "src": "25188:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -39984,18 +39984,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3553,
+                        "id": 4995,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "25212:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "25212:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3554,
+                      "id": 4996,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40003,21 +40003,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25212:15:5",
+                      "src": "25212:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25188:39:5",
+                    "src": "25188:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3556,
+                  "id": 4998,
                   "nodeType": "ExpressionStatement",
-                  "src": "25188:39:5"
+                  "src": "25188:39:7"
                 },
                 {
                   "eventCall": {
@@ -40025,12 +40025,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3558,
+                        "id": 5000,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3491,
-                        "src": "25254:6:5",
+                        "referencedDeclaration": 4933,
+                        "src": "25254:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40044,18 +40044,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3557,
+                      "id": 4999,
                       "name": "DealUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 826,
-                      "src": "25242:11:5",
+                      "referencedDeclaration": 2268,
+                      "src": "25242:11:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3559,
+                    "id": 5001,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40063,20 +40063,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25242:19:5",
+                    "src": "25242:19:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3560,
+                  "id": 5002,
                   "nodeType": "EmitStatement",
-                  "src": "25237:24:5"
+                  "src": "25237:24:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3562,
+            "id": 5004,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -40084,16 +40084,16 @@
             "name": "InternalCloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3492,
+              "id": 4934,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3491,
+                  "id": 4933,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3562,
-                  "src": "24795:11:5",
+                  "scope": 5004,
+                  "src": "24795:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40101,10 +40101,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3490,
+                    "id": 4932,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24795:4:5",
+                    "src": "24795:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -40114,39 +40114,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24794:13:5"
+              "src": "24794:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3493,
+              "id": 4935,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24817:0:5"
+              "src": "24817:0:7"
             },
-            "scope": 3787,
-            "src": "24768:500:5",
+            "scope": 5229,
+            "src": "24768:500:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3604,
+              "id": 5046,
               "nodeType": "Block",
-              "src": "25355:215:5",
+              "src": "25355:215:7",
               "statements": [
                 {
                   "assignments": [
-                    3574
+                    5016
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3574,
+                      "id": 5016,
                       "name": "benchmarks",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3605,
-                      "src": "25365:26:5",
+                      "scope": 5047,
+                      "src": "25365:26:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -40155,19 +40155,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3572,
+                          "id": 5014,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25365:6:5",
+                          "src": "25365:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3573,
+                        "id": 5015,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25365:8:5",
+                        "src": "25365:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
@@ -40177,18 +40177,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3580,
+                  "id": 5022,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3578,
+                        "id": 5020,
                         "name": "benchmarksQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 890,
-                        "src": "25407:18:5",
+                        "referencedDeclaration": 2332,
+                        "src": "25407:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40202,39 +40202,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3577,
+                      "id": 5019,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25394:12:5",
+                      "src": "25394:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint64_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint64[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3575,
+                          "id": 5017,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25398:6:5",
+                          "src": "25398:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3576,
+                        "id": 5018,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25398:8:5",
+                        "src": "25398:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
                         }
                       }
                     },
-                    "id": 3579,
+                    "id": 5021,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40242,25 +40242,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25394:32:5",
+                    "src": "25394:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                       "typeString": "uint64[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25365:61:5"
+                  "src": "25365:61:7"
                 },
                 {
                   "body": {
-                    "id": 3600,
+                    "id": 5042,
                     "nodeType": "Block",
-                    "src": "25482:55:5",
+                    "src": "25482:55:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3598,
+                          "id": 5040,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -40269,26 +40269,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3592,
+                              "id": 5034,
                               "name": "benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3574,
-                              "src": "25496:10:5",
+                              "referencedDeclaration": 5016,
+                              "src": "25496:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 3594,
+                            "id": 5036,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3593,
+                              "id": 5035,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3582,
-                              "src": "25507:1:5",
+                              "referencedDeclaration": 5024,
+                              "src": "25507:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40299,7 +40299,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25496:13:5",
+                            "src": "25496:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
@@ -40311,26 +40311,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3595,
+                              "id": 5037,
                               "name": "_benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3565,
-                              "src": "25512:11:5",
+                              "referencedDeclaration": 5007,
+                              "src": "25512:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 3597,
+                            "id": 5039,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3596,
+                              "id": 5038,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3582,
-                              "src": "25524:1:5",
+                              "referencedDeclaration": 5024,
+                              "src": "25524:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40341,21 +40341,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25512:14:5",
+                            "src": "25512:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
                             }
                           },
-                          "src": "25496:30:5",
+                          "src": "25496:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3599,
+                        "id": 5041,
                         "nodeType": "ExpressionStatement",
-                        "src": "25496:30:5"
+                        "src": "25496:30:7"
                       }
                     ]
                   },
@@ -40365,19 +40365,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3588,
+                    "id": 5030,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3585,
+                      "id": 5027,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3582,
-                      "src": "25453:1:5",
+                      "referencedDeclaration": 5024,
+                      "src": "25453:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -40389,18 +40389,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3586,
+                        "id": 5028,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3565,
-                        "src": "25457:11:5",
+                        "referencedDeclaration": 5007,
+                        "src": "25457:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3587,
+                      "id": 5029,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40408,31 +40408,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25457:18:5",
+                      "src": "25457:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25453:22:5",
+                    "src": "25453:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3601,
+                  "id": 5043,
                   "initializationExpression": {
                     "assignments": [
-                      3582
+                      5024
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 3582,
+                        "id": 5024,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 3605,
-                        "src": "25441:6:5",
+                        "scope": 5047,
+                        "src": "25441:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -40440,10 +40440,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 3581,
+                          "id": 5023,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25441:4:5",
+                          "src": "25441:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -40453,18 +40453,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 3584,
+                    "id": 5026,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3583,
+                      "id": 5025,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25450:1:5",
+                      "src": "25450:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -40473,12 +40473,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25441:10:5"
+                    "src": "25441:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3590,
+                      "id": 5032,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40486,15 +40486,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25477:3:5",
+                      "src": "25477:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3589,
+                        "id": 5031,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3582,
-                        "src": "25477:1:5",
+                        "referencedDeclaration": 5024,
+                        "src": "25477:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40505,36 +40505,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3591,
+                    "id": 5033,
                     "nodeType": "ExpressionStatement",
-                    "src": "25477:3:5"
+                    "src": "25477:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25436:101:5"
+                  "src": "25436:101:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3602,
+                    "id": 5044,
                     "name": "benchmarks",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3574,
-                    "src": "25553:10:5",
+                    "referencedDeclaration": 5016,
+                    "src": "25553:10:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                       "typeString": "uint64[] memory"
                     }
                   },
-                  "functionReturnParameters": 3570,
-                  "id": 3603,
+                  "functionReturnParameters": 5012,
+                  "id": 5045,
                   "nodeType": "Return",
-                  "src": "25546:17:5"
+                  "src": "25546:17:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3605,
+            "id": 5047,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -40542,16 +40542,16 @@
             "name": "ResizeBenchmarks",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3566,
+              "id": 5008,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3565,
+                  "id": 5007,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3605,
-                  "src": "25300:20:5",
+                  "scope": 5047,
+                  "src": "25300:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40560,19 +40560,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3563,
+                      "id": 5005,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25300:6:5",
+                      "src": "25300:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 3564,
+                    "id": 5006,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25300:8:5",
+                    "src": "25300:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -40582,20 +40582,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25299:22:5"
+              "src": "25299:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3570,
+              "id": 5012,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3569,
+                  "id": 5011,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3605,
-                  "src": "25345:8:5",
+                  "scope": 5047,
+                  "src": "25345:8:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40604,19 +40604,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3567,
+                      "id": 5009,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25345:6:5",
+                      "src": "25345:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 3568,
+                    "id": 5010,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25345:8:5",
+                    "src": "25345:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -40626,32 +40626,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25344:10:5"
+              "src": "25344:10:7"
             },
-            "scope": 3787,
-            "src": "25274:296:5",
+            "scope": 5229,
+            "src": "25274:296:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3647,
+              "id": 5089,
               "nodeType": "Block",
-              "src": "25649:199:5",
+              "src": "25649:199:7",
               "statements": [
                 {
                   "assignments": [
-                    3617
+                    5059
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3617,
+                      "id": 5059,
                       "name": "netflags",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3648,
-                      "src": "25659:22:5",
+                      "scope": 5090,
+                      "src": "25659:22:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -40660,19 +40660,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3615,
+                          "id": 5057,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25659:4:5",
+                          "src": "25659:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3616,
+                        "id": 5058,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25659:6:5",
+                        "src": "25659:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
@@ -40682,18 +40682,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3623,
+                  "id": 5065,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3621,
+                        "id": 5063,
                         "name": "netflagsQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 892,
-                        "src": "25695:16:5",
+                        "referencedDeclaration": 2334,
+                        "src": "25695:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40707,39 +40707,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3620,
+                      "id": 5062,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25684:10:5",
+                      "src": "25684:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (bool[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3618,
+                          "id": 5060,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25688:4:5",
+                          "src": "25688:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3619,
+                        "id": 5061,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25688:6:5",
+                        "src": "25688:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
                         }
                       }
                     },
-                    "id": 3622,
+                    "id": 5064,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40747,25 +40747,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25684:28:5",
+                    "src": "25684:28:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                       "typeString": "bool[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25659:53:5"
+                  "src": "25659:53:7"
                 },
                 {
                   "body": {
-                    "id": 3643,
+                    "id": 5085,
                     "nodeType": "Block",
-                    "src": "25766:51:5",
+                    "src": "25766:51:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3641,
+                          "id": 5083,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -40774,26 +40774,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3635,
+                              "id": 5077,
                               "name": "netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3617,
-                              "src": "25780:8:5",
+                              "referencedDeclaration": 5059,
+                              "src": "25780:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 3637,
+                            "id": 5079,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3636,
+                              "id": 5078,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3625,
-                              "src": "25789:1:5",
+                              "referencedDeclaration": 5067,
+                              "src": "25789:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40804,7 +40804,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25780:11:5",
+                            "src": "25780:11:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -40816,26 +40816,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3638,
+                              "id": 5080,
                               "name": "_netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3608,
-                              "src": "25794:9:5",
+                              "referencedDeclaration": 5050,
+                              "src": "25794:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 3640,
+                            "id": 5082,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3639,
+                              "id": 5081,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3625,
-                              "src": "25804:1:5",
+                              "referencedDeclaration": 5067,
+                              "src": "25804:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40846,21 +40846,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25794:12:5",
+                            "src": "25794:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25780:26:5",
+                          "src": "25780:26:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3642,
+                        "id": 5084,
                         "nodeType": "ExpressionStatement",
-                        "src": "25780:26:5"
+                        "src": "25780:26:7"
                       }
                     ]
                   },
@@ -40870,19 +40870,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3631,
+                    "id": 5073,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3628,
+                      "id": 5070,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3625,
-                      "src": "25739:1:5",
+                      "referencedDeclaration": 5067,
+                      "src": "25739:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -40894,18 +40894,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3629,
+                        "id": 5071,
                         "name": "_netflags",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3608,
-                        "src": "25743:9:5",
+                        "referencedDeclaration": 5050,
+                        "src": "25743:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 3630,
+                      "id": 5072,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40913,31 +40913,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25743:16:5",
+                      "src": "25743:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25739:20:5",
+                    "src": "25739:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3644,
+                  "id": 5086,
                   "initializationExpression": {
                     "assignments": [
-                      3625
+                      5067
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 3625,
+                        "id": 5067,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 3648,
-                        "src": "25727:6:5",
+                        "scope": 5090,
+                        "src": "25727:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -40945,10 +40945,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 3624,
+                          "id": 5066,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25727:4:5",
+                          "src": "25727:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -40958,18 +40958,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 3627,
+                    "id": 5069,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3626,
+                      "id": 5068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25736:1:5",
+                      "src": "25736:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -40978,12 +40978,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25727:10:5"
+                    "src": "25727:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3633,
+                      "id": 5075,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40991,15 +40991,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25761:3:5",
+                      "src": "25761:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3632,
+                        "id": 5074,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3625,
-                        "src": "25761:1:5",
+                        "referencedDeclaration": 5067,
+                        "src": "25761:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -41010,36 +41010,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3634,
+                    "id": 5076,
                     "nodeType": "ExpressionStatement",
-                    "src": "25761:3:5"
+                    "src": "25761:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25722:95:5"
+                  "src": "25722:95:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3645,
+                    "id": 5087,
                     "name": "netflags",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3617,
-                    "src": "25833:8:5",
+                    "referencedDeclaration": 5059,
+                    "src": "25833:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                       "typeString": "bool[] memory"
                     }
                   },
-                  "functionReturnParameters": 3613,
-                  "id": 3646,
+                  "functionReturnParameters": 5055,
+                  "id": 5088,
                   "nodeType": "Return",
-                  "src": "25826:15:5"
+                  "src": "25826:15:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3648,
+            "id": 5090,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -41047,16 +41047,16 @@
             "name": "ResizeNetflags",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3609,
+              "id": 5051,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3608,
+                  "id": 5050,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3648,
-                  "src": "25600:16:5",
+                  "scope": 5090,
+                  "src": "25600:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41065,19 +41065,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3606,
+                      "id": 5048,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25600:4:5",
+                      "src": "25600:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 3607,
+                    "id": 5049,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25600:6:5",
+                    "src": "25600:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -41087,20 +41087,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25599:18:5"
+              "src": "25599:18:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3613,
+              "id": 5055,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3612,
+                  "id": 5054,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3648,
-                  "src": "25641:6:5",
+                  "scope": 5090,
+                  "src": "25641:6:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41109,19 +41109,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3610,
+                      "id": 5052,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25641:4:5",
+                      "src": "25641:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 3611,
+                    "id": 5053,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25641:6:5",
+                    "src": "25641:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -41131,38 +41131,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25640:8:5"
+              "src": "25640:8:7"
             },
-            "scope": 3787,
-            "src": "25576:272:5",
+            "scope": 5229,
+            "src": "25576:272:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3665,
+              "id": 5107,
               "nodeType": "Block",
-              "src": "25953:66:5",
+              "src": "25953:66:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3661,
+                    "id": 5103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3657,
+                      "id": 5099,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 879,
-                      "src": "25963:2:5",
+                      "referencedDeclaration": 2321,
+                      "src": "25963:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -41173,12 +41173,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3659,
+                          "id": 5101,
                           "name": "_newPR",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3650,
-                          "src": "25984:6:5",
+                          "referencedDeclaration": 5092,
+                          "src": "25984:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41192,18 +41192,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3658,
+                        "id": 5100,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5469,
-                        "src": "25968:15:5",
+                        "referencedDeclaration": 10035,
+                        "src": "25968:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 3660,
+                      "id": 5102,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41211,34 +41211,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "25968:23:5",
+                      "src": "25968:23:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "25963:28:5",
+                    "src": "25963:28:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 3662,
+                  "id": 5104,
                   "nodeType": "ExpressionStatement",
-                  "src": "25963:28:5"
+                  "src": "25963:28:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3663,
+                    "id": 5105,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26008:4:5",
+                    "src": "26008:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41246,52 +41246,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3656,
-                  "id": 3664,
+                  "functionReturnParameters": 5098,
+                  "id": 5106,
                   "nodeType": "Return",
-                  "src": "26001:11:5"
+                  "src": "26001:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3666,
+            "id": 5108,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3653,
+                "id": 5095,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3652,
+                  "id": 5094,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "25921:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "25921:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "25921:9:5"
+                "src": "25921:9:7"
               }
             ],
             "name": "SetProfileRegistryAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3651,
+              "id": 5093,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3650,
+                  "id": 5092,
                   "name": "_newPR",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3666,
-                  "src": "25905:14:5",
+                  "scope": 5108,
+                  "src": "25905:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41299,10 +41299,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3649,
+                    "id": 5091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25905:7:5",
+                    "src": "25905:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41312,20 +41312,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25904:16:5"
+              "src": "25904:16:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3656,
+              "id": 5098,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3655,
+                  "id": 5097,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3666,
-                  "src": "25947:4:5",
+                  "scope": 5108,
+                  "src": "25947:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41333,10 +41333,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3654,
+                    "id": 5096,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25947:4:5",
+                    "src": "25947:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41346,38 +41346,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25946:6:5"
+              "src": "25946:6:7"
             },
-            "scope": 3787,
-            "src": "25870:149:5",
+            "scope": 5229,
+            "src": "25870:149:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3683,
+              "id": 5125,
               "nodeType": "Block",
-              "src": "26102:60:5",
+              "src": "26102:60:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3679,
+                    "id": 5121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3675,
+                      "id": 5117,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 875,
-                      "src": "26112:2:5",
+                      "referencedDeclaration": 2317,
+                      "src": "26112:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -41388,12 +41388,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3677,
+                          "id": 5119,
                           "name": "_newBL",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3668,
-                          "src": "26127:6:5",
+                          "referencedDeclaration": 5110,
+                          "src": "26127:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41407,18 +41407,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3676,
+                        "id": 5118,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 592,
-                        "src": "26117:9:5",
+                        "referencedDeclaration": 1161,
+                        "src": "26117:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$592_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 3678,
+                      "id": 5120,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41426,34 +41426,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26117:17:5",
+                      "src": "26117:17:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "26112:22:5",
+                    "src": "26112:22:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 3680,
+                  "id": 5122,
                   "nodeType": "ExpressionStatement",
-                  "src": "26112:22:5"
+                  "src": "26112:22:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3681,
+                    "id": 5123,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26151:4:5",
+                    "src": "26151:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41461,52 +41461,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3674,
-                  "id": 3682,
+                  "functionReturnParameters": 5116,
+                  "id": 5124,
                   "nodeType": "Return",
-                  "src": "26144:11:5"
+                  "src": "26144:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3684,
+            "id": 5126,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3671,
+                "id": 5113,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3670,
+                  "id": 5112,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26070:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26070:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26070:9:5"
+                "src": "26070:9:7"
               }
             ],
             "name": "SetBlacklistAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3669,
+              "id": 5111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3668,
+                  "id": 5110,
                   "name": "_newBL",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3684,
-                  "src": "26054:14:5",
+                  "scope": 5126,
+                  "src": "26054:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41514,10 +41514,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3667,
+                    "id": 5109,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26054:7:5",
+                    "src": "26054:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41527,20 +41527,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26053:16:5"
+              "src": "26053:16:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3674,
+              "id": 5116,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3673,
+                  "id": 5115,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3684,
-                  "src": "26096:4:5",
+                  "scope": 5126,
+                  "src": "26096:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41548,10 +41548,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3672,
+                    "id": 5114,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26096:4:5",
+                    "src": "26096:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41561,19 +41561,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26095:6:5"
+              "src": "26095:6:7"
             },
-            "scope": 3787,
-            "src": "26025:137:5",
+            "scope": 5229,
+            "src": "26025:137:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3711,
+              "id": 5153,
               "nodeType": "Block",
-              "src": "26246:131:5",
+              "src": "26246:131:7",
               "statements": [
                 {
                   "expression": {
@@ -41585,7 +41585,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3700,
+                        "id": 5142,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -41600,12 +41600,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 3695,
+                                  "id": 5137,
                                   "name": "_newOracle",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3686,
-                                  "src": "26274:10:5",
+                                  "referencedDeclaration": 5128,
+                                  "src": "26274:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -41619,18 +41619,18 @@
                                     "typeString": "address"
                                   }
                                 ],
-                                "id": 3694,
+                                "id": 5136,
                                 "name": "OracleUSD",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4903,
-                                "src": "26264:9:5",
+                                "referencedDeclaration": 8677,
+                                "src": "26264:9:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                                   "typeString": "type(contract OracleUSD)"
                                 }
                               },
-                              "id": 3696,
+                              "id": 5138,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -41638,27 +41638,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "26264:21:5",
+                              "src": "26264:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                                "typeIdentifier": "t_contract$_OracleUSD_$8677",
                                 "typeString": "contract OracleUSD"
                               }
                             },
-                            "id": 3697,
+                            "id": 5139,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getCurrentPrice",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4902,
-                            "src": "26264:37:5",
+                            "referencedDeclaration": 8676,
+                            "src": "26264:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                               "typeString": "function () view external returns (uint256)"
                             }
                           },
-                          "id": 3698,
+                          "id": 5140,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -41666,7 +41666,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "26264:39:5",
+                          "src": "26264:39:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -41677,14 +41677,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3699,
+                          "id": 5141,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "26307:1:5",
+                          "src": "26307:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -41692,7 +41692,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "26264:44:5",
+                        "src": "26264:44:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -41706,21 +41706,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3693,
+                      "id": 5135,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26256:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26256:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3701,
+                    "id": 5143,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -41728,34 +41728,34 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26256:53:5",
+                    "src": "26256:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3702,
+                  "id": 5144,
                   "nodeType": "ExpressionStatement",
-                  "src": "26256:53:5"
+                  "src": "26256:53:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3707,
+                    "id": 5149,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3703,
+                      "id": 5145,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 877,
-                      "src": "26319:6:5",
+                      "referencedDeclaration": 2319,
+                      "src": "26319:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -41766,12 +41766,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3705,
+                          "id": 5147,
                           "name": "_newOracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3686,
-                          "src": "26338:10:5",
+                          "referencedDeclaration": 5128,
+                          "src": "26338:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41785,18 +41785,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3704,
+                        "id": 5146,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4903,
-                        "src": "26328:9:5",
+                        "referencedDeclaration": 8677,
+                        "src": "26328:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 3706,
+                      "id": 5148,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41804,34 +41804,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26328:21:5",
+                      "src": "26328:21:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "26319:30:5",
+                    "src": "26319:30:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 3708,
+                  "id": 5150,
                   "nodeType": "ExpressionStatement",
-                  "src": "26319:30:5"
+                  "src": "26319:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3709,
+                    "id": 5151,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26366:4:5",
+                    "src": "26366:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41839,52 +41839,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3692,
-                  "id": 3710,
+                  "functionReturnParameters": 5134,
+                  "id": 5152,
                   "nodeType": "Return",
-                  "src": "26359:11:5"
+                  "src": "26359:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3712,
+            "id": 5154,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3689,
+                "id": 5131,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3688,
+                  "id": 5130,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26214:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26214:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26214:9:5"
+                "src": "26214:9:7"
               }
             ],
             "name": "SetOracleAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3687,
+              "id": 5129,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3686,
+                  "id": 5128,
                   "name": "_newOracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3712,
-                  "src": "26194:18:5",
+                  "scope": 5154,
+                  "src": "26194:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41892,10 +41892,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3685,
+                    "id": 5127,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26194:7:5",
+                    "src": "26194:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41905,20 +41905,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26193:20:5"
+              "src": "26193:20:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3692,
+              "id": 5134,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3691,
+                  "id": 5133,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3712,
-                  "src": "26240:4:5",
+                  "scope": 5154,
+                  "src": "26240:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41926,10 +41926,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3690,
+                    "id": 5132,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26240:4:5",
+                    "src": "26240:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41939,19 +41939,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26239:6:5"
+              "src": "26239:6:7"
             },
-            "scope": 3787,
-            "src": "26168:209:5",
+            "scope": 5229,
+            "src": "26168:209:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3737,
+              "id": 5179,
               "nodeType": "Block",
-              "src": "26465:172:5",
+              "src": "26465:172:7",
               "statements": [
                 {
                   "expression": {
@@ -41963,19 +41963,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3724,
+                        "id": 5166,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3722,
+                          "id": 5164,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3714,
-                          "src": "26483:12:5",
+                          "referencedDeclaration": 5156,
+                          "src": "26483:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -41985,18 +41985,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3723,
+                          "id": 5165,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 890,
-                          "src": "26498:18:5",
+                          "referencedDeclaration": 2332,
+                          "src": "26498:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26483:33:5",
+                        "src": "26483:33:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -42010,21 +42010,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3721,
+                      "id": 5163,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26475:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26475:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3725,
+                    "id": 5167,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42032,15 +42032,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26475:42:5",
+                    "src": "26475:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3726,
+                  "id": 5168,
                   "nodeType": "ExpressionStatement",
-                  "src": "26475:42:5"
+                  "src": "26475:42:7"
                 },
                 {
                   "eventCall": {
@@ -42048,12 +42048,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3728,
+                        "id": 5170,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3714,
-                        "src": "26553:12:5",
+                        "referencedDeclaration": 5156,
+                        "src": "26553:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42067,18 +42067,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3727,
+                      "id": 5169,
                       "name": "NumBenchmarksUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 862,
-                      "src": "26532:20:5",
+                      "referencedDeclaration": 2304,
+                      "src": "26532:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3729,
+                    "id": 5171,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42086,32 +42086,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26532:34:5",
+                    "src": "26532:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3730,
+                  "id": 5172,
                   "nodeType": "EmitStatement",
-                  "src": "26527:39:5"
+                  "src": "26527:39:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3733,
+                    "id": 5175,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3731,
+                      "id": 5173,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "26576:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "26576:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -42121,39 +42121,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3732,
+                      "id": 5174,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3714,
-                      "src": "26597:12:5",
+                      "referencedDeclaration": 5156,
+                      "src": "26597:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26576:33:5",
+                    "src": "26576:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3734,
+                  "id": 5176,
                   "nodeType": "ExpressionStatement",
-                  "src": "26576:33:5"
+                  "src": "26576:33:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3735,
+                    "id": 5177,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26626:4:5",
+                    "src": "26626:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -42161,52 +42161,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3720,
-                  "id": 3736,
+                  "functionReturnParameters": 5162,
+                  "id": 5178,
                   "nodeType": "Return",
-                  "src": "26619:11:5"
+                  "src": "26619:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3738,
+            "id": 5180,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3717,
+                "id": 5159,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3716,
+                  "id": 5158,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26433:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26433:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26433:9:5"
+                "src": "26433:9:7"
               }
             ],
             "name": "SetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3715,
+              "id": 5157,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3714,
+                  "id": 5156,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3738,
-                  "src": "26414:17:5",
+                  "scope": 5180,
+                  "src": "26414:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42214,10 +42214,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3713,
+                    "id": 5155,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26414:4:5",
+                    "src": "26414:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -42227,20 +42227,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26413:19:5"
+              "src": "26413:19:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3720,
+              "id": 5162,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3719,
+                  "id": 5161,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3738,
-                  "src": "26459:4:5",
+                  "scope": 5180,
+                  "src": "26459:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42248,10 +42248,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3718,
+                    "id": 5160,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26459:4:5",
+                    "src": "26459:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -42261,19 +42261,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26458:6:5"
+              "src": "26458:6:7"
             },
-            "scope": 3787,
-            "src": "26383:254:5",
+            "scope": 5229,
+            "src": "26383:254:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3763,
+              "id": 5205,
               "nodeType": "Block",
-              "src": "26723:166:5",
+              "src": "26723:166:7",
               "statements": [
                 {
                   "expression": {
@@ -42285,19 +42285,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3750,
+                        "id": 5192,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3748,
+                          "id": 5190,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3740,
-                          "src": "26741:12:5",
+                          "referencedDeclaration": 5182,
+                          "src": "26741:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -42307,18 +42307,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3749,
+                          "id": 5191,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 892,
-                          "src": "26756:16:5",
+                          "referencedDeclaration": 2334,
+                          "src": "26756:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26741:31:5",
+                        "src": "26741:31:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -42332,21 +42332,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3747,
+                      "id": 5189,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26733:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26733:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3751,
+                    "id": 5193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42354,15 +42354,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26733:40:5",
+                    "src": "26733:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3752,
+                  "id": 5194,
                   "nodeType": "ExpressionStatement",
-                  "src": "26733:40:5"
+                  "src": "26733:40:7"
                 },
                 {
                   "eventCall": {
@@ -42370,12 +42370,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3754,
+                        "id": 5196,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3740,
-                        "src": "26807:12:5",
+                        "referencedDeclaration": 5182,
+                        "src": "26807:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42389,18 +42389,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3753,
+                      "id": 5195,
                       "name": "NumNetflagsUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 866,
-                      "src": "26788:18:5",
+                      "referencedDeclaration": 2308,
+                      "src": "26788:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3755,
+                    "id": 5197,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42408,32 +42408,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26788:32:5",
+                    "src": "26788:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3756,
+                  "id": 5198,
                   "nodeType": "EmitStatement",
-                  "src": "26783:37:5"
+                  "src": "26783:37:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3759,
+                    "id": 5201,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3757,
+                      "id": 5199,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "26830:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "26830:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -42443,39 +42443,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3758,
+                      "id": 5200,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3740,
-                      "src": "26849:12:5",
+                      "referencedDeclaration": 5182,
+                      "src": "26849:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26830:31:5",
+                    "src": "26830:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3760,
+                  "id": 5202,
                   "nodeType": "ExpressionStatement",
-                  "src": "26830:31:5"
+                  "src": "26830:31:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3761,
+                    "id": 5203,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26878:4:5",
+                    "src": "26878:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -42483,52 +42483,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3746,
-                  "id": 3762,
+                  "functionReturnParameters": 5188,
+                  "id": 5204,
                   "nodeType": "Return",
-                  "src": "26871:11:5"
+                  "src": "26871:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3764,
+            "id": 5206,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3743,
+                "id": 5185,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3742,
+                  "id": 5184,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26691:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26691:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26691:9:5"
+                "src": "26691:9:7"
               }
             ],
             "name": "SetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3741,
+              "id": 5183,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3740,
+                  "id": 5182,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3764,
-                  "src": "26672:17:5",
+                  "scope": 5206,
+                  "src": "26672:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42536,10 +42536,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3739,
+                    "id": 5181,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26672:4:5",
+                    "src": "26672:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -42549,20 +42549,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26671:19:5"
+              "src": "26671:19:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3746,
+              "id": 5188,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3745,
+                  "id": 5187,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3764,
-                  "src": "26717:4:5",
+                  "scope": 5206,
+                  "src": "26717:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42570,10 +42570,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3744,
+                    "id": 5186,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26717:4:5",
+                    "src": "26717:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -42583,19 +42583,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26716:6:5"
+              "src": "26716:6:7"
             },
-            "scope": 3787,
-            "src": "26643:246:5",
+            "scope": 5229,
+            "src": "26643:246:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3785,
+              "id": 5227,
               "nodeType": "Block",
-              "src": "26934:99:5",
+              "src": "26934:99:7",
               "statements": [
                 {
                   "expression": {
@@ -42603,12 +42603,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3772,
+                        "id": 5214,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "26959:5:5",
+                        "referencedDeclaration": 10800,
+                        "src": "26959:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -42622,14 +42622,14 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3776,
+                                "id": 5218,
                                 "name": "this",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7814,
-                                "src": "26990:4:5",
+                                "referencedDeclaration": 11366,
+                                "src": "26990:4:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Market_$3787",
+                                  "typeIdentifier": "t_contract$_Market_$5229",
                                   "typeString": "contract Market"
                                 }
                               }
@@ -42637,24 +42637,24 @@
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_contract$_Market_$3787",
+                                  "typeIdentifier": "t_contract$_Market_$5229",
                                   "typeString": "contract Market"
                                 }
                               ],
-                              "id": 3775,
+                              "id": 5217,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "lValueRequested": false,
                               "nodeType": "ElementaryTypeNameExpression",
-                              "src": "26982:7:5",
+                              "src": "26982:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_type$_t_address_$",
                                 "typeString": "type(address)"
                               },
                               "typeName": "address"
                             },
-                            "id": 3777,
+                            "id": 5219,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -42662,7 +42662,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "26982:13:5",
+                            "src": "26982:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -42678,32 +42678,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3773,
+                            "id": 5215,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "26966:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "26966:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 3774,
+                          "id": 5216,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "balanceOf",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7431,
-                          "src": "26966:15:5",
+                          "referencedDeclaration": 10977,
+                          "src": "26966:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                             "typeString": "function (address) view external returns (uint256)"
                           }
                         },
-                        "id": 3778,
+                        "id": 5220,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -42711,7 +42711,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "26966:30:5",
+                        "src": "26966:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42731,32 +42731,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3769,
+                        "id": 5211,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 873,
-                        "src": "26944:5:5",
+                        "referencedDeclaration": 2315,
+                        "src": "26944:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 3771,
+                      "id": 5213,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transfer",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7419,
-                      "src": "26944:14:5",
+                      "referencedDeclaration": 10965,
+                      "src": "26944:14:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 3779,
+                    "id": 5221,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42764,15 +42764,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26944:53:5",
+                    "src": "26944:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3780,
+                  "id": 5222,
                   "nodeType": "ExpressionStatement",
-                  "src": "26944:53:5"
+                  "src": "26944:53:7"
                 },
                 {
                   "expression": {
@@ -42780,12 +42780,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3782,
+                        "id": 5224,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "27020:5:5",
+                        "referencedDeclaration": 10800,
+                        "src": "27020:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -42799,18 +42799,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 3781,
+                      "id": 5223,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "27007:12:5",
+                      "referencedDeclaration": 11323,
+                      "src": "27007:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 3783,
+                    "id": 5225,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42818,84 +42818,84 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "27007:19:5",
+                    "src": "27007:19:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3784,
+                  "id": 5226,
                   "nodeType": "ExpressionStatement",
-                  "src": "27007:19:5"
+                  "src": "27007:19:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3786,
+            "id": 5228,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3767,
+                "id": 5209,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3766,
+                  "id": 5208,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26917:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26917:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26917:9:5"
+                "src": "26917:9:7"
               }
             ],
             "name": "KillMarket",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3765,
+              "id": 5207,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26914:2:5"
+              "src": "26914:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3768,
+              "id": 5210,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26934:0:5"
+              "src": "26934:0:7"
             },
-            "scope": 3787,
-            "src": "26895:138:5",
+            "scope": 5229,
+            "src": "26895:138:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 3788,
-        "src": "254:26781:5"
+        "scope": 5230,
+        "src": "254:26781:7"
       }
     ],
-    "src": "0:27036:5"
+    "src": "0:27036:7"
   },
   "legacyAST": {
     "absolutePath": "contracts/Market.sol",
     "exportedSymbols": {
       "Market": [
-        3787
+        5229
       ]
     },
-    "id": 3788,
+    "id": 5230,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 705,
+        "id": 2147,
         "literals": [
           "solidity",
           "^",
@@ -42903,71 +42903,71 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:5"
+        "src": "0:24:7"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 706,
+        "id": 2148,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 7337,
-        "src": "27:59:5",
+        "scope": 5230,
+        "sourceUnit": 10883,
+        "src": "27:59:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 707,
+        "id": 2149,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 7157,
-        "src": "87:60:5",
+        "scope": 5230,
+        "sourceUnit": 10703,
+        "src": "87:60:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 708,
+        "id": 2150,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 5515,
-        "src": "148:19:5",
+        "scope": 5230,
+        "sourceUnit": 10081,
+        "src": "148:19:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/Blacklist.sol",
         "file": "./Blacklist.sol",
-        "id": 709,
+        "id": 2151,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 593,
-        "src": "168:25:5",
+        "scope": 5230,
+        "sourceUnit": 1162,
+        "src": "168:25:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/OracleUSD.sol",
         "file": "./OracleUSD.sol",
-        "id": 710,
+        "id": 2152,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 4904,
-        "src": "194:25:5",
+        "scope": 5230,
+        "sourceUnit": 8678,
+        "src": "194:25:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/ProfileRegistry.sol",
         "file": "./ProfileRegistry.sol",
-        "id": 711,
+        "id": 2153,
         "nodeType": "ImportDirective",
-        "scope": 3788,
-        "sourceUnit": 5470,
-        "src": "220:31:5",
+        "scope": 5230,
+        "sourceUnit": 10036,
+        "src": "220:31:7",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -42977,76 +42977,76 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 712,
+              "id": 2154,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "273:7:5",
+              "referencedDeclaration": 10882,
+              "src": "273:7:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 713,
+            "id": 2155,
             "nodeType": "InheritanceSpecifier",
-            "src": "273:7:5"
+            "src": "273:7:7"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 714,
+              "id": 2156,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7156,
-              "src": "282:8:5",
+              "referencedDeclaration": 10702,
+              "src": "282:8:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$7156",
+                "typeIdentifier": "t_contract$_Pausable_$10702",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 715,
+            "id": 2157,
             "nodeType": "InheritanceSpecifier",
-            "src": "282:8:5"
+            "src": "282:8:7"
           }
         ],
         "contractDependencies": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 3787,
+        "id": 5229,
         "linearizedBaseContracts": [
-          3787,
-          7156,
-          7336
+          5229,
+          10702,
+          10882
         ],
         "name": "Market",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 718,
+            "id": 2160,
             "libraryName": {
               "contractScope": null,
-              "id": 716,
+              "id": 2158,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "304:8:5",
+              "referencedDeclaration": 10796,
+              "src": "304:8:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "298:27:5",
+            "src": "298:27:7",
             "typeName": {
-              "id": 717,
+              "id": 2159,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "317:7:5",
+              "src": "317:7:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -43055,162 +43055,162 @@
           },
           {
             "canonicalName": "Market.DealStatus",
-            "id": 722,
+            "id": 2164,
             "members": [
               {
-                "id": 719,
+                "id": 2161,
                 "name": "STATUS_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "377:14:5"
+                "src": "377:14:7"
               },
               {
-                "id": 720,
+                "id": 2162,
                 "name": "STATUS_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "401:15:5"
+                "src": "401:15:7"
               },
               {
-                "id": 721,
+                "id": 2163,
                 "name": "STATUS_CLOSED",
                 "nodeType": "EnumValue",
-                "src": "426:13:5"
+                "src": "426:13:7"
               }
             ],
             "name": "DealStatus",
             "nodeType": "EnumDefinition",
-            "src": "352:93:5"
+            "src": "352:93:7"
           },
           {
             "canonicalName": "Market.OrderType",
-            "id": 726,
+            "id": 2168,
             "members": [
               {
-                "id": 723,
+                "id": 2165,
                 "name": "ORDER_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "476:13:5"
+                "src": "476:13:7"
               },
               {
-                "id": 724,
+                "id": 2166,
                 "name": "ORDER_BID",
                 "nodeType": "EnumValue",
-                "src": "499:9:5"
+                "src": "499:9:7"
               },
               {
-                "id": 725,
+                "id": 2167,
                 "name": "ORDER_ASK",
                 "nodeType": "EnumValue",
-                "src": "518:9:5"
+                "src": "518:9:7"
               }
             ],
             "name": "OrderType",
             "nodeType": "EnumDefinition",
-            "src": "451:82:5"
+            "src": "451:82:7"
           },
           {
             "canonicalName": "Market.OrderStatus",
-            "id": 730,
+            "id": 2172,
             "members": [
               {
-                "id": 727,
+                "id": 2169,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "566:7:5"
+                "src": "566:7:7"
               },
               {
-                "id": 728,
+                "id": 2170,
                 "name": "ORDER_INACTIVE",
                 "nodeType": "EnumValue",
-                "src": "583:14:5"
+                "src": "583:14:7"
               },
               {
-                "id": 729,
+                "id": 2171,
                 "name": "ORDER_ACTIVE",
                 "nodeType": "EnumValue",
-                "src": "607:12:5"
+                "src": "607:12:7"
               }
             ],
             "name": "OrderStatus",
             "nodeType": "EnumDefinition",
-            "src": "539:86:5"
+            "src": "539:86:7"
           },
           {
             "canonicalName": "Market.RequestStatus",
-            "id": 736,
+            "id": 2178,
             "members": [
               {
-                "id": 731,
+                "id": 2173,
                 "name": "REQUEST_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "660:15:5"
+                "src": "660:15:7"
               },
               {
-                "id": 732,
+                "id": 2174,
                 "name": "REQUEST_CREATED",
                 "nodeType": "EnumValue",
-                "src": "685:15:5"
+                "src": "685:15:7"
               },
               {
-                "id": 733,
+                "id": 2175,
                 "name": "REQUEST_CANCELED",
                 "nodeType": "EnumValue",
-                "src": "710:16:5"
+                "src": "710:16:7"
               },
               {
-                "id": 734,
+                "id": 2176,
                 "name": "REQUEST_REJECTED",
                 "nodeType": "EnumValue",
-                "src": "736:16:5"
+                "src": "736:16:7"
               },
               {
-                "id": 735,
+                "id": 2177,
                 "name": "REQUEST_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "762:16:5"
+                "src": "762:16:7"
               }
             ],
             "name": "RequestStatus",
             "nodeType": "EnumDefinition",
-            "src": "631:153:5"
+            "src": "631:153:7"
           },
           {
             "canonicalName": "Market.BlacklistPerson",
-            "id": 740,
+            "id": 2182,
             "members": [
               {
-                "id": 737,
+                "id": 2179,
                 "name": "BLACKLIST_NOBODY",
                 "nodeType": "EnumValue",
-                "src": "821:16:5"
+                "src": "821:16:7"
               },
               {
-                "id": 738,
+                "id": 2180,
                 "name": "BLACKLIST_WORKER",
                 "nodeType": "EnumValue",
-                "src": "847:16:5"
+                "src": "847:16:7"
               },
               {
-                "id": 739,
+                "id": 2181,
                 "name": "BLACKLIST_MASTER",
                 "nodeType": "EnumValue",
-                "src": "873:16:5"
+                "src": "873:16:7"
               }
             ],
             "name": "BlacklistPerson",
             "nodeType": "EnumDefinition",
-            "src": "790:105:5"
+            "src": "790:105:7"
           },
           {
             "canonicalName": "Market.Deal",
-            "id": 770,
+            "id": 2212,
             "members": [
               {
                 "constant": false,
-                "id": 743,
+                "id": 2185,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "923:19:5",
+                "scope": 2212,
+                "src": "923:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43219,19 +43219,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 741,
+                    "id": 2183,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "923:6:5",
+                    "src": "923:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 742,
+                  "id": 2184,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "923:8:5",
+                  "src": "923:8:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -43242,11 +43242,11 @@
               },
               {
                 "constant": false,
-                "id": 745,
+                "id": 2187,
                 "name": "supplierID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "952:18:5",
+                "scope": 2212,
+                "src": "952:18:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43254,10 +43254,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 744,
+                  "id": 2186,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "952:7:5",
+                  "src": "952:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43268,11 +43268,11 @@
               },
               {
                 "constant": false,
-                "id": 747,
+                "id": 2189,
                 "name": "consumerID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "980:18:5",
+                "scope": 2212,
+                "src": "980:18:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43280,10 +43280,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 746,
+                  "id": 2188,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "980:7:5",
+                  "src": "980:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43294,11 +43294,11 @@
               },
               {
                 "constant": false,
-                "id": 749,
+                "id": 2191,
                 "name": "masterID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1008:16:5",
+                "scope": 2212,
+                "src": "1008:16:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43306,10 +43306,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 748,
+                  "id": 2190,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1008:7:5",
+                  "src": "1008:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43320,11 +43320,11 @@
               },
               {
                 "constant": false,
-                "id": 751,
+                "id": 2193,
                 "name": "askID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1034:10:5",
+                "scope": 2212,
+                "src": "1034:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43332,10 +43332,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 750,
+                  "id": 2192,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1034:4:5",
+                  "src": "1034:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43346,11 +43346,11 @@
               },
               {
                 "constant": false,
-                "id": 753,
+                "id": 2195,
                 "name": "bidID",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1054:10:5",
+                "scope": 2212,
+                "src": "1054:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43358,10 +43358,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 752,
+                  "id": 2194,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1054:4:5",
+                  "src": "1054:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43372,11 +43372,11 @@
               },
               {
                 "constant": false,
-                "id": 755,
+                "id": 2197,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1074:13:5",
+                "scope": 2212,
+                "src": "1074:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43384,10 +43384,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 754,
+                  "id": 2196,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1074:4:5",
+                  "src": "1074:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43398,11 +43398,11 @@
               },
               {
                 "constant": false,
-                "id": 757,
+                "id": 2199,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1097:10:5",
+                "scope": 2212,
+                "src": "1097:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43410,10 +43410,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 756,
+                  "id": 2198,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1097:4:5",
+                  "src": "1097:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43424,11 +43424,11 @@
               },
               {
                 "constant": false,
-                "id": 759,
+                "id": 2201,
                 "name": "startTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1132:14:5",
+                "scope": 2212,
+                "src": "1132:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43436,10 +43436,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 758,
+                  "id": 2200,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1132:4:5",
+                  "src": "1132:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43450,11 +43450,11 @@
               },
               {
                 "constant": false,
-                "id": 761,
+                "id": 2203,
                 "name": "endTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1156:12:5",
+                "scope": 2212,
+                "src": "1156:12:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43462,10 +43462,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 760,
+                  "id": 2202,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1156:4:5",
+                  "src": "1156:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43476,26 +43476,26 @@
               },
               {
                 "constant": false,
-                "id": 763,
+                "id": 2205,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1178:17:5",
+                "scope": 2212,
+                "src": "1178:17:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_DealStatus_$722",
+                  "typeIdentifier": "t_enum$_DealStatus_$2164",
                   "typeString": "enum Market.DealStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 762,
+                  "id": 2204,
                   "name": "DealStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 722,
-                  "src": "1178:10:5",
+                  "referencedDeclaration": 2164,
+                  "src": "1178:10:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$722",
+                    "typeIdentifier": "t_enum$_DealStatus_$2164",
                     "typeString": "enum Market.DealStatus"
                   }
                 },
@@ -43504,11 +43504,11 @@
               },
               {
                 "constant": false,
-                "id": 765,
+                "id": 2207,
                 "name": "blockedBalance",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1205:19:5",
+                "scope": 2212,
+                "src": "1205:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43516,10 +43516,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 764,
+                  "id": 2206,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1205:4:5",
+                  "src": "1205:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43530,11 +43530,11 @@
               },
               {
                 "constant": false,
-                "id": 767,
+                "id": 2209,
                 "name": "totalPayout",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1234:16:5",
+                "scope": 2212,
+                "src": "1234:16:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43542,10 +43542,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 766,
+                  "id": 2208,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1234:4:5",
+                  "src": "1234:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43556,11 +43556,11 @@
               },
               {
                 "constant": false,
-                "id": 769,
+                "id": 2211,
                 "name": "lastBillTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 770,
-                "src": "1260:15:5",
+                "scope": 2212,
+                "src": "1260:15:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43568,10 +43568,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 768,
+                  "id": 2210,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1260:4:5",
+                  "src": "1260:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43583,36 +43583,36 @@
             ],
             "name": "Deal",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "901:381:5",
+            "scope": 5229,
+            "src": "901:381:7",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.Order",
-            "id": 799,
+            "id": 2241,
             "members": [
               {
                 "constant": false,
-                "id": 772,
+                "id": 2214,
                 "name": "orderType",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1311:19:5",
+                "scope": 2241,
+                "src": "1311:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$726",
+                  "typeIdentifier": "t_enum$_OrderType_$2168",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 771,
+                  "id": 2213,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 726,
-                  "src": "1311:9:5",
+                  "referencedDeclaration": 2168,
+                  "src": "1311:9:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -43621,26 +43621,26 @@
               },
               {
                 "constant": false,
-                "id": 774,
+                "id": 2216,
                 "name": "orderStatus",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1340:23:5",
+                "scope": 2241,
+                "src": "1340:23:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderStatus_$730",
+                  "typeIdentifier": "t_enum$_OrderStatus_$2172",
                   "typeString": "enum Market.OrderStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 773,
+                  "id": 2215,
                   "name": "OrderStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 730,
-                  "src": "1340:11:5",
+                  "referencedDeclaration": 2172,
+                  "src": "1340:11:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$730",
+                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
                     "typeString": "enum Market.OrderStatus"
                   }
                 },
@@ -43649,11 +43649,11 @@
               },
               {
                 "constant": false,
-                "id": 776,
+                "id": 2218,
                 "name": "author",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1373:14:5",
+                "scope": 2241,
+                "src": "1373:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43661,10 +43661,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 775,
+                  "id": 2217,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1373:7:5",
+                  "src": "1373:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43675,11 +43675,11 @@
               },
               {
                 "constant": false,
-                "id": 778,
+                "id": 2220,
                 "name": "counterparty",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1397:20:5",
+                "scope": 2241,
+                "src": "1397:20:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43687,10 +43687,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 777,
+                  "id": 2219,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1397:7:5",
+                  "src": "1397:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43701,11 +43701,11 @@
               },
               {
                 "constant": false,
-                "id": 780,
+                "id": 2222,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1427:13:5",
+                "scope": 2241,
+                "src": "1427:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43713,10 +43713,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 779,
+                  "id": 2221,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1427:4:5",
+                  "src": "1427:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43727,11 +43727,11 @@
               },
               {
                 "constant": false,
-                "id": 782,
+                "id": 2224,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1450:13:5",
+                "scope": 2241,
+                "src": "1450:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43739,10 +43739,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 781,
+                  "id": 2223,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1450:7:5",
+                  "src": "1450:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43753,11 +43753,11 @@
               },
               {
                 "constant": false,
-                "id": 785,
+                "id": 2227,
                 "name": "netflags",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1473:15:5",
+                "scope": 2241,
+                "src": "1473:15:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43766,19 +43766,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 783,
+                    "id": 2225,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1473:4:5",
+                    "src": "1473:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 784,
+                  "id": 2226,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1473:6:5",
+                  "src": "1473:6:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                     "typeString": "bool[]"
@@ -43789,26 +43789,26 @@
               },
               {
                 "constant": false,
-                "id": 787,
+                "id": 2229,
                 "name": "identityLevel",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1498:43:5",
+                "scope": 2241,
+                "src": "1498:43:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                  "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                   "typeString": "enum ProfileRegistry.IdentityLevel"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 786,
+                  "id": 2228,
                   "name": "ProfileRegistry.IdentityLevel",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 4931,
-                  "src": "1498:29:5",
+                  "referencedDeclaration": 9497,
+                  "src": "1498:29:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   }
                 },
@@ -43817,11 +43817,11 @@
               },
               {
                 "constant": false,
-                "id": 789,
+                "id": 2231,
                 "name": "blacklist",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1551:17:5",
+                "scope": 2241,
+                "src": "1551:17:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43829,10 +43829,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 788,
+                  "id": 2230,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1551:7:5",
+                  "src": "1551:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43843,11 +43843,11 @@
               },
               {
                 "constant": false,
-                "id": 791,
+                "id": 2233,
                 "name": "tag",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1578:11:5",
+                "scope": 2241,
+                "src": "1578:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43855,10 +43855,10 @@
                   "typeString": "bytes32"
                 },
                 "typeName": {
-                  "id": 790,
+                  "id": 2232,
                   "name": "bytes32",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1578:7:5",
+                  "src": "1578:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes32",
                     "typeString": "bytes32"
@@ -43869,11 +43869,11 @@
               },
               {
                 "constant": false,
-                "id": 794,
+                "id": 2236,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1599:19:5",
+                "scope": 2241,
+                "src": "1599:19:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43882,19 +43882,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 792,
+                    "id": 2234,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1599:6:5",
+                    "src": "1599:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 793,
+                  "id": 2235,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1599:8:5",
+                  "src": "1599:8:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -43905,11 +43905,11 @@
               },
               {
                 "constant": false,
-                "id": 796,
+                "id": 2238,
                 "name": "frozenSum",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1628:14:5",
+                "scope": 2241,
+                "src": "1628:14:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43917,10 +43917,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 795,
+                  "id": 2237,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1628:4:5",
+                  "src": "1628:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43931,11 +43931,11 @@
               },
               {
                 "constant": false,
-                "id": 798,
+                "id": 2240,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 799,
-                "src": "1652:11:5",
+                "scope": 2241,
+                "src": "1652:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43943,10 +43943,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 797,
+                  "id": 2239,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1652:4:5",
+                  "src": "1652:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43958,21 +43958,21 @@
             ],
             "name": "Order",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "1288:382:5",
+            "scope": 5229,
+            "src": "1288:382:7",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.ChangeRequest",
-            "id": 810,
+            "id": 2252,
             "members": [
               {
                 "constant": false,
-                "id": 801,
+                "id": 2243,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1707:11:5",
+                "scope": 2252,
+                "src": "1707:11:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43980,10 +43980,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 800,
+                  "id": 2242,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1707:4:5",
+                  "src": "1707:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43994,26 +43994,26 @@
               },
               {
                 "constant": false,
-                "id": 803,
+                "id": 2245,
                 "name": "requestType",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1728:21:5",
+                "scope": 2252,
+                "src": "1728:21:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$726",
+                  "typeIdentifier": "t_enum$_OrderType_$2168",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 802,
+                  "id": 2244,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 726,
-                  "src": "1728:9:5",
+                  "referencedDeclaration": 2168,
+                  "src": "1728:9:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -44022,11 +44022,11 @@
               },
               {
                 "constant": false,
-                "id": 805,
+                "id": 2247,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1759:10:5",
+                "scope": 2252,
+                "src": "1759:10:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -44034,10 +44034,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 804,
+                  "id": 2246,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1759:4:5",
+                  "src": "1759:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -44048,11 +44048,11 @@
               },
               {
                 "constant": false,
-                "id": 807,
+                "id": 2249,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1779:13:5",
+                "scope": 2252,
+                "src": "1779:13:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -44060,10 +44060,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 806,
+                  "id": 2248,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1779:4:5",
+                  "src": "1779:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -44074,26 +44074,26 @@
               },
               {
                 "constant": false,
-                "id": 809,
+                "id": 2251,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 810,
-                "src": "1802:20:5",
+                "scope": 2252,
+                "src": "1802:20:7",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                   "typeString": "enum Market.RequestStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 808,
+                  "id": 2250,
                   "name": "RequestStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 736,
-                  "src": "1802:13:5",
+                  "referencedDeclaration": 2178,
+                  "src": "1802:13:7",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                     "typeString": "enum Market.RequestStatus"
                   }
                 },
@@ -44103,28 +44103,28 @@
             ],
             "name": "ChangeRequest",
             "nodeType": "StructDefinition",
-            "scope": 3787,
-            "src": "1676:153:5",
+            "scope": 5229,
+            "src": "1676:153:7",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 814,
+            "id": 2256,
             "name": "OrderPlaced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 813,
+              "id": 2255,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 812,
+                  "id": 2254,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 814,
-                  "src": "1868:20:5",
+                  "scope": 2256,
+                  "src": "1868:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44132,10 +44132,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 811,
+                    "id": 2253,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1868:4:5",
+                    "src": "1868:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44145,28 +44145,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1867:22:5"
+              "src": "1867:22:7"
             },
-            "src": "1850:40:5"
+            "src": "1850:40:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 818,
+            "id": 2260,
             "name": "OrderUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 817,
+              "id": 2259,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 816,
+                  "id": 2258,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 818,
-                  "src": "1914:20:5",
+                  "scope": 2260,
+                  "src": "1914:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44174,10 +44174,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 815,
+                    "id": 2257,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1914:4:5",
+                    "src": "1914:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44187,28 +44187,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1913:22:5"
+              "src": "1913:22:7"
             },
-            "src": "1895:41:5"
+            "src": "1895:41:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 822,
+            "id": 2264,
             "name": "DealOpened",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 821,
+              "id": 2263,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 820,
+                  "id": 2262,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 822,
-                  "src": "1959:19:5",
+                  "scope": 2264,
+                  "src": "1959:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44216,10 +44216,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 819,
+                    "id": 2261,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1959:4:5",
+                    "src": "1959:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44229,28 +44229,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1958:21:5"
+              "src": "1958:21:7"
             },
-            "src": "1942:38:5"
+            "src": "1942:38:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 826,
+            "id": 2268,
             "name": "DealUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 825,
+              "id": 2267,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 824,
+                  "id": 2266,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 826,
-                  "src": "2003:19:5",
+                  "scope": 2268,
+                  "src": "2003:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44258,10 +44258,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 823,
+                    "id": 2265,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2003:4:5",
+                    "src": "2003:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44271,28 +44271,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2002:21:5"
+              "src": "2002:21:7"
             },
-            "src": "1985:39:5"
+            "src": "1985:39:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 832,
+            "id": 2274,
             "name": "Billed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 831,
+              "id": 2273,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 828,
+                  "id": 2270,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 832,
-                  "src": "2043:19:5",
+                  "scope": 2274,
+                  "src": "2043:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44300,10 +44300,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 827,
+                    "id": 2269,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2043:4:5",
+                    "src": "2043:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44314,12 +44314,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 830,
+                  "id": 2272,
                   "indexed": true,
                   "name": "paidAmount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 832,
-                  "src": "2064:23:5",
+                  "scope": 2274,
+                  "src": "2064:23:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44327,10 +44327,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 829,
+                    "id": 2271,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2064:4:5",
+                    "src": "2064:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44340,28 +44340,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2042:46:5"
+              "src": "2042:46:7"
             },
-            "src": "2030:59:5"
+            "src": "2030:59:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 836,
+            "id": 2278,
             "name": "DealChangeRequestSet",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 835,
+              "id": 2277,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 834,
+                  "id": 2276,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 836,
-                  "src": "2122:28:5",
+                  "scope": 2278,
+                  "src": "2122:28:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44369,10 +44369,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 833,
+                    "id": 2275,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2122:4:5",
+                    "src": "2122:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44382,28 +44382,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2121:30:5"
+              "src": "2121:30:7"
             },
-            "src": "2095:57:5"
+            "src": "2095:57:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 840,
+            "id": 2282,
             "name": "DealChangeRequestUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 839,
+              "id": 2281,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 838,
+                  "id": 2280,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 840,
-                  "src": "2188:28:5",
+                  "scope": 2282,
+                  "src": "2188:28:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44411,10 +44411,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 837,
+                    "id": 2279,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2188:4:5",
+                    "src": "2188:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44424,28 +44424,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2187:30:5"
+              "src": "2187:30:7"
             },
-            "src": "2157:61:5"
+            "src": "2157:61:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 846,
+            "id": 2288,
             "name": "WorkerAnnounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 845,
+              "id": 2287,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 842,
+                  "id": 2284,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 846,
-                  "src": "2246:22:5",
+                  "scope": 2288,
+                  "src": "2246:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44453,10 +44453,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 841,
+                    "id": 2283,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2246:7:5",
+                    "src": "2246:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44467,12 +44467,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 844,
+                  "id": 2286,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 846,
-                  "src": "2270:22:5",
+                  "scope": 2288,
+                  "src": "2270:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44480,10 +44480,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 843,
+                    "id": 2285,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2270:7:5",
+                    "src": "2270:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44493,28 +44493,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2245:48:5"
+              "src": "2245:48:7"
             },
-            "src": "2224:70:5"
+            "src": "2224:70:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 852,
+            "id": 2294,
             "name": "WorkerConfirmed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 851,
+              "id": 2293,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 848,
+                  "id": 2290,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 852,
-                  "src": "2321:22:5",
+                  "scope": 2294,
+                  "src": "2321:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44522,10 +44522,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 847,
+                    "id": 2289,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2321:7:5",
+                    "src": "2321:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44536,12 +44536,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 850,
+                  "id": 2292,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 852,
-                  "src": "2345:22:5",
+                  "scope": 2294,
+                  "src": "2345:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44549,10 +44549,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 849,
+                    "id": 2291,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:5",
+                    "src": "2345:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44562,28 +44562,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2320:48:5"
+              "src": "2320:48:7"
             },
-            "src": "2299:70:5"
+            "src": "2299:70:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 858,
+            "id": 2300,
             "name": "WorkerRemoved",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 857,
+              "id": 2299,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 854,
+                  "id": 2296,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 858,
-                  "src": "2394:22:5",
+                  "scope": 2300,
+                  "src": "2394:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44591,10 +44591,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 853,
+                    "id": 2295,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2394:7:5",
+                    "src": "2394:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44605,12 +44605,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 856,
+                  "id": 2298,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 858,
-                  "src": "2418:22:5",
+                  "scope": 2300,
+                  "src": "2418:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44618,10 +44618,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 855,
+                    "id": 2297,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2418:7:5",
+                    "src": "2418:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44631,28 +44631,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2393:48:5"
+              "src": "2393:48:7"
             },
-            "src": "2374:68:5"
+            "src": "2374:68:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 862,
+            "id": 2304,
             "name": "NumBenchmarksUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 861,
+              "id": 2303,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 860,
+                  "id": 2302,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 862,
-                  "src": "2475:19:5",
+                  "scope": 2304,
+                  "src": "2475:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44660,10 +44660,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 859,
+                    "id": 2301,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2475:4:5",
+                    "src": "2475:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44673,28 +44673,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2474:21:5"
+              "src": "2474:21:7"
             },
-            "src": "2448:48:5"
+            "src": "2448:48:7"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 866,
+            "id": 2308,
             "name": "NumNetflagsUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 865,
+              "id": 2307,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 864,
+                  "id": 2306,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 866,
-                  "src": "2526:19:5",
+                  "scope": 2308,
+                  "src": "2526:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44702,10 +44702,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 863,
+                    "id": 2305,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2526:4:5",
+                    "src": "2526:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44715,17 +44715,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2525:21:5"
+              "src": "2525:21:7"
             },
-            "src": "2501:46:5"
+            "src": "2501:46:7"
           },
           {
             "constant": true,
-            "id": 871,
+            "id": 2313,
             "name": "MAX_BENCHMARKS_VALUE",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2566:44:5",
+            "scope": 5229,
+            "src": "2566:44:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44733,10 +44733,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 867,
+              "id": 2309,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2566:4:5",
+              "src": "2566:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44748,7 +44748,7 @@
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
               },
-              "id": 870,
+              "id": 2312,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -44756,14 +44756,14 @@
               "leftExpression": {
                 "argumentTypes": null,
                 "hexValue": "32",
-                "id": 868,
+                "id": 2310,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2603:1:5",
+                "src": "2603:1:7",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_2_by_1",
@@ -44776,14 +44776,14 @@
               "rightExpression": {
                 "argumentTypes": null,
                 "hexValue": "3633",
-                "id": 869,
+                "id": 2311,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2608:2:5",
+                "src": "2608:2:7",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_63_by_1",
@@ -44791,7 +44791,7 @@
                 },
                 "value": "63"
               },
-              "src": "2603:7:5",
+              "src": "2603:7:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
@@ -44801,26 +44801,26 @@
           },
           {
             "constant": false,
-            "id": 873,
+            "id": 2315,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2617:9:5",
+            "scope": 5229,
+            "src": "2617:9:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$5514",
+              "typeIdentifier": "t_contract$_SNM_$10080",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 872,
+              "id": 2314,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5514,
-              "src": "2617:3:5",
+              "referencedDeclaration": 10080,
+              "src": "2617:3:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$5514",
+                "typeIdentifier": "t_contract$_SNM_$10080",
                 "typeString": "contract SNM"
               }
             },
@@ -44829,26 +44829,26 @@
           },
           {
             "constant": false,
-            "id": 875,
+            "id": 2317,
             "name": "bl",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2633:12:5",
+            "scope": 5229,
+            "src": "2633:12:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_Blacklist_$592",
+              "typeIdentifier": "t_contract$_Blacklist_$1161",
               "typeString": "contract Blacklist"
             },
             "typeName": {
               "contractScope": null,
-              "id": 874,
+              "id": 2316,
               "name": "Blacklist",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 592,
-              "src": "2633:9:5",
+              "referencedDeclaration": 1161,
+              "src": "2633:9:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Blacklist_$592",
+                "typeIdentifier": "t_contract$_Blacklist_$1161",
                 "typeString": "contract Blacklist"
               }
             },
@@ -44857,26 +44857,26 @@
           },
           {
             "constant": false,
-            "id": 877,
+            "id": 2319,
             "name": "oracle",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2652:16:5",
+            "scope": 5229,
+            "src": "2652:16:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_OracleUSD_$4903",
+              "typeIdentifier": "t_contract$_OracleUSD_$8677",
               "typeString": "contract OracleUSD"
             },
             "typeName": {
               "contractScope": null,
-              "id": 876,
+              "id": 2318,
               "name": "OracleUSD",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 4903,
-              "src": "2652:9:5",
+              "referencedDeclaration": 8677,
+              "src": "2652:9:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                "typeIdentifier": "t_contract$_OracleUSD_$8677",
                 "typeString": "contract OracleUSD"
               }
             },
@@ -44885,26 +44885,26 @@
           },
           {
             "constant": false,
-            "id": 879,
+            "id": 2321,
             "name": "pr",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2675:18:5",
+            "scope": 5229,
+            "src": "2675:18:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+              "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
               "typeString": "contract ProfileRegistry"
             },
             "typeName": {
               "contractScope": null,
-              "id": 878,
+              "id": 2320,
               "name": "ProfileRegistry",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 5469,
-              "src": "2675:15:5",
+              "referencedDeclaration": 10035,
+              "src": "2675:15:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                 "typeString": "contract ProfileRegistry"
               }
             },
@@ -44913,11 +44913,11 @@
           },
           {
             "constant": false,
-            "id": 882,
+            "id": 2324,
             "name": "ordersAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2700:21:5",
+            "scope": 5229,
+            "src": "2700:21:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44925,10 +44925,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 880,
+              "id": 2322,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2700:4:5",
+              "src": "2700:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44937,14 +44937,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 881,
+              "id": 2323,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2720:1:5",
+              "src": "2720:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -44956,11 +44956,11 @@
           },
           {
             "constant": false,
-            "id": 885,
+            "id": 2327,
             "name": "dealAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2728:19:5",
+            "scope": 5229,
+            "src": "2728:19:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44968,10 +44968,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 883,
+              "id": 2325,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2728:4:5",
+              "src": "2728:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44980,14 +44980,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 884,
+              "id": 2326,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2746:1:5",
+              "src": "2746:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -44999,11 +44999,11 @@
           },
           {
             "constant": false,
-            "id": 888,
+            "id": 2330,
             "name": "requestsAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2754:23:5",
+            "scope": 5229,
+            "src": "2754:23:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45011,10 +45011,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 886,
+              "id": 2328,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2754:4:5",
+              "src": "2754:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45023,14 +45023,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 887,
+              "id": 2329,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2776:1:5",
+              "src": "2776:1:7",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -45042,11 +45042,11 @@
           },
           {
             "constant": false,
-            "id": 890,
+            "id": 2332,
             "name": "benchmarksQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2820:23:5",
+            "scope": 5229,
+            "src": "2820:23:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45054,10 +45054,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 889,
+              "id": 2331,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2820:4:5",
+              "src": "2820:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45068,11 +45068,11 @@
           },
           {
             "constant": false,
-            "id": 892,
+            "id": 2334,
             "name": "netflagsQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2884:21:5",
+            "scope": 5229,
+            "src": "2884:21:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45080,10 +45080,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 891,
+              "id": 2333,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2884:4:5",
+              "src": "2884:4:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45094,44 +45094,44 @@
           },
           {
             "constant": false,
-            "id": 896,
+            "id": 2338,
             "name": "orders",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2912:36:5",
+            "scope": 5229,
+            "src": "2912:36:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
               "typeString": "mapping(uint256 => struct Market.Order)"
             },
             "typeName": {
-              "id": 895,
+              "id": 2337,
               "keyType": {
-                "id": 893,
+                "id": 2335,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2920:4:5",
+                "src": "2920:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2912:22:5",
+              "src": "2912:22:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Order)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 894,
+                "id": 2336,
                 "name": "Order",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 799,
-                "src": "2928:5:5",
+                "referencedDeclaration": 2241,
+                "src": "2928:5:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                  "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                   "typeString": "struct Market.Order"
                 }
               }
@@ -45141,44 +45141,44 @@
           },
           {
             "constant": false,
-            "id": 900,
+            "id": 2342,
             "name": "deals",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2955:34:5",
+            "scope": 5229,
+            "src": "2955:34:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
               "typeString": "mapping(uint256 => struct Market.Deal)"
             },
             "typeName": {
-              "id": 899,
+              "id": 2341,
               "keyType": {
-                "id": 897,
+                "id": 2339,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2963:4:5",
+                "src": "2963:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2955:21:5",
+              "src": "2955:21:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Deal)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 898,
+                "id": 2340,
                 "name": "Deal",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 770,
-                "src": "2971:4:5",
+                "referencedDeclaration": 2212,
+                "src": "2971:4:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                  "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                   "typeString": "struct Market.Deal"
                 }
               }
@@ -45188,11 +45188,11 @@
           },
           {
             "constant": false,
-            "id": 905,
+            "id": 2347,
             "name": "dealsID",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "2996:34:5",
+            "scope": 5229,
+            "src": "2996:34:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45200,38 +45200,38 @@
               "typeString": "mapping(address => uint256[])"
             },
             "typeName": {
-              "id": 904,
+              "id": 2346,
               "keyType": {
-                "id": 901,
+                "id": 2343,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3004:7:5",
+                "src": "3004:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2996:26:5",
+              "src": "2996:26:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_uint256_$dyn_storage_$",
                 "typeString": "mapping(address => uint256[])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 902,
+                  "id": 2344,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3015:4:5",
+                  "src": "3015:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 903,
+                "id": 2345,
                 "length": null,
                 "nodeType": "ArrayTypeName",
-                "src": "3015:6:5",
+                "src": "3015:6:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                   "typeString": "uint256[]"
@@ -45243,44 +45243,44 @@
           },
           {
             "constant": false,
-            "id": 909,
+            "id": 2351,
             "name": "requests",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3037:39:5",
+            "scope": 5229,
+            "src": "3037:39:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
               "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
             },
             "typeName": {
-              "id": 908,
+              "id": 2350,
               "keyType": {
-                "id": 906,
+                "id": 2348,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3045:4:5",
+                "src": "3045:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3037:30:5",
+              "src": "3037:30:7",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                 "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 907,
+                "id": 2349,
                 "name": "ChangeRequest",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 810,
-                "src": "3053:13:5",
+                "referencedDeclaration": 2252,
+                "src": "3053:13:7",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                  "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                   "typeString": "struct Market.ChangeRequest"
                 }
               }
@@ -45290,11 +45290,11 @@
           },
           {
             "constant": false,
-            "id": 915,
+            "id": 2357,
             "name": "actualRequests",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3083:39:5",
+            "scope": 5229,
+            "src": "3083:39:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45302,46 +45302,46 @@
               "typeString": "mapping(uint256 => uint256[2])"
             },
             "typeName": {
-              "id": 914,
+              "id": 2356,
               "keyType": {
-                "id": 910,
+                "id": 2352,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3091:4:5",
+                "src": "3091:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3083:24:5",
+              "src": "3083:24:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                 "typeString": "mapping(uint256 => uint256[2])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 911,
+                  "id": 2353,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3099:4:5",
+                  "src": "3099:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 913,
+                "id": 2355,
                 "length": {
                   "argumentTypes": null,
                   "hexValue": "32",
-                  "id": 912,
+                  "id": 2354,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "kind": "number",
                   "lValueRequested": false,
                   "nodeType": "Literal",
-                  "src": "3104:1:5",
+                  "src": "3104:1:7",
                   "subdenomination": null,
                   "typeDescriptions": {
                     "typeIdentifier": null,
@@ -45350,7 +45350,7 @@
                   "value": "2"
                 },
                 "nodeType": "ArrayTypeName",
-                "src": "3099:7:5",
+                "src": "3099:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$2_storage_ptr",
                   "typeString": "uint256[2]"
@@ -45362,11 +45362,11 @@
           },
           {
             "constant": false,
-            "id": 919,
+            "id": 2361,
             "name": "masterOf",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3129:36:5",
+            "scope": 5229,
+            "src": "3129:36:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45374,28 +45374,28 @@
               "typeString": "mapping(address => address)"
             },
             "typeName": {
-              "id": 918,
+              "id": 2360,
               "keyType": {
-                "id": 916,
+                "id": 2358,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3137:7:5",
+                "src": "3137:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3129:27:5",
+              "src": "3129:27:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                 "typeString": "mapping(address => address)"
               },
               "valueType": {
-                "id": 917,
+                "id": 2359,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3148:7:5",
+                "src": "3148:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
@@ -45407,11 +45407,11 @@
           },
           {
             "constant": false,
-            "id": 923,
+            "id": 2365,
             "name": "isMaster",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3172:33:5",
+            "scope": 5229,
+            "src": "3172:33:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45419,28 +45419,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 922,
+              "id": 2364,
               "keyType": {
-                "id": 920,
+                "id": 2362,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3180:7:5",
+                "src": "3180:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3172:24:5",
+              "src": "3172:24:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 921,
+                "id": 2363,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "3191:4:5",
+                "src": "3191:4:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -45452,11 +45452,11 @@
           },
           {
             "constant": false,
-            "id": 929,
+            "id": 2371,
             "name": "masterRequest",
             "nodeType": "VariableDeclaration",
-            "scope": 3787,
-            "src": "3212:58:5",
+            "scope": 5229,
+            "src": "3212:58:7",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45464,46 +45464,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 928,
+              "id": 2370,
               "keyType": {
-                "id": 924,
+                "id": 2366,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3220:7:5",
+                "src": "3220:7:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3212:44:5",
+              "src": "3212:44:7",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 927,
+                "id": 2369,
                 "keyType": {
-                  "id": 925,
+                  "id": 2367,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3239:7:5",
+                  "src": "3239:7:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "3231:24:5",
+                "src": "3231:24:7",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 926,
+                  "id": 2368,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3250:4:5",
+                  "src": "3250:4:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -45516,28 +45516,28 @@
           },
           {
             "body": {
-              "id": 976,
+              "id": 2418,
               "nodeType": "Block",
-              "src": "3438:253:5",
+              "src": "3438:253:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 948,
+                    "id": 2390,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 944,
+                      "id": 2386,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 873,
-                      "src": "3448:5:5",
+                      "referencedDeclaration": 2315,
+                      "src": "3448:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
@@ -45548,12 +45548,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 946,
+                          "id": 2388,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 931,
-                          "src": "3460:6:5",
+                          "referencedDeclaration": 2373,
+                          "src": "3460:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45567,18 +45567,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 945,
+                        "id": 2387,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5514,
-                        "src": "3456:3:5",
+                        "referencedDeclaration": 10080,
+                        "src": "3456:3:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$5514_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 947,
+                      "id": 2389,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45586,40 +45586,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3456:11:5",
+                      "src": "3456:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$5514",
+                        "typeIdentifier": "t_contract$_SNM_$10080",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "3448:19:5",
+                    "src": "3448:19:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$5514",
+                      "typeIdentifier": "t_contract$_SNM_$10080",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 949,
+                  "id": 2391,
                   "nodeType": "ExpressionStatement",
-                  "src": "3448:19:5"
+                  "src": "3448:19:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 954,
+                    "id": 2396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 950,
+                      "id": 2392,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 875,
-                      "src": "3477:2:5",
+                      "referencedDeclaration": 2317,
+                      "src": "3477:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -45630,12 +45630,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 952,
+                          "id": 2394,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 933,
-                          "src": "3492:10:5",
+                          "referencedDeclaration": 2375,
+                          "src": "3492:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45649,18 +45649,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 951,
+                        "id": 2393,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 592,
-                        "src": "3482:9:5",
+                        "referencedDeclaration": 1161,
+                        "src": "3482:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$592_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 953,
+                      "id": 2395,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45668,40 +45668,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3482:21:5",
+                      "src": "3482:21:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "3477:26:5",
+                    "src": "3477:26:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 955,
+                  "id": 2397,
                   "nodeType": "ExpressionStatement",
-                  "src": "3477:26:5"
+                  "src": "3477:26:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 960,
+                    "id": 2402,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 956,
+                      "id": 2398,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 877,
-                      "src": "3513:6:5",
+                      "referencedDeclaration": 2319,
+                      "src": "3513:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -45712,12 +45712,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 958,
+                          "id": 2400,
                           "name": "_oracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 935,
-                          "src": "3532:7:5",
+                          "referencedDeclaration": 2377,
+                          "src": "3532:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45731,18 +45731,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 957,
+                        "id": 2399,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4903,
-                        "src": "3522:9:5",
+                        "referencedDeclaration": 8677,
+                        "src": "3522:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 959,
+                      "id": 2401,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45750,40 +45750,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3522:18:5",
+                      "src": "3522:18:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "3513:27:5",
+                    "src": "3513:27:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 961,
+                  "id": 2403,
                   "nodeType": "ExpressionStatement",
-                  "src": "3513:27:5"
+                  "src": "3513:27:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 966,
+                    "id": 2408,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 962,
+                      "id": 2404,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 879,
-                      "src": "3550:2:5",
+                      "referencedDeclaration": 2321,
+                      "src": "3550:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -45794,12 +45794,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 964,
+                          "id": 2406,
                           "name": "_profileRegistry",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 937,
-                          "src": "3571:16:5",
+                          "referencedDeclaration": 2379,
+                          "src": "3571:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45813,18 +45813,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 963,
+                        "id": 2405,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5469,
-                        "src": "3555:15:5",
+                        "referencedDeclaration": 10035,
+                        "src": "3555:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 965,
+                      "id": 2407,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45832,38 +45832,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3555:33:5",
+                      "src": "3555:33:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "3550:38:5",
+                    "src": "3550:38:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 967,
+                  "id": 2409,
                   "nodeType": "ExpressionStatement",
-                  "src": "3550:38:5"
+                  "src": "3550:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 970,
+                    "id": 2412,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 968,
+                      "id": 2410,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "3598:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "3598:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -45873,43 +45873,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 969,
+                      "id": 2411,
                       "name": "_benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 939,
-                      "src": "3619:19:5",
+                      "referencedDeclaration": 2381,
+                      "src": "3619:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3598:40:5",
+                    "src": "3598:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 971,
+                  "id": 2413,
                   "nodeType": "ExpressionStatement",
-                  "src": "3598:40:5"
+                  "src": "3598:40:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 974,
+                    "id": 2416,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 972,
+                      "id": 2414,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "3648:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "3648:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -45919,31 +45919,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 973,
+                      "id": 2415,
                       "name": "_netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 941,
-                      "src": "3667:17:5",
+                      "referencedDeclaration": 2383,
+                      "src": "3667:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3648:36:5",
+                    "src": "3648:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 975,
+                  "id": 2417,
                   "nodeType": "ExpressionStatement",
-                  "src": "3648:36:5"
+                  "src": "3648:36:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 977,
+            "id": 2419,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -45951,16 +45951,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 942,
+              "id": 2384,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 931,
+                  "id": 2373,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3302:14:5",
+                  "scope": 2419,
+                  "src": "3302:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -45968,10 +45968,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 930,
+                    "id": 2372,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3302:7:5",
+                    "src": "3302:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -45982,11 +45982,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 933,
+                  "id": 2375,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3318:18:5",
+                  "scope": 2419,
+                  "src": "3318:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -45994,10 +45994,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 932,
+                    "id": 2374,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3318:7:5",
+                    "src": "3318:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46008,11 +46008,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 935,
+                  "id": 2377,
                   "name": "_oracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3338:15:5",
+                  "scope": 2419,
+                  "src": "3338:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46020,10 +46020,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 934,
+                    "id": 2376,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3338:7:5",
+                    "src": "3338:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46034,11 +46034,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 937,
+                  "id": 2379,
                   "name": "_profileRegistry",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3355:24:5",
+                  "scope": 2419,
+                  "src": "3355:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46046,10 +46046,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 936,
+                    "id": 2378,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3355:7:5",
+                    "src": "3355:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46060,11 +46060,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 939,
+                  "id": 2381,
                   "name": "_benchmarksQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3381:24:5",
+                  "scope": 2419,
+                  "src": "3381:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46072,10 +46072,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 938,
+                    "id": 2380,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3381:4:5",
+                    "src": "3381:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -46086,11 +46086,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 941,
+                  "id": 2383,
                   "name": "_netflagsQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 977,
-                  "src": "3407:22:5",
+                  "scope": 2419,
+                  "src": "3407:22:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46098,10 +46098,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 940,
+                    "id": 2382,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3407:4:5",
+                    "src": "3407:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -46111,26 +46111,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3301:129:5"
+              "src": "3301:129:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 943,
+              "id": 2385,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3438:0:5"
+              "src": "3438:0:7"
             },
-            "scope": 3787,
-            "src": "3290:401:5",
+            "scope": 5229,
+            "src": "3290:401:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1138,
+              "id": 2580,
               "nodeType": "Block",
-              "src": "4068:1331:5",
+              "src": "4068:1331:7",
               "statements": [
                 {
                   "expression": {
@@ -46139,24 +46139,24 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1009,
+                        "id": 2451,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1005,
+                          "id": 2447,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 990,
-                          "src": "4087:14:5",
+                          "referencedDeclaration": 2432,
+                          "src": "4087:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -46168,32 +46168,32 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1006,
+                              "id": 2448,
                               "name": "ProfileRegistry",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5469,
-                              "src": "4105:15:5",
+                              "referencedDeclaration": 10035,
+                              "src": "4105:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                                 "typeString": "type(contract ProfileRegistry)"
                               }
                             },
-                            "id": 1007,
+                            "id": 2449,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "IdentityLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4931,
-                            "src": "4105:29:5",
+                            "referencedDeclaration": 9497,
+                            "src": "4105:29:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1008,
+                          "id": 2450,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -46201,13 +46201,13 @@
                           "memberName": "ANONYMOUS",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4105:39:5",
+                          "src": "4105:39:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "4087:57:5",
+                        "src": "4087:57:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46221,21 +46221,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1004,
+                      "id": 2446,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4079:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4079:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1010,
+                    "id": 2452,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46243,15 +46243,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4079:66:5",
+                    "src": "4079:66:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1011,
+                  "id": 2453,
                   "nodeType": "ExpressionStatement",
-                  "src": "4079:66:5"
+                  "src": "4079:66:7"
                 },
                 {
                   "expression": {
@@ -46263,7 +46263,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1016,
+                        "id": 2458,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -46272,18 +46272,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1013,
+                            "id": 2455,
                             "name": "_netflags",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 988,
-                            "src": "4163:9:5",
+                            "referencedDeclaration": 2430,
+                            "src": "4163:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "id": 1014,
+                          "id": 2456,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46291,7 +46291,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4163:16:5",
+                          "src": "4163:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46301,18 +46301,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1015,
+                          "id": 2457,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 892,
-                          "src": "4183:16:5",
+                          "referencedDeclaration": 2334,
+                          "src": "4183:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4163:36:5",
+                        "src": "4163:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46326,21 +46326,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1012,
+                      "id": 2454,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4155:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4155:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1017,
+                    "id": 2459,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46348,15 +46348,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4155:45:5",
+                    "src": "4155:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1018,
+                  "id": 2460,
                   "nodeType": "ExpressionStatement",
-                  "src": "4155:45:5"
+                  "src": "4155:45:7"
                 },
                 {
                   "expression": {
@@ -46368,7 +46368,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1023,
+                        "id": 2465,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -46377,18 +46377,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1020,
+                            "id": 2462,
                             "name": "_benchmarks",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 997,
-                            "src": "4218:11:5",
+                            "referencedDeclaration": 2439,
+                            "src": "4218:11:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "id": 1021,
+                          "id": 2463,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46396,7 +46396,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4218:18:5",
+                          "src": "4218:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46406,18 +46406,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1022,
+                          "id": 2464,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 890,
-                          "src": "4240:18:5",
+                          "referencedDeclaration": 2332,
+                          "src": "4240:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4218:40:5",
+                        "src": "4218:40:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46431,21 +46431,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1019,
+                      "id": 2461,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4210:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "4210:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1024,
+                    "id": 2466,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46453,21 +46453,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4210:49:5",
+                    "src": "4210:49:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1025,
+                  "id": 2467,
                   "nodeType": "ExpressionStatement",
-                  "src": "4210:49:5"
+                  "src": "4210:49:7"
                 },
                 {
                   "body": {
-                    "id": 1045,
+                    "id": 2487,
                     "nodeType": "Block",
-                    "src": "4316:71:5",
+                    "src": "4316:71:7",
                     "statements": [
                       {
                         "expression": {
@@ -46479,7 +46479,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 1042,
+                              "id": 2484,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -46488,26 +46488,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1038,
+                                  "id": 2480,
                                   "name": "_benchmarks",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 997,
-                                  "src": "4338:11:5",
+                                  "referencedDeclaration": 2439,
+                                  "src": "4338:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1040,
+                                "id": 2482,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1039,
+                                  "id": 2481,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1027,
-                                  "src": "4350:1:5",
+                                  "referencedDeclaration": 2469,
+                                  "src": "4350:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -46518,7 +46518,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "4338:14:5",
+                                "src": "4338:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -46528,18 +46528,18 @@
                               "operator": "<",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 1041,
+                                "id": 2483,
                                 "name": "MAX_BENCHMARKS_VALUE",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 871,
-                                "src": "4355:20:5",
+                                "referencedDeclaration": 2313,
+                                "src": "4355:20:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "4338:37:5",
+                              "src": "4338:37:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -46553,21 +46553,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1037,
+                            "id": 2479,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "4330:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "4330:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1043,
+                          "id": 2485,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46575,15 +46575,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4330:46:5",
+                          "src": "4330:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1044,
+                        "id": 2486,
                         "nodeType": "ExpressionStatement",
-                        "src": "4330:46:5"
+                        "src": "4330:46:7"
                       }
                     ]
                   },
@@ -46593,19 +46593,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1033,
+                    "id": 2475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1030,
+                      "id": 2472,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1027,
-                      "src": "4287:1:5",
+                      "referencedDeclaration": 2469,
+                      "src": "4287:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -46617,18 +46617,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1031,
+                        "id": 2473,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 997,
-                        "src": "4291:11:5",
+                        "referencedDeclaration": 2439,
+                        "src": "4291:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1032,
+                      "id": 2474,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -46636,31 +46636,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4291:18:5",
+                      "src": "4291:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4287:22:5",
+                    "src": "4287:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1046,
+                  "id": 2488,
                   "initializationExpression": {
                     "assignments": [
-                      1027
+                      2469
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 1027,
+                        "id": 2469,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 1139,
-                        "src": "4275:6:5",
+                        "scope": 2581,
+                        "src": "4275:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -46668,10 +46668,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 1026,
+                          "id": 2468,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4275:4:5",
+                          "src": "4275:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46681,18 +46681,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 1029,
+                    "id": 2471,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1028,
+                      "id": 2470,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4284:1:5",
+                      "src": "4284:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -46701,12 +46701,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4275:10:5"
+                    "src": "4275:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1035,
+                      "id": 2477,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -46714,15 +46714,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4311:3:5",
+                      "src": "4311:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1034,
+                        "id": 2476,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1027,
-                        "src": "4311:1:5",
+                        "referencedDeclaration": 2469,
+                        "src": "4311:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -46733,25 +46733,25 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1036,
+                    "id": 2478,
                     "nodeType": "ExpressionStatement",
-                    "src": "4311:3:5"
+                    "src": "4311:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4270:117:5"
+                  "src": "4270:117:7"
                 },
                 {
                   "assignments": [
-                    1048
+                    2490
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1048,
+                      "id": 2490,
                       "name": "lockedSum",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1139,
-                      "src": "4397:14:5",
+                      "scope": 2581,
+                      "src": "4397:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -46759,10 +46759,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1047,
+                        "id": 2489,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4397:4:5",
+                        "src": "4397:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -46772,18 +46772,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1050,
+                  "id": 2492,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 1049,
+                    "id": 2491,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4414:1:5",
+                    "src": "4414:1:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -46792,30 +46792,30 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4397:18:5"
+                  "src": "4397:18:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 1054,
+                    "id": 2496,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1051,
+                      "id": 2493,
                       "name": "_orderType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 979,
-                      "src": "4430:10:5",
+                      "referencedDeclaration": 2421,
+                      "src": "4430:10:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -46825,18 +46825,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1052,
+                        "id": 2494,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "4444:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "4444:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 1053,
+                      "id": 2495,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -46844,26 +46844,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4444:19:5",
+                      "src": "4444:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "4430:33:5",
+                    "src": "4430:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1098,
+                  "id": 2540,
                   "nodeType": "IfStatement",
-                  "src": "4426:463:5",
+                  "src": "4426:463:7",
                   "trueBody": {
-                    "id": 1097,
+                    "id": 2539,
                     "nodeType": "Block",
-                    "src": "4465:424:5",
+                    "src": "4465:424:7",
                     "statements": [
                       {
                         "condition": {
@@ -46872,19 +46872,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 1057,
+                          "id": 2499,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 1055,
+                            "id": 2497,
                             "name": "_duration",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 983,
-                            "src": "4483:9:5",
+                            "referencedDeclaration": 2425,
+                            "src": "4483:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -46895,14 +46895,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1056,
+                            "id": 2498,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4496:1:5",
+                            "src": "4496:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -46910,7 +46910,7 @@
                             },
                             "value": "0"
                           },
-                          "src": "4483:14:5",
+                          "src": "4483:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -46923,19 +46923,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 1068,
+                            "id": 2510,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 1066,
+                              "id": 2508,
                               "name": "_duration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 983,
-                              "src": "4587:9:5",
+                              "referencedDeclaration": 2425,
+                              "src": "4587:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -46946,14 +46946,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 1067,
+                              "id": 2509,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4599:6:5",
+                              "src": "4599:6:7",
                               "subdenomination": "days",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_86400_by_1",
@@ -46961,33 +46961,33 @@
                               },
                               "value": "1"
                             },
-                            "src": "4587:18:5",
+                            "src": "4587:18:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 1084,
+                            "id": 2526,
                             "nodeType": "Block",
-                            "src": "4693:77:5",
+                            "src": "4693:77:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1082,
+                                  "id": 2524,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 1077,
+                                    "id": 2519,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1048,
-                                    "src": "4711:9:5",
+                                    "referencedDeclaration": 2490,
+                                    "src": "4711:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -47000,12 +47000,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 1079,
+                                        "id": 2521,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 985,
-                                        "src": "4740:6:5",
+                                        "referencedDeclaration": 2427,
+                                        "src": "4740:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47014,14 +47014,14 @@
                                       {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 1080,
+                                        "id": 2522,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "4748:6:5",
+                                        "src": "4748:6:7",
                                         "subdenomination": "days",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_86400_by_1",
@@ -47041,18 +47041,18 @@
                                           "typeString": "int_const 86400"
                                         }
                                       ],
-                                      "id": 1078,
+                                      "id": 2520,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3428,
-                                      "src": "4723:16:5",
+                                      "referencedDeclaration": 4870,
+                                      "src": "4723:16:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 1081,
+                                    "id": 2523,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -47060,48 +47060,48 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4723:32:5",
+                                    "src": "4723:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4711:44:5",
+                                  "src": "4711:44:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 1083,
+                                "id": 2525,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4711:44:5"
+                                "src": "4711:44:7"
                               }
                             ]
                           },
-                          "id": 1085,
+                          "id": 2527,
                           "nodeType": "IfStatement",
-                          "src": "4583:187:5",
+                          "src": "4583:187:7",
                           "trueBody": {
-                            "id": 1076,
+                            "id": 2518,
                             "nodeType": "Block",
-                            "src": "4607:80:5",
+                            "src": "4607:80:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1074,
+                                  "id": 2516,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 1069,
+                                    "id": 2511,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1048,
-                                    "src": "4625:9:5",
+                                    "referencedDeclaration": 2490,
+                                    "src": "4625:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -47114,12 +47114,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 1071,
+                                        "id": 2513,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 985,
-                                        "src": "4654:6:5",
+                                        "referencedDeclaration": 2427,
+                                        "src": "4654:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47127,12 +47127,12 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 1072,
+                                        "id": 2514,
                                         "name": "_duration",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 983,
-                                        "src": "4662:9:5",
+                                        "referencedDeclaration": 2425,
+                                        "src": "4662:9:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47150,18 +47150,18 @@
                                           "typeString": "uint256"
                                         }
                                       ],
-                                      "id": 1070,
+                                      "id": 2512,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3428,
-                                      "src": "4637:16:5",
+                                      "referencedDeclaration": 4870,
+                                      "src": "4637:16:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 1073,
+                                    "id": 2515,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -47169,49 +47169,49 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4637:35:5",
+                                    "src": "4637:35:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4625:47:5",
+                                  "src": "4625:47:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 1075,
+                                "id": 2517,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4625:47:5"
+                                "src": "4625:47:7"
                               }
                             ]
                           }
                         },
-                        "id": 1086,
+                        "id": 2528,
                         "nodeType": "IfStatement",
-                        "src": "4479:291:5",
+                        "src": "4479:291:7",
                         "trueBody": {
-                          "id": 1065,
+                          "id": 2507,
                           "nodeType": "Block",
-                          "src": "4499:78:5",
+                          "src": "4499:78:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1063,
+                                "id": 2505,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 1058,
+                                  "id": 2500,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1048,
-                                  "src": "4517:9:5",
+                                  "referencedDeclaration": 2490,
+                                  "src": "4517:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -47224,12 +47224,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 1060,
+                                      "id": 2502,
                                       "name": "_price",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 985,
-                                      "src": "4546:6:5",
+                                      "referencedDeclaration": 2427,
+                                      "src": "4546:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -47238,14 +47238,14 @@
                                     {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 1061,
+                                      "id": 2503,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "4554:7:5",
+                                      "src": "4554:7:7",
                                       "subdenomination": "hours",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_3600_by_1",
@@ -47265,18 +47265,18 @@
                                         "typeString": "int_const 3600"
                                       }
                                     ],
-                                    "id": 1059,
+                                    "id": 2501,
                                     "name": "CalculatePayment",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3428,
-                                    "src": "4529:16:5",
+                                    "referencedDeclaration": 4870,
+                                    "src": "4529:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) view returns (uint256)"
                                     }
                                   },
-                                  "id": 1062,
+                                  "id": 2504,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -47284,21 +47284,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "4529:33:5",
+                                  "src": "4529:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "4517:45:5",
+                                "src": "4517:45:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 1064,
+                              "id": 2506,
                               "nodeType": "ExpressionStatement",
-                              "src": "4517:45:5"
+                              "src": "4517:45:7"
                             }
                           ]
                         }
@@ -47314,18 +47314,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1090,
+                                    "id": 2532,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "4849:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "4849:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 1091,
+                                  "id": 2533,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -47333,7 +47333,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "4849:10:5",
+                                  "src": "4849:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -47341,25 +47341,25 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 1092,
+                                  "id": 2534,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7814,
-                                  "src": "4861:4:5",
+                                  "referencedDeclaration": 11366,
+                                  "src": "4861:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Market_$3787",
+                                    "typeIdentifier": "t_contract$_Market_$5229",
                                     "typeString": "contract Market"
                                   }
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 1093,
+                                  "id": 2535,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1048,
-                                  "src": "4867:9:5",
+                                  "referencedDeclaration": 2490,
+                                  "src": "4867:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -47373,7 +47373,7 @@
                                     "typeString": "address"
                                   },
                                   {
-                                    "typeIdentifier": "t_contract$_Market_$3787",
+                                    "typeIdentifier": "t_contract$_Market_$5229",
                                     "typeString": "contract Market"
                                   },
                                   {
@@ -47383,32 +47383,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1088,
+                                  "id": 2530,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 873,
-                                  "src": "4830:5:5",
+                                  "referencedDeclaration": 2315,
+                                  "src": "4830:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SNM_$5514",
+                                    "typeIdentifier": "t_contract$_SNM_$10080",
                                     "typeString": "contract SNM"
                                   }
                                 },
-                                "id": 1089,
+                                "id": 2531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transferFrom",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 7607,
-                                "src": "4830:18:5",
+                                "referencedDeclaration": 11153,
+                                "src": "4830:18:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 1094,
+                              "id": 2536,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -47416,7 +47416,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "4830:47:5",
+                              "src": "4830:47:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -47430,21 +47430,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1087,
+                            "id": 2529,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "4822:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "4822:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1095,
+                          "id": 2537,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -47452,15 +47452,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4822:56:5",
+                          "src": "4822:56:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1096,
+                        "id": 2538,
                         "nodeType": "ExpressionStatement",
-                        "src": "4822:56:5"
+                        "src": "4822:56:7"
                       }
                     ]
                   }
@@ -47468,19 +47468,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1104,
+                    "id": 2546,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1099,
+                      "id": 2541,
                       "name": "ordersAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 882,
-                      "src": "4899:12:5",
+                      "referencedDeclaration": 2324,
+                      "src": "4899:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -47494,14 +47494,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1102,
+                          "id": 2544,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4931:1:5",
+                          "src": "4931:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -47519,32 +47519,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1100,
+                          "id": 2542,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 882,
-                          "src": "4914:12:5",
+                          "referencedDeclaration": 2324,
+                          "src": "4914:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1101,
+                        "id": 2543,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "4914:16:5",
+                        "referencedDeclaration": 10795,
+                        "src": "4914:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1103,
+                      "id": 2545,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -47552,34 +47552,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4914:19:5",
+                      "src": "4914:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4899:34:5",
+                    "src": "4899:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1105,
+                  "id": 2547,
                   "nodeType": "ExpressionStatement",
-                  "src": "4899:34:5"
+                  "src": "4899:34:7"
                 },
                 {
                   "assignments": [
-                    1107
+                    2549
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1107,
+                      "id": 2549,
                       "name": "orderId",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1139,
-                      "src": "4943:15:5",
+                      "scope": 2581,
+                      "src": "4943:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -47587,10 +47587,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1106,
+                        "id": 2548,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4943:7:5",
+                        "src": "4943:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47600,27 +47600,27 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1109,
+                  "id": 2551,
                   "initialValue": {
                     "argumentTypes": null,
-                    "id": 1108,
+                    "id": 2550,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 882,
-                    "src": "4961:12:5",
+                    "referencedDeclaration": 2324,
+                    "src": "4961:12:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4943:30:5"
+                  "src": "4943:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1130,
+                    "id": 2572,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -47629,26 +47629,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1110,
+                        "id": 2552,
                         "name": "orders",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 896,
-                        "src": "4984:6:5",
+                        "referencedDeclaration": 2338,
+                        "src": "4984:6:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                         }
                       },
-                      "id": 1112,
+                      "id": 2554,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1111,
+                        "id": 2553,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1107,
-                        "src": "4991:7:5",
+                        "referencedDeclaration": 2549,
+                        "src": "4991:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47659,9 +47659,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4984:15:5",
+                      "src": "4984:15:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_storage",
+                        "typeIdentifier": "t_struct$_Order_$2241_storage",
                         "typeString": "struct Market.Order storage ref"
                       }
                     },
@@ -47672,14 +47672,14 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 1114,
+                          "id": 2556,
                           "name": "_orderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 979,
-                          "src": "5021:10:5",
+                          "referencedDeclaration": 2421,
+                          "src": "5021:10:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -47687,18 +47687,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1115,
+                            "id": 2557,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "5045:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "5045:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1116,
+                          "id": 2558,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -47706,9 +47706,9 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5045:24:5",
+                          "src": "5045:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -47716,18 +47716,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1117,
+                            "id": 2559,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "5083:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "5083:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1118,
+                          "id": 2560,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -47735,7 +47735,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5083:10:5",
+                          "src": "5083:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47743,12 +47743,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1119,
+                          "id": 2561,
                           "name": "_id_counterparty",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 981,
-                          "src": "5107:16:5",
+                          "referencedDeclaration": 2423,
+                          "src": "5107:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47756,12 +47756,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1120,
+                          "id": 2562,
                           "name": "_duration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 983,
-                          "src": "5137:9:5",
+                          "referencedDeclaration": 2425,
+                          "src": "5137:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47769,12 +47769,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1121,
+                          "id": 2563,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 985,
-                          "src": "5160:6:5",
+                          "referencedDeclaration": 2427,
+                          "src": "5160:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47782,12 +47782,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1122,
+                          "id": 2564,
                           "name": "_netflags",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 988,
-                          "src": "5180:9:5",
+                          "referencedDeclaration": 2430,
+                          "src": "5180:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                             "typeString": "bool[] memory"
@@ -47795,25 +47795,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1123,
+                          "id": 2565,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 990,
-                          "src": "5203:14:5",
+                          "referencedDeclaration": 2432,
+                          "src": "5203:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1124,
+                          "id": 2566,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 992,
-                          "src": "5231:10:5",
+                          "referencedDeclaration": 2434,
+                          "src": "5231:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47821,12 +47821,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1125,
+                          "id": 2567,
                           "name": "_tag",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 994,
-                          "src": "5255:4:5",
+                          "referencedDeclaration": 2436,
+                          "src": "5255:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -47834,12 +47834,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1126,
+                          "id": 2568,
                           "name": "_benchmarks",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "5273:11:5",
+                          "referencedDeclaration": 2439,
+                          "src": "5273:11:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                             "typeString": "uint64[] memory"
@@ -47847,12 +47847,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1127,
+                          "id": 2569,
                           "name": "lockedSum",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1048,
-                          "src": "5298:9:5",
+                          "referencedDeclaration": 2490,
+                          "src": "5298:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47861,14 +47861,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1128,
+                          "id": 2570,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "5321:1:5",
+                          "src": "5321:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -47880,11 +47880,11 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
                           {
@@ -47908,7 +47908,7 @@
                             "typeString": "bool[] memory"
                           },
                           {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           },
                           {
@@ -47932,18 +47932,18 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 1113,
+                        "id": 2555,
                         "name": "Order",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 799,
-                        "src": "5002:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "5002:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Order_$799_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Order_$2241_storage_ptr_$",
                           "typeString": "type(struct Market.Order storage pointer)"
                         }
                       },
-                      "id": 1129,
+                      "id": 2571,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -47951,21 +47951,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5002:330:5",
+                      "src": "5002:330:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "src": "4984:348:5",
+                    "src": "4984:348:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
-                  "id": 1131,
+                  "id": 2573,
                   "nodeType": "ExpressionStatement",
-                  "src": "4984:348:5"
+                  "src": "4984:348:7"
                 },
                 {
                   "eventCall": {
@@ -47973,12 +47973,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1133,
+                        "id": 2575,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1107,
-                        "src": "5360:7:5",
+                        "referencedDeclaration": 2549,
+                        "src": "5360:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47992,18 +47992,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1132,
+                      "id": 2574,
                       "name": "OrderPlaced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 814,
-                      "src": "5348:11:5",
+                      "referencedDeclaration": 2256,
+                      "src": "5348:11:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1134,
+                    "id": 2576,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48011,91 +48011,91 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5348:20:5",
+                    "src": "5348:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1135,
+                  "id": 2577,
                   "nodeType": "EmitStatement",
-                  "src": "5343:25:5"
+                  "src": "5343:25:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1136,
+                    "id": 2578,
                     "name": "orderId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1107,
-                    "src": "5385:7:5",
+                    "referencedDeclaration": 2549,
+                    "src": "5385:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1003,
-                  "id": 1137,
+                  "functionReturnParameters": 2445,
+                  "id": 2579,
                   "nodeType": "Return",
-                  "src": "5378:14:5"
+                  "src": "5378:14:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1139,
+            "id": 2581,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1000,
+                "id": 2442,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 999,
+                  "id": 2441,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "4033:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "4033:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4033:13:5"
+                "src": "4033:13:7"
               }
             ],
             "name": "PlaceOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 998,
+              "id": 2440,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 979,
+                  "id": 2421,
                   "name": "_orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3767:20:5",
+                  "scope": 2581,
+                  "src": "3767:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 978,
+                    "id": 2420,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "3767:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "3767:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -48104,11 +48104,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 981,
+                  "id": 2423,
                   "name": "_id_counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3797:24:5",
+                  "scope": 2581,
+                  "src": "3797:24:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48116,10 +48116,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 980,
+                    "id": 2422,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3797:7:5",
+                    "src": "3797:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -48130,11 +48130,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 983,
+                  "id": 2425,
                   "name": "_duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3831:14:5",
+                  "scope": 2581,
+                  "src": "3831:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48142,10 +48142,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 982,
+                    "id": 2424,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3831:4:5",
+                    "src": "3831:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48156,11 +48156,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 985,
+                  "id": 2427,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3855:11:5",
+                  "scope": 2581,
+                  "src": "3855:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48168,10 +48168,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 984,
+                    "id": 2426,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3855:4:5",
+                    "src": "3855:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48182,11 +48182,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 988,
+                  "id": 2430,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3876:16:5",
+                  "scope": 2581,
+                  "src": "3876:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48195,19 +48195,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 986,
+                      "id": 2428,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "3876:4:5",
+                      "src": "3876:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 987,
+                    "id": 2429,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "3876:6:5",
+                    "src": "3876:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -48218,26 +48218,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 990,
+                  "id": 2432,
                   "name": "_identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3902:44:5",
+                  "scope": 2581,
+                  "src": "3902:44:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 989,
+                    "id": 2431,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "3902:29:5",
+                    "referencedDeclaration": 9497,
+                    "src": "3902:29:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -48246,11 +48246,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 992,
+                  "id": 2434,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3956:18:5",
+                  "scope": 2581,
+                  "src": "3956:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48258,10 +48258,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 991,
+                    "id": 2433,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3956:7:5",
+                    "src": "3956:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -48272,11 +48272,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 994,
+                  "id": 2436,
                   "name": "_tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "3984:12:5",
+                  "scope": 2581,
+                  "src": "3984:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48284,10 +48284,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 993,
+                    "id": 2435,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3984:7:5",
+                    "src": "3984:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -48298,11 +48298,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 997,
+                  "id": 2439,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "4006:20:5",
+                  "scope": 2581,
+                  "src": "4006:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48311,19 +48311,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 995,
+                      "id": 2437,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "4006:6:5",
+                      "src": "4006:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 996,
+                    "id": 2438,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "4006:8:5",
+                    "src": "4006:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -48333,20 +48333,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3757:275:5"
+              "src": "3757:275:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1003,
+              "id": 2445,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1002,
+                  "id": 2444,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1139,
-                  "src": "4063:4:5",
+                  "scope": 2581,
+                  "src": "4063:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48354,10 +48354,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1001,
+                    "id": 2443,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4063:4:5",
+                    "src": "4063:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48367,19 +48367,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4062:6:5"
+              "src": "4062:6:7"
             },
-            "scope": 3787,
-            "src": "3738:1661:5",
+            "scope": 5229,
+            "src": "3738:1661:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1198,
+              "id": 2640,
               "nodeType": "Block",
-              "src": "5461:375:5",
+              "src": "5461:375:7",
               "statements": [
                 {
                   "expression": {
@@ -48391,19 +48391,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1149,
+                        "id": 2591,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1147,
+                          "id": 2589,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1141,
-                          "src": "5479:7:5",
+                          "referencedDeclaration": 2583,
+                          "src": "5479:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -48413,18 +48413,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1148,
+                          "id": 2590,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 882,
-                          "src": "5490:12:5",
+                          "referencedDeclaration": 2324,
+                          "src": "5490:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "5479:23:5",
+                        "src": "5479:23:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48438,21 +48438,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1146,
+                      "id": 2588,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5471:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5471:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1150,
+                    "id": 2592,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48460,15 +48460,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5471:32:5",
+                    "src": "5471:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1151,
+                  "id": 2593,
                   "nodeType": "ExpressionStatement",
-                  "src": "5471:32:5"
+                  "src": "5471:32:7"
                 },
                 {
                   "expression": {
@@ -48477,10 +48477,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 1159,
+                        "id": 2601,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48491,26 +48491,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1153,
+                              "id": 2595,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 896,
-                              "src": "5521:6:5",
+                              "referencedDeclaration": 2338,
+                              "src": "5521:6:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 1155,
+                            "id": 2597,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1154,
+                              "id": 2596,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1141,
-                              "src": "5528:7:5",
+                              "referencedDeclaration": 2583,
+                              "src": "5528:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -48521,23 +48521,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5521:15:5",
+                            "src": "5521:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_storage",
+                              "typeIdentifier": "t_struct$_Order_$2241_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 1156,
+                          "id": 2598,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 774,
-                          "src": "5521:27:5",
+                          "referencedDeclaration": 2216,
+                          "src": "5521:27:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -48547,18 +48547,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1157,
+                            "id": 2599,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "5552:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "5552:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1158,
+                          "id": 2600,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -48566,13 +48566,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5552:24:5",
+                          "src": "5552:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "5521:55:5",
+                        "src": "5521:55:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48586,21 +48586,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1152,
+                      "id": 2594,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5513:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5513:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1160,
+                    "id": 2602,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48608,15 +48608,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5513:64:5",
+                    "src": "5513:64:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1161,
+                  "id": 2603,
                   "nodeType": "ExpressionStatement",
-                  "src": "5513:64:5"
+                  "src": "5513:64:7"
                 },
                 {
                   "expression": {
@@ -48628,7 +48628,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 1169,
+                        "id": 2611,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48639,26 +48639,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1163,
+                              "id": 2605,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 896,
-                              "src": "5595:6:5",
+                              "referencedDeclaration": 2338,
+                              "src": "5595:6:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 1165,
+                            "id": 2607,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1164,
+                              "id": 2606,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1141,
-                              "src": "5602:7:5",
+                              "referencedDeclaration": 2583,
+                              "src": "5602:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -48669,21 +48669,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5595:15:5",
+                            "src": "5595:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_storage",
+                              "typeIdentifier": "t_struct$_Order_$2241_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 1166,
+                          "id": 2608,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "5595:22:5",
+                          "referencedDeclaration": 2218,
+                          "src": "5595:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -48695,18 +48695,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1167,
+                            "id": 2609,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "5621:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "5621:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1168,
+                          "id": 2610,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -48714,13 +48714,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5621:10:5",
+                          "src": "5621:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "5595:36:5",
+                        "src": "5595:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48734,21 +48734,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1162,
+                      "id": 2604,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5587:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5587:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1170,
+                    "id": 2612,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48756,15 +48756,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5587:45:5",
+                    "src": "5587:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1171,
+                  "id": 2613,
                   "nodeType": "ExpressionStatement",
-                  "src": "5587:45:5"
+                  "src": "5587:45:7"
                 },
                 {
                   "expression": {
@@ -48777,18 +48777,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1175,
+                              "id": 2617,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "5666:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "5666:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1176,
+                            "id": 2618,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -48796,7 +48796,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "5666:10:5",
+                            "src": "5666:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -48808,26 +48808,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1177,
+                                "id": 2619,
                                 "name": "orders",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 896,
-                                "src": "5678:6:5",
+                                "referencedDeclaration": 2338,
+                                "src": "5678:6:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                                 }
                               },
-                              "id": 1179,
+                              "id": 2621,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1178,
+                                "id": 2620,
                                 "name": "orderID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1141,
-                                "src": "5685:7:5",
+                                "referencedDeclaration": 2583,
+                                "src": "5685:7:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -48838,21 +48838,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "5678:15:5",
+                              "src": "5678:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_storage",
+                                "typeIdentifier": "t_struct$_Order_$2241_storage",
                                 "typeString": "struct Market.Order storage ref"
                               }
                             },
-                            "id": 1180,
+                            "id": 2622,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "frozenSum",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 796,
-                            "src": "5678:25:5",
+                            "referencedDeclaration": 2238,
+                            "src": "5678:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -48872,32 +48872,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1173,
+                            "id": 2615,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "5651:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "5651:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 1174,
+                          "id": 2616,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "5651:14:5",
+                          "referencedDeclaration": 10965,
+                          "src": "5651:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 1181,
+                        "id": 2623,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48905,7 +48905,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5651:53:5",
+                        "src": "5651:53:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48919,21 +48919,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1172,
+                      "id": 2614,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5643:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5643:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1182,
+                    "id": 2624,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48941,20 +48941,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5643:62:5",
+                    "src": "5643:62:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1183,
+                  "id": 2625,
                   "nodeType": "ExpressionStatement",
-                  "src": "5643:62:5"
+                  "src": "5643:62:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1190,
+                    "id": 2632,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48965,26 +48965,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1184,
+                          "id": 2626,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "5715:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "5715:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1186,
+                        "id": 2628,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1185,
+                          "id": 2627,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1141,
-                          "src": "5722:7:5",
+                          "referencedDeclaration": 2583,
+                          "src": "5722:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -48995,23 +48995,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5715:15:5",
+                        "src": "5715:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1187,
+                      "id": 2629,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "5715:27:5",
+                      "referencedDeclaration": 2216,
+                      "src": "5715:27:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -49021,18 +49021,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1188,
+                        "id": 2630,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "5745:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "5745:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1189,
+                      "id": 2631,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -49040,21 +49040,21 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5745:26:5",
+                      "src": "5745:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "5715:56:5",
+                    "src": "5715:56:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1191,
+                  "id": 2633,
                   "nodeType": "ExpressionStatement",
-                  "src": "5715:56:5"
+                  "src": "5715:56:7"
                 },
                 {
                   "eventCall": {
@@ -49062,12 +49062,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1193,
+                        "id": 2635,
                         "name": "orderID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1141,
-                        "src": "5800:7:5",
+                        "referencedDeclaration": 2583,
+                        "src": "5800:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -49081,18 +49081,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1192,
+                      "id": 2634,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "5787:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "5787:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1194,
+                    "id": 2636,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49100,28 +49100,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5787:21:5",
+                    "src": "5787:21:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1195,
+                  "id": 2637,
                   "nodeType": "EmitStatement",
-                  "src": "5782:26:5"
+                  "src": "5782:26:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1196,
+                    "id": 2638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "5825:4:5",
+                    "src": "5825:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -49129,15 +49129,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1145,
-                  "id": 1197,
+                  "functionReturnParameters": 2587,
+                  "id": 2639,
                   "nodeType": "Return",
-                  "src": "5818:11:5"
+                  "src": "5818:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1199,
+            "id": 2641,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -49145,16 +49145,16 @@
             "name": "CancelOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1142,
+              "id": 2584,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1141,
+                  "id": 2583,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1199,
-                  "src": "5426:12:5",
+                  "scope": 2641,
+                  "src": "5426:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -49162,10 +49162,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1140,
+                    "id": 2582,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5426:4:5",
+                    "src": "5426:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -49175,20 +49175,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5425:14:5"
+              "src": "5425:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1145,
+              "id": 2587,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1144,
+                  "id": 2586,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1199,
-                  "src": "5456:4:5",
+                  "scope": 2641,
+                  "src": "5456:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -49196,10 +49196,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1143,
+                    "id": 2585,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5456:4:5",
+                    "src": "5456:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -49209,47 +49209,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5455:6:5"
+              "src": "5455:6:7"
             },
-            "scope": 3787,
-            "src": "5405:431:5",
+            "scope": 5229,
+            "src": "5405:431:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1315,
+              "id": 2757,
               "nodeType": "Block",
-              "src": "5914:806:5",
+              "src": "5914:806:7",
               "statements": [
                 {
                   "assignments": [
-                    1209
+                    2651
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1209,
+                      "id": 2651,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1316,
-                      "src": "5924:16:5",
+                      "scope": 2758,
+                      "src": "5924:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1208,
+                        "id": 2650,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "5924:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "5924:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -49257,31 +49257,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1213,
+                  "id": 2655,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1210,
+                      "id": 2652,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "5943:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "5943:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1212,
+                    "id": 2654,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1211,
+                      "id": 2653,
                       "name": "askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1201,
-                      "src": "5950:5:5",
+                      "referencedDeclaration": 2643,
+                      "src": "5950:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -49292,14 +49292,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "5943:13:5",
+                    "src": "5943:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "5924:32:5"
+                  "src": "5924:32:7"
                 },
                 {
                   "expression": {
@@ -49308,10 +49308,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1219,
+                        "id": 2661,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49320,28 +49320,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1215,
+                            "id": 2657,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "5974:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "5974:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1216,
+                          "id": 2658,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "5974:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "5974:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -49351,18 +49351,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1217,
+                            "id": 2659,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "5991:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "5991:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1218,
+                          "id": 2660,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -49370,13 +49370,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5991:19:5",
+                          "src": "5991:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "5974:36:5",
+                        "src": "5974:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49390,21 +49390,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1214,
+                      "id": 2656,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5966:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "5966:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1220,
+                    "id": 2662,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49412,15 +49412,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5966:45:5",
+                    "src": "5966:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1221,
+                  "id": 2663,
                   "nodeType": "ExpressionStatement",
-                  "src": "5966:45:5"
+                  "src": "5966:45:7"
                 },
                 {
                   "expression": {
@@ -49429,10 +49429,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 1227,
+                        "id": 2669,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49441,28 +49441,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1223,
+                            "id": 2665,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6029:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6029:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1224,
+                          "id": 2666,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 774,
-                          "src": "6029:15:5",
+                          "referencedDeclaration": 2216,
+                          "src": "6029:15:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -49472,18 +49472,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1225,
+                            "id": 2667,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 730,
-                            "src": "6048:11:5",
+                            "referencedDeclaration": 2172,
+                            "src": "6048:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 1226,
+                          "id": 2668,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -49491,13 +49491,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "6048:24:5",
+                          "src": "6048:24:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "6029:43:5",
+                        "src": "6029:43:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49511,21 +49511,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1222,
+                      "id": 2664,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6021:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6021:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1228,
+                    "id": 2670,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49533,15 +49533,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6021:52:5",
+                    "src": "6021:52:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1229,
+                  "id": 2671,
                   "nodeType": "ExpressionStatement",
-                  "src": "6021:52:5"
+                  "src": "6021:52:7"
                 },
                 {
                   "expression": {
@@ -49553,7 +49553,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1234,
+                        "id": 2676,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49562,26 +49562,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1231,
+                            "id": 2673,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6092:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6092:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1232,
+                          "id": 2674,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "6092:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "6092:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -49591,18 +49591,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1233,
+                          "id": 2675,
                           "name": "buyoutDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1203,
-                          "src": "6108:14:5",
+                          "referencedDeclaration": 2645,
+                          "src": "6108:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "6092:30:5",
+                        "src": "6092:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49616,21 +49616,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1230,
+                      "id": 2672,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6084:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6084:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1235,
+                    "id": 2677,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49638,15 +49638,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6084:39:5",
+                    "src": "6084:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1236,
+                  "id": 2678,
                   "nodeType": "ExpressionStatement",
-                  "src": "6084:39:5"
+                  "src": "6084:39:7"
                 },
                 {
                   "expression": {
@@ -49655,10 +49655,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1245,
+                        "id": 2687,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49670,18 +49670,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1240,
+                                "id": 2682,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "6160:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "6160:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1241,
+                              "id": 2683,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -49689,7 +49689,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6160:10:5",
+                              "src": "6160:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -49705,32 +49705,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1238,
+                              "id": 2680,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "6141:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "6141:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1239,
+                            "id": 2681,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "6141:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "6141:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1242,
+                          "id": 2684,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -49738,9 +49738,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6141:30:5",
+                          "src": "6141:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -49750,32 +49750,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1243,
+                            "id": 2685,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1209,
-                            "src": "6175:3:5",
+                            "referencedDeclaration": 2651,
+                            "src": "6175:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1244,
+                          "id": 2686,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "6175:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "6175:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "6141:51:5",
+                        "src": "6141:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49789,21 +49789,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1237,
+                      "id": 2679,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6133:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6133:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1246,
+                    "id": 2688,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49811,15 +49811,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6133:60:5",
+                    "src": "6133:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1247,
+                  "id": 2689,
                   "nodeType": "ExpressionStatement",
-                  "src": "6133:60:5"
+                  "src": "6133:60:7"
                 },
                 {
                   "expression": {
@@ -49831,7 +49831,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1269,
+                        "id": 2711,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49842,7 +49842,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1259,
+                          "id": 2701,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -49854,18 +49854,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1251,
+                                  "id": 2693,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "6220:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "6220:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1252,
+                                "id": 2694,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -49873,7 +49873,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6220:10:5",
+                                "src": "6220:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -49886,26 +49886,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1254,
+                                      "id": 2696,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1209,
-                                      "src": "6242:3:5",
+                                      "referencedDeclaration": 2651,
+                                      "src": "6242:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1255,
+                                    "id": 2697,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 776,
-                                    "src": "6242:10:5",
+                                    "referencedDeclaration": 2218,
+                                    "src": "6242:10:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -49919,18 +49919,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 1253,
+                                  "id": 2695,
                                   "name": "GetMaster",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2856,
-                                  "src": "6232:9:5",
+                                  "referencedDeclaration": 4298,
+                                  "src": "6232:9:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                     "typeString": "function (address) view returns (address)"
                                   }
                                 },
-                                "id": 1256,
+                                "id": 2698,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -49938,7 +49938,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "6232:21:5",
+                                "src": "6232:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -49958,32 +49958,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1249,
+                                "id": 2691,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "6211:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "6211:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1250,
+                              "id": 2692,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "6211:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "6211:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1257,
+                            "id": 2699,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -49991,7 +49991,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6211:43:5",
+                            "src": "6211:43:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -50002,14 +50002,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1258,
+                            "id": 2700,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6258:5:5",
+                            "src": "6258:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -50017,7 +50017,7 @@
                             },
                             "value": "false"
                           },
-                          "src": "6211:52:5",
+                          "src": "6211:52:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -50031,7 +50031,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1268,
+                          "id": 2710,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -50043,26 +50043,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1262,
+                                  "id": 2704,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1209,
-                                  "src": "6276:3:5",
+                                  "referencedDeclaration": 2651,
+                                  "src": "6276:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1263,
+                                "id": 2705,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "6276:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "6276:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -50072,18 +50072,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1264,
+                                  "id": 2706,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "6288:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "6288:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1265,
+                                "id": 2707,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -50091,7 +50091,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6288:10:5",
+                                "src": "6288:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -50111,32 +50111,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1260,
+                                "id": 2702,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "6267:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "6267:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1261,
+                              "id": 2703,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "6267:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "6267:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1266,
+                            "id": 2708,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -50144,7 +50144,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6267:32:5",
+                            "src": "6267:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -50155,14 +50155,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1267,
+                            "id": 2709,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6303:5:5",
+                            "src": "6303:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -50170,13 +50170,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "6267:41:5",
+                          "src": "6267:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6211:97:5",
+                        "src": "6211:97:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -50190,21 +50190,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1248,
+                      "id": 2690,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6203:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6203:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1270,
+                    "id": 2712,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50212,15 +50212,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6203:106:5",
+                    "src": "6203:106:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1271,
+                  "id": 2713,
                   "nodeType": "ExpressionStatement",
-                  "src": "6203:106:5"
+                  "src": "6203:106:7"
                 },
                 {
                   "expression": {
@@ -50232,7 +50232,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1281,
+                        "id": 2723,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50244,26 +50244,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1275,
+                                "id": 2717,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1209,
-                                "src": "6336:3:5",
+                                "referencedDeclaration": 2651,
+                                "src": "6336:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1276,
+                              "id": 2718,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blacklist",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 789,
-                              "src": "6336:13:5",
+                              "referencedDeclaration": 2231,
+                              "src": "6336:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -50273,18 +50273,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1277,
+                                "id": 2719,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "6351:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "6351:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1278,
+                              "id": 2720,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -50292,7 +50292,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6351:10:5",
+                              "src": "6351:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -50312,32 +50312,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1273,
+                              "id": 2715,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 875,
-                              "src": "6327:2:5",
+                              "referencedDeclaration": 2317,
+                              "src": "6327:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$592",
+                                "typeIdentifier": "t_contract$_Blacklist_$1161",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 1274,
+                            "id": 2716,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 460,
-                            "src": "6327:8:5",
+                            "referencedDeclaration": 1029,
+                            "src": "6327:8:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 1279,
+                          "id": 2721,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -50345,7 +50345,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6327:35:5",
+                          "src": "6327:35:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -50356,14 +50356,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 1280,
+                          "id": 2722,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "6366:5:5",
+                          "src": "6366:5:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -50371,7 +50371,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "6327:44:5",
+                        "src": "6327:44:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -50385,21 +50385,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1272,
+                      "id": 2714,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6319:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6319:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1282,
+                    "id": 2724,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50407,15 +50407,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6319:53:5",
+                    "src": "6319:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1283,
+                  "id": 2725,
                   "nodeType": "ExpressionStatement",
-                  "src": "6319:53:5"
+                  "src": "6319:53:7"
                 },
                 {
                   "expression": {
@@ -50425,18 +50425,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1285,
+                          "id": 2727,
                           "name": "OrderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 726,
-                          "src": "6407:9:5",
+                          "referencedDeclaration": 2168,
+                          "src": "6407:9:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                            "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                             "typeString": "type(enum Market.OrderType)"
                           }
                         },
-                        "id": 1286,
+                        "id": 2728,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50444,9 +50444,9 @@
                         "memberName": "ORDER_BID",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6407:19:5",
+                        "src": "6407:19:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -50457,26 +50457,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1288,
+                              "id": 2730,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1209,
-                              "src": "6450:3:5",
+                              "referencedDeclaration": 2651,
+                              "src": "6450:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1289,
+                            "id": 2731,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "author",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 776,
-                            "src": "6450:10:5",
+                            "referencedDeclaration": 2218,
+                            "src": "6450:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -50490,18 +50490,18 @@
                               "typeString": "address"
                             }
                           ],
-                          "id": 1287,
+                          "id": 2729,
                           "name": "GetMaster",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2856,
-                          "src": "6440:9:5",
+                          "referencedDeclaration": 4298,
+                          "src": "6440:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                             "typeString": "function (address) view returns (address)"
                           }
                         },
-                        "id": 1290,
+                        "id": 2732,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50509,7 +50509,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6440:21:5",
+                        "src": "6440:21:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -50517,12 +50517,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1291,
+                        "id": 2733,
                         "name": "buyoutDuration",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1203,
-                        "src": "6475:14:5",
+                        "referencedDeclaration": 2645,
+                        "src": "6475:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50532,26 +50532,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1292,
+                          "id": 2734,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6503:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6503:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1293,
+                        "id": 2735,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 782,
-                        "src": "6503:9:5",
+                        "referencedDeclaration": 2224,
+                        "src": "6503:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50561,26 +50561,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1294,
+                          "id": 2736,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6526:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6526:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1295,
+                        "id": 2737,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "6526:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "6526:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -50592,32 +50592,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1296,
+                            "id": 2738,
                             "name": "ProfileRegistry",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5469,
-                            "src": "6552:15:5",
+                            "referencedDeclaration": 10035,
+                            "src": "6552:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                               "typeString": "type(contract ProfileRegistry)"
                             }
                           },
-                          "id": 1297,
+                          "id": 2739,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "IdentityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4931,
-                          "src": "6552:29:5",
+                          "referencedDeclaration": 9497,
+                          "src": "6552:29:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                             "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                           }
                         },
-                        "id": 1298,
+                        "id": 2740,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50625,9 +50625,9 @@
                         "memberName": "ANONYMOUS",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6552:39:5",
+                        "src": "6552:39:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -50637,14 +50637,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1300,
+                            "id": 2742,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6613:1:5",
+                            "src": "6613:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -50660,20 +50660,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 1299,
+                          "id": 2741,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6605:7:5",
+                          "src": "6605:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 1301,
+                        "id": 2743,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50681,7 +50681,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6605:10:5",
+                        "src": "6605:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -50693,14 +50693,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 1303,
+                            "id": 2745,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6637:1:5",
+                            "src": "6637:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -50716,20 +50716,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 1302,
+                          "id": 2744,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6629:7:5",
+                          "src": "6629:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_bytes32_$",
                             "typeString": "type(bytes32)"
                           },
                           "typeName": "bytes32"
                         },
-                        "id": 1304,
+                        "id": 2746,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50737,7 +50737,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6629:10:5",
+                        "src": "6629:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -50747,26 +50747,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1305,
+                          "id": 2747,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1209,
-                          "src": "6653:3:5",
+                          "referencedDeclaration": 2651,
+                          "src": "6653:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1306,
+                        "id": 2748,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "6653:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "6653:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -50776,7 +50776,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
                         {
@@ -50796,7 +50796,7 @@
                           "typeString": "bool[] memory"
                         },
                         {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
                         {
@@ -50812,18 +50812,18 @@
                           "typeString": "uint64[] memory"
                         }
                       ],
-                      "id": 1284,
+                      "id": 2726,
                       "name": "PlaceOrder",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1139,
-                      "src": "6383:10:5",
+                      "referencedDeclaration": 2581,
+                      "src": "6383:10:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$726_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$4931_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$2168_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
                         "typeString": "function (enum Market.OrderType,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory) returns (uint256)"
                       }
                     },
-                    "id": 1307,
+                    "id": 2749,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50831,15 +50831,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6383:285:5",
+                    "src": "6383:285:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1308,
+                  "id": 2750,
                   "nodeType": "ExpressionStatement",
-                  "src": "6383:285:5"
+                  "src": "6383:285:7"
                 },
                 {
                   "expression": {
@@ -50847,12 +50847,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1310,
+                        "id": 2752,
                         "name": "askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1201,
-                        "src": "6688:5:5",
+                        "referencedDeclaration": 2643,
+                        "src": "6688:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50863,18 +50863,18 @@
                         "arguments": [],
                         "expression": {
                           "argumentTypes": [],
-                          "id": 1311,
+                          "id": 2753,
                           "name": "GetOrdersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2910,
-                          "src": "6695:15:5",
+                          "referencedDeclaration": 4352,
+                          "src": "6695:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                             "typeString": "function () view returns (uint256)"
                           }
                         },
-                        "id": 1312,
+                        "id": 2754,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50882,7 +50882,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6695:17:5",
+                        "src": "6695:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50900,18 +50900,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1309,
+                      "id": 2751,
                       "name": "OpenDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1743,
-                      "src": "6679:8:5",
+                      "referencedDeclaration": 3185,
+                      "src": "6679:8:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 1313,
+                    "id": 2755,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50919,57 +50919,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6679:34:5",
+                    "src": "6679:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1314,
+                  "id": 2756,
                   "nodeType": "ExpressionStatement",
-                  "src": "6679:34:5"
+                  "src": "6679:34:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1316,
+            "id": 2758,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1206,
+                "id": 2648,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1205,
+                  "id": 2647,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "5900:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "5900:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5900:13:5"
+                "src": "5900:13:7"
               }
             ],
             "name": "QuickBuy",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1204,
+              "id": 2646,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1201,
+                  "id": 2643,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "5860:10:5",
+                  "scope": 2758,
+                  "src": "5860:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -50977,10 +50977,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1200,
+                    "id": 2642,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5860:4:5",
+                    "src": "5860:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -50991,11 +50991,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1203,
+                  "id": 2645,
                   "name": "buyoutDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "5872:19:5",
+                  "scope": 2758,
+                  "src": "5872:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -51003,10 +51003,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1202,
+                    "id": 2644,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5872:4:5",
+                    "src": "5872:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -51016,54 +51016,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5859:33:5"
+              "src": "5859:33:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1207,
+              "id": 2649,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5914:0:5"
+              "src": "5914:0:7"
             },
-            "scope": 3787,
-            "src": "5842:878:5",
+            "scope": 5229,
+            "src": "5842:878:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1742,
+              "id": 3184,
               "nodeType": "Block",
-              "src": "6814:2981:5",
+              "src": "6814:2981:7",
               "statements": [
                 {
                   "assignments": [
-                    1326
+                    2768
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1326,
+                      "id": 2768,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "6824:16:5",
+                      "scope": 3185,
+                      "src": "6824:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1325,
+                        "id": 2767,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "6824:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "6824:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -51071,31 +51071,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1330,
+                  "id": 2772,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1327,
+                      "id": 2769,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "6843:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "6843:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1329,
+                    "id": 2771,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1328,
+                      "id": 2770,
                       "name": "_askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1318,
-                      "src": "6850:6:5",
+                      "referencedDeclaration": 2760,
+                      "src": "6850:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -51106,42 +51106,42 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6843:14:5",
+                    "src": "6843:14:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6824:33:5"
+                  "src": "6824:33:7"
                 },
                 {
                   "assignments": [
-                    1332
+                    2774
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1332,
+                      "id": 2774,
                       "name": "bid",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "6867:16:5",
+                      "scope": 3185,
+                      "src": "6867:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1331,
+                        "id": 2773,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "6867:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "6867:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -51149,31 +51149,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1336,
+                  "id": 2778,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 1333,
+                      "id": 2775,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "6886:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "6886:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 1335,
+                    "id": 2777,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1334,
+                      "id": 2776,
                       "name": "_bidID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1320,
-                      "src": "6893:6:5",
+                      "referencedDeclaration": 2762,
+                      "src": "6893:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -51184,14 +51184,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6886:14:5",
+                    "src": "6886:14:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6867:33:5"
+                  "src": "6867:33:7"
                 },
                 {
                   "expression": {
@@ -51203,7 +51203,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1348,
+                        "id": 2790,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -51211,10 +51211,10 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 1342,
+                          "id": 2784,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -51223,28 +51223,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1338,
+                              "id": 2780,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "6919:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "6919:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1339,
+                            "id": 2781,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 774,
-                            "src": "6919:15:5",
+                            "referencedDeclaration": 2216,
+                            "src": "6919:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -51254,18 +51254,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1340,
+                              "id": 2782,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 730,
-                              "src": "6938:11:5",
+                              "referencedDeclaration": 2172,
+                              "src": "6938:11:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 1341,
+                            "id": 2783,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -51273,13 +51273,13 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6938:24:5",
+                            "src": "6938:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6919:43:5",
+                          "src": "6919:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -51290,10 +51290,10 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$730",
+                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 1347,
+                          "id": 2789,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -51302,28 +51302,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1343,
+                              "id": 2785,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "6966:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "6966:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1344,
+                            "id": 2786,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 774,
-                            "src": "6966:15:5",
+                            "referencedDeclaration": 2216,
+                            "src": "6966:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -51333,18 +51333,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1345,
+                              "id": 2787,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 730,
-                              "src": "6985:11:5",
+                              "referencedDeclaration": 2172,
+                              "src": "6985:11:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 1346,
+                            "id": 2788,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -51352,19 +51352,19 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6985:24:5",
+                            "src": "6985:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$730",
+                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6966:43:5",
+                          "src": "6966:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6919:90:5",
+                        "src": "6919:90:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51378,21 +51378,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1337,
+                      "id": 2779,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "6911:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "6911:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1349,
+                    "id": 2791,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -51400,15 +51400,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6911:99:5",
+                    "src": "6911:99:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1350,
+                  "id": 2792,
                   "nodeType": "ExpressionStatement",
-                  "src": "6911:99:5"
+                  "src": "6911:99:7"
                 },
                 {
                   "expression": {
@@ -51420,7 +51420,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1378,
+                        "id": 2820,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -51434,7 +51434,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1363,
+                              "id": 2805,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -51445,7 +51445,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1355,
+                                "id": 2797,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -51454,26 +51454,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1352,
+                                    "id": 2794,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "7029:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "7029:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1353,
+                                  "id": 2795,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7029:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7029:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -51484,14 +51484,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "307830",
-                                  "id": 1354,
+                                  "id": 2796,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7049:3:5",
+                                  "src": "7049:3:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -51499,7 +51499,7 @@
                                   },
                                   "value": "0x0"
                                 },
-                                "src": "7029:23:5",
+                                "src": "7029:23:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -51513,7 +51513,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1362,
+                                "id": 2804,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -51522,26 +51522,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1356,
+                                    "id": 2798,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "7056:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "7056:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1357,
+                                  "id": 2799,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7056:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7056:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -51556,26 +51556,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1359,
+                                        "id": 2801,
                                         "name": "bid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1332,
-                                        "src": "7086:3:5",
+                                        "referencedDeclaration": 2774,
+                                        "src": "7086:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1360,
+                                      "id": 2802,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7086:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7086:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -51589,18 +51589,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1358,
+                                    "id": 2800,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7076:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7076:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1361,
+                                  "id": 2803,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -51608,33 +51608,33 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7076:21:5",
+                                  "src": "7076:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "7056:41:5",
+                                "src": "7056:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7029:68:5",
+                              "src": "7029:68:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 1364,
+                          "id": 2806,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "7028:70:5",
+                          "src": "7028:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -51651,7 +51651,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1376,
+                              "id": 2818,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -51662,7 +51662,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1368,
+                                "id": 2810,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -51671,26 +51671,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1365,
+                                    "id": 2807,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7103:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7103:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1366,
+                                  "id": 2808,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7103:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7103:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -51701,14 +51701,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "307830",
-                                  "id": 1367,
+                                  "id": 2809,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7123:3:5",
+                                  "src": "7123:3:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -51716,7 +51716,7 @@
                                   },
                                   "value": "0x0"
                                 },
-                                "src": "7103:23:5",
+                                "src": "7103:23:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -51730,7 +51730,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 1375,
+                                "id": 2817,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -51739,26 +51739,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1369,
+                                    "id": 2811,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7130:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7130:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1370,
+                                  "id": 2812,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "counterparty",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 778,
-                                  "src": "7130:16:5",
+                                  "referencedDeclaration": 2220,
+                                  "src": "7130:16:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -51773,26 +51773,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1372,
+                                        "id": 2814,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7160:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7160:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1373,
+                                      "id": 2815,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7160:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7160:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -51806,18 +51806,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1371,
+                                    "id": 2813,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7150:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7150:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1374,
+                                  "id": 2816,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -51825,39 +51825,39 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7150:21:5",
+                                  "src": "7150:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "7130:41:5",
+                                "src": "7130:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7103:68:5",
+                              "src": "7103:68:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 1377,
+                          "id": 2819,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "7102:70:5",
+                          "src": "7102:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7028:144:5",
+                        "src": "7028:144:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51871,21 +51871,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1351,
+                      "id": 2793,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7020:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7020:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1379,
+                    "id": 2821,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -51893,15 +51893,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7020:153:5",
+                    "src": "7020:153:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1380,
+                  "id": 2822,
                   "nodeType": "ExpressionStatement",
-                  "src": "7020:153:5"
+                  "src": "7020:153:7"
                 },
                 {
                   "expression": {
@@ -51910,10 +51910,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1386,
+                        "id": 2828,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -51922,28 +51922,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1382,
+                            "id": 2824,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7191:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7191:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1383,
+                          "id": 2825,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "7191:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "7191:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -51953,18 +51953,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1384,
+                            "id": 2826,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "7208:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "7208:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1385,
+                          "id": 2827,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -51972,13 +51972,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7208:19:5",
+                          "src": "7208:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7191:36:5",
+                        "src": "7191:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51992,21 +51992,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1381,
+                      "id": 2823,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7183:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7183:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1387,
+                    "id": 2829,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -52014,15 +52014,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7183:45:5",
+                    "src": "7183:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1388,
+                  "id": 2830,
                   "nodeType": "ExpressionStatement",
-                  "src": "7183:45:5"
+                  "src": "7183:45:7"
                 },
                 {
                   "expression": {
@@ -52031,10 +52031,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 1394,
+                        "id": 2836,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -52043,28 +52043,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1390,
+                            "id": 2832,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7246:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7246:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1391,
+                          "id": 2833,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 772,
-                          "src": "7246:13:5",
+                          "referencedDeclaration": 2214,
+                          "src": "7246:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -52074,18 +52074,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1392,
+                            "id": 2834,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 726,
-                            "src": "7263:9:5",
+                            "referencedDeclaration": 2168,
+                            "src": "7263:9:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 1393,
+                          "id": 2835,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -52093,13 +52093,13 @@
                           "memberName": "ORDER_BID",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7263:19:5",
+                          "src": "7263:19:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7246:36:5",
+                        "src": "7246:36:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -52113,21 +52113,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1389,
+                      "id": 2831,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7238:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7238:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1395,
+                    "id": 2837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -52135,15 +52135,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7238:45:5",
+                    "src": "7238:45:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1396,
+                  "id": 2838,
                   "nodeType": "ExpressionStatement",
-                  "src": "7238:45:5"
+                  "src": "7238:45:7"
                 },
                 {
                   "expression": {
@@ -52155,7 +52155,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1472,
+                        "id": 2914,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -52166,7 +52166,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1462,
+                          "id": 2904,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -52177,7 +52177,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 1450,
+                            "id": 2892,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -52188,7 +52188,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1440,
+                              "id": 2882,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -52199,7 +52199,7 @@
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 },
-                                "id": 1430,
+                                "id": 2872,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -52210,7 +52210,7 @@
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   },
-                                  "id": 1418,
+                                  "id": 2860,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -52221,7 +52221,7 @@
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     },
-                                    "id": 1408,
+                                    "id": 2850,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -52233,26 +52233,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1400,
+                                            "id": 2842,
                                             "name": "bid",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1332,
-                                            "src": "7323:3:5",
+                                            "referencedDeclaration": 2774,
+                                            "src": "7323:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1401,
+                                          "id": 2843,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blacklist",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 789,
-                                          "src": "7323:13:5",
+                                          "referencedDeclaration": 2231,
+                                          "src": "7323:13:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -52265,26 +52265,26 @@
                                               "argumentTypes": null,
                                               "expression": {
                                                 "argumentTypes": null,
-                                                "id": 1403,
+                                                "id": 2845,
                                                 "name": "ask",
                                                 "nodeType": "Identifier",
                                                 "overloadedDeclarations": [],
-                                                "referencedDeclaration": 1326,
-                                                "src": "7348:3:5",
+                                                "referencedDeclaration": 2768,
+                                                "src": "7348:3:7",
                                                 "typeDescriptions": {
-                                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                                   "typeString": "struct Market.Order memory"
                                                 }
                                               },
-                                              "id": 1404,
+                                              "id": 2846,
                                               "isConstant": false,
                                               "isLValue": true,
                                               "isPure": false,
                                               "lValueRequested": false,
                                               "memberName": "author",
                                               "nodeType": "MemberAccess",
-                                              "referencedDeclaration": 776,
-                                              "src": "7348:10:5",
+                                              "referencedDeclaration": 2218,
+                                              "src": "7348:10:7",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
                                                 "typeString": "address"
@@ -52298,18 +52298,18 @@
                                                 "typeString": "address"
                                               }
                                             ],
-                                            "id": 1402,
+                                            "id": 2844,
                                             "name": "GetMaster",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2856,
-                                            "src": "7338:9:5",
+                                            "referencedDeclaration": 4298,
+                                            "src": "7338:9:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                               "typeString": "function (address) view returns (address)"
                                             }
                                           },
-                                          "id": 1405,
+                                          "id": 2847,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -52317,7 +52317,7 @@
                                           "lValueRequested": false,
                                           "names": [],
                                           "nodeType": "FunctionCall",
-                                          "src": "7338:21:5",
+                                          "src": "7338:21:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -52337,32 +52337,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1398,
+                                          "id": 2840,
                                           "name": "bl",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 875,
-                                          "src": "7314:2:5",
+                                          "referencedDeclaration": 2317,
+                                          "src": "7314:2:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$592",
+                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
                                             "typeString": "contract Blacklist"
                                           }
                                         },
-                                        "id": 1399,
+                                        "id": 2841,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "Check",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 460,
-                                        "src": "7314:8:5",
+                                        "referencedDeclaration": 1029,
+                                        "src": "7314:8:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                           "typeString": "function (address,address) view external returns (bool)"
                                         }
                                       },
-                                      "id": 1406,
+                                      "id": 2848,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -52370,7 +52370,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "7314:46:5",
+                                      "src": "7314:46:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
                                         "typeString": "bool"
@@ -52381,14 +52381,14 @@
                                     "rightExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "66616c7365",
-                                      "id": 1407,
+                                      "id": 2849,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "bool",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "7364:5:5",
+                                      "src": "7364:5:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
@@ -52396,7 +52396,7 @@
                                       },
                                       "value": "false"
                                     },
-                                    "src": "7314:55:5",
+                                    "src": "7314:55:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -52410,7 +52410,7 @@
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     },
-                                    "id": 1417,
+                                    "id": 2859,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -52422,26 +52422,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1411,
+                                            "id": 2853,
                                             "name": "bid",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1332,
-                                            "src": "7394:3:5",
+                                            "referencedDeclaration": 2774,
+                                            "src": "7394:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1412,
+                                          "id": 2854,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blacklist",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 789,
-                                          "src": "7394:13:5",
+                                          "referencedDeclaration": 2231,
+                                          "src": "7394:13:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -52451,26 +52451,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 1413,
+                                            "id": 2855,
                                             "name": "ask",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1326,
-                                            "src": "7409:3:5",
+                                            "referencedDeclaration": 2768,
+                                            "src": "7409:3:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                               "typeString": "struct Market.Order memory"
                                             }
                                           },
-                                          "id": 1414,
+                                          "id": 2856,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "author",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 776,
-                                          "src": "7409:10:5",
+                                          "referencedDeclaration": 2218,
+                                          "src": "7409:10:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_address",
                                             "typeString": "address"
@@ -52490,32 +52490,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1409,
+                                          "id": 2851,
                                           "name": "bl",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 875,
-                                          "src": "7385:2:5",
+                                          "referencedDeclaration": 2317,
+                                          "src": "7385:2:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$592",
+                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
                                             "typeString": "contract Blacklist"
                                           }
                                         },
-                                        "id": 1410,
+                                        "id": 2852,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "Check",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 460,
-                                        "src": "7385:8:5",
+                                        "referencedDeclaration": 1029,
+                                        "src": "7385:8:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                           "typeString": "function (address,address) view external returns (bool)"
                                         }
                                       },
-                                      "id": 1415,
+                                      "id": 2857,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -52523,7 +52523,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "7385:35:5",
+                                      "src": "7385:35:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
                                         "typeString": "bool"
@@ -52534,14 +52534,14 @@
                                     "rightExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "66616c7365",
-                                      "id": 1416,
+                                      "id": 2858,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "bool",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "7424:5:5",
+                                      "src": "7424:5:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bool",
@@ -52549,13 +52549,13 @@
                                       },
                                       "value": "false"
                                     },
-                                    "src": "7385:44:5",
+                                    "src": "7385:44:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
                                     }
                                   },
-                                  "src": "7314:115:5",
+                                  "src": "7314:115:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -52569,7 +52569,7 @@
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   },
-                                  "id": 1429,
+                                  "id": 2871,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -52581,26 +52581,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 1421,
+                                          "id": 2863,
                                           "name": "bid",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1332,
-                                          "src": "7454:3:5",
+                                          "referencedDeclaration": 2774,
+                                          "src": "7454:3:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                             "typeString": "struct Market.Order memory"
                                           }
                                         },
-                                        "id": 1422,
+                                        "id": 2864,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "author",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 776,
-                                        "src": "7454:10:5",
+                                        "referencedDeclaration": 2218,
+                                        "src": "7454:10:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -52613,26 +52613,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 1424,
+                                              "id": 2866,
                                               "name": "ask",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 1326,
-                                              "src": "7476:3:5",
+                                              "referencedDeclaration": 2768,
+                                              "src": "7476:3:7",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                                 "typeString": "struct Market.Order memory"
                                               }
                                             },
-                                            "id": 1425,
+                                            "id": 2867,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "author",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 776,
-                                            "src": "7476:10:5",
+                                            "referencedDeclaration": 2218,
+                                            "src": "7476:10:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_address",
                                               "typeString": "address"
@@ -52646,18 +52646,18 @@
                                               "typeString": "address"
                                             }
                                           ],
-                                          "id": 1423,
+                                          "id": 2865,
                                           "name": "GetMaster",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2856,
-                                          "src": "7466:9:5",
+                                          "referencedDeclaration": 4298,
+                                          "src": "7466:9:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                             "typeString": "function (address) view returns (address)"
                                           }
                                         },
-                                        "id": 1426,
+                                        "id": 2868,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -52665,7 +52665,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "7466:21:5",
+                                        "src": "7466:21:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -52685,32 +52685,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1419,
+                                        "id": 2861,
                                         "name": "bl",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 875,
-                                        "src": "7445:2:5",
+                                        "referencedDeclaration": 2317,
+                                        "src": "7445:2:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Blacklist_$592",
+                                          "typeIdentifier": "t_contract$_Blacklist_$1161",
                                           "typeString": "contract Blacklist"
                                         }
                                       },
-                                      "id": 1420,
+                                      "id": 2862,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "Check",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 460,
-                                      "src": "7445:8:5",
+                                      "referencedDeclaration": 1029,
+                                      "src": "7445:8:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                         "typeString": "function (address,address) view external returns (bool)"
                                       }
                                     },
-                                    "id": 1427,
+                                    "id": 2869,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -52718,7 +52718,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "7445:43:5",
+                                    "src": "7445:43:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -52729,14 +52729,14 @@
                                   "rightExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "66616c7365",
-                                    "id": 1428,
+                                    "id": 2870,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "bool",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "7492:5:5",
+                                    "src": "7492:5:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
@@ -52744,13 +52744,13 @@
                                     },
                                     "value": "false"
                                   },
-                                  "src": "7445:52:5",
+                                  "src": "7445:52:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "src": "7314:183:5",
+                                "src": "7314:183:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -52764,7 +52764,7 @@
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 },
-                                "id": 1439,
+                                "id": 2881,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -52776,26 +52776,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1433,
+                                        "id": 2875,
                                         "name": "bid",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1332,
-                                        "src": "7522:3:5",
+                                        "referencedDeclaration": 2774,
+                                        "src": "7522:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1434,
+                                      "id": 2876,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7522:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7522:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -52805,26 +52805,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1435,
+                                        "id": 2877,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7534:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7534:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1436,
+                                      "id": 2878,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7534:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7534:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -52844,32 +52844,32 @@
                                     ],
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1431,
+                                      "id": 2873,
                                       "name": "bl",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 875,
-                                      "src": "7513:2:5",
+                                      "referencedDeclaration": 2317,
+                                      "src": "7513:2:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                                         "typeString": "contract Blacklist"
                                       }
                                     },
-                                    "id": 1432,
+                                    "id": 2874,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "Check",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 460,
-                                    "src": "7513:8:5",
+                                    "referencedDeclaration": 1029,
+                                    "src": "7513:8:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                       "typeString": "function (address,address) view external returns (bool)"
                                     }
                                   },
-                                  "id": 1437,
+                                  "id": 2879,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -52877,7 +52877,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7513:32:5",
+                                  "src": "7513:32:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -52888,14 +52888,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "66616c7365",
-                                  "id": 1438,
+                                  "id": 2880,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "bool",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7549:5:5",
+                                  "src": "7549:5:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
@@ -52903,13 +52903,13 @@
                                   },
                                   "value": "false"
                                 },
-                                "src": "7513:41:5",
+                                "src": "7513:41:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "7314:240:5",
+                              "src": "7314:240:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -52923,7 +52923,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1449,
+                              "id": 2891,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -52935,26 +52935,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1443,
+                                      "id": 2885,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1326,
-                                      "src": "7579:3:5",
+                                      "referencedDeclaration": 2768,
+                                      "src": "7579:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1444,
+                                    "id": 2886,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blacklist",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 789,
-                                    "src": "7579:13:5",
+                                    "referencedDeclaration": 2231,
+                                    "src": "7579:13:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -52964,26 +52964,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1445,
+                                      "id": 2887,
                                       "name": "bid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1332,
-                                      "src": "7594:3:5",
+                                      "referencedDeclaration": 2774,
+                                      "src": "7594:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1446,
+                                    "id": 2888,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 776,
-                                    "src": "7594:10:5",
+                                    "referencedDeclaration": 2218,
+                                    "src": "7594:10:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -53003,32 +53003,32 @@
                                   ],
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1441,
+                                    "id": 2883,
                                     "name": "bl",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 875,
-                                    "src": "7570:2:5",
+                                    "referencedDeclaration": 2317,
+                                    "src": "7570:2:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                                       "typeString": "contract Blacklist"
                                     }
                                   },
-                                  "id": 1442,
+                                  "id": 2884,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "Check",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 460,
-                                  "src": "7570:8:5",
+                                  "referencedDeclaration": 1029,
+                                  "src": "7570:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                     "typeString": "function (address,address) view external returns (bool)"
                                   }
                                 },
-                                "id": 1447,
+                                "id": 2889,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -53036,7 +53036,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "7570:35:5",
+                                "src": "7570:35:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -53047,14 +53047,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "66616c7365",
-                                "id": 1448,
+                                "id": 2890,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "7609:5:5",
+                                "src": "7609:5:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -53062,13 +53062,13 @@
                                 },
                                 "value": "false"
                               },
-                              "src": "7570:44:5",
+                              "src": "7570:44:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "7314:300:5",
+                            "src": "7314:300:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -53082,7 +53082,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 1461,
+                            "id": 2903,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -53097,26 +53097,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 1454,
+                                        "id": 2896,
                                         "name": "ask",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1326,
-                                        "src": "7649:3:5",
+                                        "referencedDeclaration": 2768,
+                                        "src": "7649:3:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                           "typeString": "struct Market.Order memory"
                                         }
                                       },
-                                      "id": 1455,
+                                      "id": 2897,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "author",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 776,
-                                      "src": "7649:10:5",
+                                      "referencedDeclaration": 2218,
+                                      "src": "7649:10:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -53130,18 +53130,18 @@
                                         "typeString": "address"
                                       }
                                     ],
-                                    "id": 1453,
+                                    "id": 2895,
                                     "name": "GetMaster",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2856,
-                                    "src": "7639:9:5",
+                                    "referencedDeclaration": 4298,
+                                    "src": "7639:9:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                       "typeString": "function (address) view returns (address)"
                                     }
                                   },
-                                  "id": 1456,
+                                  "id": 2898,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -53149,7 +53149,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "7639:21:5",
+                                  "src": "7639:21:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -53159,26 +53159,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1457,
+                                    "id": 2899,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "7662:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "7662:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1458,
+                                  "id": 2900,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "author",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 776,
-                                  "src": "7662:10:5",
+                                  "referencedDeclaration": 2218,
+                                  "src": "7662:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -53198,32 +53198,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1451,
+                                  "id": 2893,
                                   "name": "bl",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 875,
-                                  "src": "7630:2:5",
+                                  "referencedDeclaration": 2317,
+                                  "src": "7630:2:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Blacklist_$592",
+                                    "typeIdentifier": "t_contract$_Blacklist_$1161",
                                     "typeString": "contract Blacklist"
                                   }
                                 },
-                                "id": 1452,
+                                "id": 2894,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "Check",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 460,
-                                "src": "7630:8:5",
+                                "referencedDeclaration": 1029,
+                                "src": "7630:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                   "typeString": "function (address,address) view external returns (bool)"
                                 }
                               },
-                              "id": 1459,
+                              "id": 2901,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -53231,7 +53231,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "7630:43:5",
+                              "src": "7630:43:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -53242,14 +53242,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "66616c7365",
-                              "id": 1460,
+                              "id": 2902,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "bool",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "7677:5:5",
+                              "src": "7677:5:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
@@ -53257,13 +53257,13 @@
                               },
                               "value": "false"
                             },
-                            "src": "7630:52:5",
+                            "src": "7630:52:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "7314:368:5",
+                          "src": "7314:368:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -53277,7 +53277,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1471,
+                          "id": 2913,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -53289,26 +53289,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1465,
+                                  "id": 2907,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "7707:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "7707:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1466,
+                                "id": 2908,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "7707:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "7707:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -53318,26 +53318,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1467,
+                                  "id": 2909,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "7719:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "7719:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1468,
+                                "id": 2910,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 776,
-                                "src": "7719:10:5",
+                                "referencedDeclaration": 2218,
+                                "src": "7719:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -53357,32 +53357,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1463,
+                                "id": 2905,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "7698:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "7698:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 1464,
+                              "id": 2906,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 460,
-                              "src": "7698:8:5",
+                              "referencedDeclaration": 1029,
+                              "src": "7698:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 1469,
+                            "id": 2911,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -53390,7 +53390,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "7698:32:5",
+                            "src": "7698:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -53401,14 +53401,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 1470,
+                            "id": 2912,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "7734:5:5",
+                            "src": "7734:5:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -53416,13 +53416,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "7698:41:5",
+                          "src": "7698:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7314:425:5",
+                        "src": "7314:425:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53436,21 +53436,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1397,
+                      "id": 2839,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7293:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7293:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1473,
+                    "id": 2915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53458,15 +53458,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7293:447:5",
+                    "src": "7293:447:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1474,
+                  "id": 2916,
                   "nodeType": "ExpressionStatement",
-                  "src": "7293:447:5"
+                  "src": "7293:447:7"
                 },
                 {
                   "expression": {
@@ -53478,7 +53478,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1480,
+                        "id": 2922,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53487,26 +53487,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1476,
+                            "id": 2918,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7758:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7758:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1477,
+                          "id": 2919,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "7758:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "7758:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -53518,32 +53518,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1478,
+                            "id": 2920,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7771:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7771:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1479,
+                          "id": 2921,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "7771:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "7771:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7758:22:5",
+                        "src": "7758:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53557,21 +53557,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1475,
+                      "id": 2917,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7750:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7750:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1481,
+                    "id": 2923,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53579,15 +53579,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7750:31:5",
+                    "src": "7750:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1482,
+                  "id": 2924,
                   "nodeType": "ExpressionStatement",
-                  "src": "7750:31:5"
+                  "src": "7750:31:7"
                 },
                 {
                   "expression": {
@@ -53599,7 +53599,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1488,
+                        "id": 2930,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53608,26 +53608,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1484,
+                            "id": 2926,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7799:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7799:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1485,
+                          "id": 2927,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "7799:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "7799:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -53639,32 +53639,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1486,
+                            "id": 2928,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7815:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7815:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1487,
+                          "id": 2929,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "7815:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "7815:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7799:28:5",
+                        "src": "7799:28:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53678,21 +53678,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1483,
+                      "id": 2925,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7791:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7791:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1489,
+                    "id": 2931,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53700,15 +53700,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7791:37:5",
+                    "src": "7791:37:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1490,
+                  "id": 2932,
                   "nodeType": "ExpressionStatement",
-                  "src": "7791:37:5"
+                  "src": "7791:37:7"
                 },
                 {
                   "expression": {
@@ -53717,10 +53717,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1499,
+                        "id": 2941,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53732,26 +53732,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1494,
+                                "id": 2936,
                                 "name": "bid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1332,
-                                "src": "7896:3:5",
+                                "referencedDeclaration": 2774,
+                                "src": "7896:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1495,
+                              "id": 2937,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 776,
-                              "src": "7896:10:5",
+                              "referencedDeclaration": 2218,
+                              "src": "7896:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -53767,32 +53767,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1492,
+                              "id": 2934,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "7877:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "7877:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1493,
+                            "id": 2935,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "7877:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "7877:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1496,
+                          "id": 2938,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -53800,9 +53800,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7877:30:5",
+                          "src": "7877:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -53812,32 +53812,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1497,
+                            "id": 2939,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "7911:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "7911:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1498,
+                          "id": 2940,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "7911:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "7911:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7877:51:5",
+                        "src": "7877:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53851,21 +53851,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1491,
+                      "id": 2933,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7869:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7869:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1500,
+                    "id": 2942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53873,15 +53873,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7869:60:5",
+                    "src": "7869:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1501,
+                  "id": 2943,
                   "nodeType": "ExpressionStatement",
-                  "src": "7869:60:5"
+                  "src": "7869:60:7"
                 },
                 {
                   "expression": {
@@ -53890,10 +53890,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 1510,
+                        "id": 2952,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53905,26 +53905,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1505,
+                                "id": 2947,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1326,
-                                "src": "7966:3:5",
+                                "referencedDeclaration": 2768,
+                                "src": "7966:3:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 1506,
+                              "id": 2948,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 776,
-                              "src": "7966:10:5",
+                              "referencedDeclaration": 2218,
+                              "src": "7966:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -53940,32 +53940,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1503,
+                              "id": 2945,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 879,
-                              "src": "7947:2:5",
+                              "referencedDeclaration": 2321,
+                              "src": "7947:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 1504,
+                            "id": 2946,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5422,
-                            "src": "7947:18:5",
+                            "referencedDeclaration": 9988,
+                            "src": "7947:18:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 1507,
+                          "id": 2949,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -53973,9 +53973,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7947:30:5",
+                          "src": "7947:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -53985,32 +53985,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1508,
+                            "id": 2950,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "7981:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "7981:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1509,
+                          "id": 2951,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 787,
-                          "src": "7981:17:5",
+                          "referencedDeclaration": 2229,
+                          "src": "7981:17:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7947:51:5",
+                        "src": "7947:51:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -54024,21 +54024,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1502,
+                      "id": 2944,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "7939:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "7939:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1511,
+                    "id": 2953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54046,15 +54046,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7939:60:5",
+                    "src": "7939:60:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1512,
+                  "id": 2954,
                   "nodeType": "ExpressionStatement",
-                  "src": "7939:60:5"
+                  "src": "7939:60:7"
                 },
                 {
                   "condition": {
@@ -54063,7 +54063,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1517,
+                    "id": 2959,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54074,32 +54074,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1513,
+                          "id": 2955,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8014:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8014:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1514,
+                        "id": 2956,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8014:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8014:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1515,
+                      "id": 2957,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54107,7 +54107,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8014:19:5",
+                      "src": "8014:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54117,36 +54117,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1516,
+                      "id": 2958,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "8036:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "8036:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8014:38:5",
+                    "src": "8014:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1528,
+                  "id": 2970,
                   "nodeType": "IfStatement",
-                  "src": "8010:112:5",
+                  "src": "8010:112:7",
                   "trueBody": {
-                    "id": 1527,
+                    "id": 2969,
                     "nodeType": "Block",
-                    "src": "8054:68:5",
+                    "src": "8054:68:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1525,
+                          "id": 2967,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54155,26 +54155,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1518,
+                              "id": 2960,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "8068:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "8068:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1520,
+                            "id": 2962,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 785,
-                            "src": "8068:12:5",
+                            "referencedDeclaration": 2227,
+                            "src": "8068:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -54189,26 +54189,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1522,
+                                  "id": 2964,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8098:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8098:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1523,
+                                "id": 2965,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 785,
-                                "src": "8098:12:5",
+                                "referencedDeclaration": 2227,
+                                "src": "8098:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -54222,18 +54222,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 1521,
+                              "id": 2963,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3648,
-                              "src": "8083:14:5",
+                              "referencedDeclaration": 5090,
+                              "src": "8083:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 1524,
+                            "id": 2966,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -54241,21 +54241,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8083:28:5",
+                            "src": "8083:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8068:43:5",
+                          "src": "8068:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 1526,
+                        "id": 2968,
                         "nodeType": "ExpressionStatement",
-                        "src": "8068:43:5"
+                        "src": "8068:43:7"
                       }
                     ]
                   }
@@ -54267,7 +54267,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1533,
+                    "id": 2975,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54278,32 +54278,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1529,
+                          "id": 2971,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1332,
-                          "src": "8136:3:5",
+                          "referencedDeclaration": 2774,
+                          "src": "8136:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1530,
+                        "id": 2972,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8136:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8136:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1531,
+                      "id": 2973,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54311,7 +54311,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8136:19:5",
+                      "src": "8136:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54321,36 +54321,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1532,
+                      "id": 2974,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "8158:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "8158:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8136:38:5",
+                    "src": "8136:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1544,
+                  "id": 2986,
                   "nodeType": "IfStatement",
-                  "src": "8132:112:5",
+                  "src": "8132:112:7",
                   "trueBody": {
-                    "id": 1543,
+                    "id": 2985,
                     "nodeType": "Block",
-                    "src": "8176:68:5",
+                    "src": "8176:68:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1541,
+                          "id": 2983,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54359,26 +54359,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1534,
+                              "id": 2976,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "8190:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "8190:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1536,
+                            "id": 2978,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 785,
-                            "src": "8190:12:5",
+                            "referencedDeclaration": 2227,
+                            "src": "8190:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -54393,26 +54393,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1538,
+                                  "id": 2980,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8220:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8220:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1539,
+                                "id": 2981,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 785,
-                                "src": "8220:12:5",
+                                "referencedDeclaration": 2227,
+                                "src": "8220:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -54426,18 +54426,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 1537,
+                              "id": 2979,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3648,
-                              "src": "8205:14:5",
+                              "referencedDeclaration": 5090,
+                              "src": "8205:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 1540,
+                            "id": 2982,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -54445,30 +54445,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8205:28:5",
+                            "src": "8205:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8190:43:5",
+                          "src": "8190:43:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 1542,
+                        "id": 2984,
                         "nodeType": "ExpressionStatement",
-                        "src": "8190:43:5"
+                        "src": "8190:43:7"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 1570,
+                    "id": 3012,
                     "nodeType": "Block",
-                    "src": "8301:207:5",
+                    "src": "8301:207:7",
                     "statements": [
                       {
                         "expression": {
@@ -54480,14 +54480,14 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 1567,
+                              "id": 3009,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 1562,
+                                "id": 3004,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -54495,47 +54495,47 @@
                                 "nodeType": "UnaryOperation",
                                 "operator": "!",
                                 "prefix": true,
-                                "src": "8461:16:5",
+                                "src": "8461:16:7",
                                 "subExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 1558,
+                                      "id": 3000,
                                       "name": "bid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1332,
-                                      "src": "8462:3:5",
+                                      "referencedDeclaration": 2774,
+                                      "src": "8462:3:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 1559,
+                                    "id": 3001,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "netflags",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 785,
-                                    "src": "8462:12:5",
+                                    "referencedDeclaration": 2227,
+                                    "src": "8462:12:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                       "typeString": "bool[] memory"
                                     }
                                   },
-                                  "id": 1561,
+                                  "id": 3003,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1560,
+                                    "id": 3002,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1546,
-                                    "src": "8475:1:5",
+                                    "referencedDeclaration": 2988,
+                                    "src": "8475:1:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -54546,7 +54546,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "8462:15:5",
+                                  "src": "8462:15:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -54565,40 +54565,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1563,
+                                    "id": 3005,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "8481:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "8481:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1564,
+                                  "id": 3006,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "netflags",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 785,
-                                  "src": "8481:12:5",
+                                  "referencedDeclaration": 2227,
+                                  "src": "8481:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                     "typeString": "bool[] memory"
                                   }
                                 },
-                                "id": 1566,
+                                "id": 3008,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1565,
+                                  "id": 3007,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8494:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8494:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -54609,13 +54609,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8481:15:5",
+                                "src": "8481:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "8461:35:5",
+                              "src": "8461:35:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -54629,21 +54629,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1557,
+                            "id": 2999,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "8453:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "8453:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1568,
+                          "id": 3010,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54651,15 +54651,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8453:44:5",
+                          "src": "8453:44:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1569,
+                        "id": 3011,
                         "nodeType": "ExpressionStatement",
-                        "src": "8453:44:5"
+                        "src": "8453:44:7"
                       }
                     ]
                   },
@@ -54669,19 +54669,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1553,
+                    "id": 2995,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1549,
+                      "id": 2991,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1546,
-                      "src": "8271:1:5",
+                      "referencedDeclaration": 2988,
+                      "src": "8271:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54695,32 +54695,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1550,
+                          "id": 2992,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8275:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8275:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1551,
+                        "id": 2993,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "8275:12:5",
+                        "referencedDeclaration": 2227,
+                        "src": "8275:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 1552,
+                      "id": 2994,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54728,31 +54728,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8275:19:5",
+                      "src": "8275:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8271:23:5",
+                    "src": "8271:23:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1571,
+                  "id": 3013,
                   "initializationExpression": {
                     "assignments": [
-                      1546
+                      2988
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 1546,
+                        "id": 2988,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 1743,
-                        "src": "8259:6:5",
+                        "scope": 3185,
+                        "src": "8259:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -54760,10 +54760,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 1545,
+                          "id": 2987,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "8259:4:5",
+                          "src": "8259:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -54773,18 +54773,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 1548,
+                    "id": 2990,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1547,
+                      "id": 2989,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "8268:1:5",
+                      "src": "8268:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -54793,12 +54793,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "8259:10:5"
+                    "src": "8259:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1555,
+                      "id": 2997,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54806,15 +54806,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8296:3:5",
+                      "src": "8296:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1554,
+                        "id": 2996,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8296:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8296:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -54825,12 +54825,12 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1556,
+                    "id": 2998,
                     "nodeType": "ExpressionStatement",
-                    "src": "8296:3:5"
+                    "src": "8296:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8254:254:5"
+                  "src": "8254:254:7"
                 },
                 {
                   "condition": {
@@ -54839,7 +54839,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1576,
+                    "id": 3018,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54850,32 +54850,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1572,
+                          "id": 3014,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8522:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8522:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1573,
+                        "id": 3015,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8522:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8522:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1574,
+                      "id": 3016,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54883,7 +54883,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8522:21:5",
+                      "src": "8522:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54893,36 +54893,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1575,
+                      "id": 3017,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "8546:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "8546:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8522:42:5",
+                    "src": "8522:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1587,
+                  "id": 3029,
                   "nodeType": "IfStatement",
-                  "src": "8518:122:5",
+                  "src": "8518:122:7",
                   "trueBody": {
-                    "id": 1586,
+                    "id": 3028,
                     "nodeType": "Block",
-                    "src": "8566:74:5",
+                    "src": "8566:74:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1584,
+                          "id": 3026,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54931,26 +54931,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1577,
+                              "id": 3019,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1326,
-                              "src": "8580:3:5",
+                              "referencedDeclaration": 2768,
+                              "src": "8580:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1579,
+                            "id": 3021,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 794,
-                            "src": "8580:14:5",
+                            "referencedDeclaration": 2236,
+                            "src": "8580:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -54965,26 +54965,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1581,
+                                  "id": 3023,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1326,
-                                  "src": "8614:3:5",
+                                  "referencedDeclaration": 2768,
+                                  "src": "8614:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1582,
+                                "id": 3024,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 794,
-                                "src": "8614:14:5",
+                                "referencedDeclaration": 2236,
+                                "src": "8614:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -54998,18 +54998,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 1580,
+                              "id": 3022,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3605,
-                              "src": "8597:16:5",
+                              "referencedDeclaration": 5047,
+                              "src": "8597:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 1583,
+                            "id": 3025,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -55017,21 +55017,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8597:32:5",
+                            "src": "8597:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8580:49:5",
+                          "src": "8580:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 1585,
+                        "id": 3027,
                         "nodeType": "ExpressionStatement",
-                        "src": "8580:49:5"
+                        "src": "8580:49:7"
                       }
                     ]
                   }
@@ -55043,7 +55043,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1592,
+                    "id": 3034,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55054,32 +55054,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1588,
+                          "id": 3030,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1332,
-                          "src": "8654:3:5",
+                          "referencedDeclaration": 2774,
+                          "src": "8654:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1589,
+                        "id": 3031,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8654:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8654:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1590,
+                      "id": 3032,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55087,7 +55087,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8654:21:5",
+                      "src": "8654:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55097,36 +55097,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1591,
+                      "id": 3033,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "8678:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "8678:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8654:42:5",
+                    "src": "8654:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1603,
+                  "id": 3045,
                   "nodeType": "IfStatement",
-                  "src": "8650:122:5",
+                  "src": "8650:122:7",
                   "trueBody": {
-                    "id": 1602,
+                    "id": 3044,
                     "nodeType": "Block",
-                    "src": "8698:74:5",
+                    "src": "8698:74:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1600,
+                          "id": 3042,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -55135,26 +55135,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1593,
+                              "id": 3035,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1332,
-                              "src": "8712:3:5",
+                              "referencedDeclaration": 2774,
+                              "src": "8712:3:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 1595,
+                            "id": 3037,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 794,
-                            "src": "8712:14:5",
+                            "referencedDeclaration": 2236,
+                            "src": "8712:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -55169,26 +55169,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1597,
+                                  "id": 3039,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "8746:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "8746:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1598,
+                                "id": 3040,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 794,
-                                "src": "8746:14:5",
+                                "referencedDeclaration": 2236,
+                                "src": "8746:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -55202,18 +55202,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 1596,
+                              "id": 3038,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3605,
-                              "src": "8729:16:5",
+                              "referencedDeclaration": 5047,
+                              "src": "8729:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 1599,
+                            "id": 3041,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -55221,30 +55221,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8729:32:5",
+                            "src": "8729:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8712:49:5",
+                          "src": "8712:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 1601,
+                        "id": 3043,
                         "nodeType": "ExpressionStatement",
-                        "src": "8712:49:5"
+                        "src": "8712:49:7"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 1628,
+                    "id": 3070,
                     "nodeType": "Block",
-                    "src": "8826:72:5",
+                    "src": "8826:72:7",
                     "statements": [
                       {
                         "expression": {
@@ -55256,7 +55256,7 @@
                                 "typeIdentifier": "t_uint64",
                                 "typeString": "uint64"
                               },
-                              "id": 1625,
+                              "id": 3067,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -55267,40 +55267,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1617,
+                                    "id": 3059,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1326,
-                                    "src": "8848:3:5",
+                                    "referencedDeclaration": 2768,
+                                    "src": "8848:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1618,
+                                  "id": 3060,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 794,
-                                  "src": "8848:14:5",
+                                  "referencedDeclaration": 2236,
+                                  "src": "8848:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1620,
+                                "id": 3062,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1619,
+                                  "id": 3061,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8863:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8863:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -55311,7 +55311,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8848:17:5",
+                                "src": "8848:17:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -55325,40 +55325,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 1621,
+                                    "id": 3063,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1332,
-                                    "src": "8869:3:5",
+                                    "referencedDeclaration": 2774,
+                                    "src": "8869:3:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 1622,
+                                  "id": 3064,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 794,
-                                  "src": "8869:14:5",
+                                  "referencedDeclaration": 2236,
+                                  "src": "8869:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 1624,
+                                "id": 3066,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1623,
+                                  "id": 3065,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1546,
-                                  "src": "8884:1:5",
+                                  "referencedDeclaration": 2988,
+                                  "src": "8884:1:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -55369,13 +55369,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8869:17:5",
+                                "src": "8869:17:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
                                 }
                               },
-                              "src": "8848:38:5",
+                              "src": "8848:38:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -55389,21 +55389,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1616,
+                            "id": 3058,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "8840:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "8840:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1626,
+                          "id": 3068,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -55411,15 +55411,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8840:47:5",
+                          "src": "8840:47:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1627,
+                        "id": 3069,
                         "nodeType": "ExpressionStatement",
-                        "src": "8840:47:5"
+                        "src": "8840:47:7"
                       }
                     ]
                   },
@@ -55429,19 +55429,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1612,
+                    "id": 3054,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1608,
+                      "id": 3050,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1546,
-                      "src": "8794:1:5",
+                      "referencedDeclaration": 2988,
+                      "src": "8794:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55455,32 +55455,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1609,
+                          "id": 3051,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8798:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8798:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1610,
+                        "id": 3052,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "8798:14:5",
+                        "referencedDeclaration": 2236,
+                        "src": "8798:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 1611,
+                      "id": 3053,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55488,35 +55488,35 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8798:21:5",
+                      "src": "8798:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8794:25:5",
+                    "src": "8794:25:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1629,
+                  "id": 3071,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1606,
+                      "id": 3048,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 1604,
+                        "id": 3046,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8787:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8787:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -55527,14 +55527,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 1605,
+                        "id": 3047,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "8791:1:5",
+                        "src": "8791:1:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -55542,20 +55542,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "8787:5:5",
+                      "src": "8787:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1607,
+                    "id": 3049,
                     "nodeType": "ExpressionStatement",
-                    "src": "8787:5:5"
+                    "src": "8787:5:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1614,
+                      "id": 3056,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55563,15 +55563,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8821:3:5",
+                      "src": "8821:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 1613,
+                        "id": 3055,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1546,
-                        "src": "8821:1:5",
+                        "referencedDeclaration": 2988,
+                        "src": "8821:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -55582,29 +55582,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 1615,
+                    "id": 3057,
                     "nodeType": "ExpressionStatement",
-                    "src": "8821:3:5"
+                    "src": "8821:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8782:116:5"
+                  "src": "8782:116:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1635,
+                    "id": 3077,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1630,
+                      "id": 3072,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "8908:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "8908:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55618,14 +55618,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1633,
+                          "id": 3075,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "8936:1:5",
+                          "src": "8936:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -55643,32 +55643,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1631,
+                          "id": 3073,
                           "name": "dealAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 885,
-                          "src": "8921:10:5",
+                          "referencedDeclaration": 2327,
+                          "src": "8921:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1632,
+                        "id": 3074,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "8921:14:5",
+                        "referencedDeclaration": 10795,
+                        "src": "8921:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1634,
+                      "id": 3076,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55676,34 +55676,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "8921:17:5",
+                      "src": "8921:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8908:30:5",
+                    "src": "8908:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1636,
+                  "id": 3078,
                   "nodeType": "ExpressionStatement",
-                  "src": "8908:30:5"
+                  "src": "8908:30:7"
                 },
                 {
                   "assignments": [
-                    1638
+                    3080
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1638,
+                      "id": 3080,
                       "name": "master",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "8948:14:5",
+                      "scope": 3185,
+                      "src": "8948:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -55711,10 +55711,10 @@
                         "typeString": "address"
                       },
                       "typeName": {
-                        "id": 1637,
+                        "id": 3079,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "8948:7:5",
+                        "src": "8948:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -55724,7 +55724,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1643,
+                  "id": 3085,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
@@ -55732,26 +55732,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1640,
+                          "id": 3082,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1326,
-                          "src": "8975:3:5",
+                          "referencedDeclaration": 2768,
+                          "src": "8975:3:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 1641,
+                        "id": 3083,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 776,
-                        "src": "8975:10:5",
+                        "referencedDeclaration": 2218,
+                        "src": "8975:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -55765,18 +55765,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1639,
+                      "id": 3081,
                       "name": "GetMaster",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2856,
-                      "src": "8965:9:5",
+                      "referencedDeclaration": 4298,
+                      "src": "8965:9:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                         "typeString": "function (address) view returns (address)"
                       }
                     },
-                    "id": 1642,
+                    "id": 3084,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55784,19 +55784,19 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "8965:21:5",
+                    "src": "8965:21:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "8948:38:5"
+                  "src": "8948:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1650,
+                    "id": 3092,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55807,26 +55807,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1644,
+                          "id": 3086,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "8996:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "8996:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1646,
+                        "id": 3088,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1645,
+                          "id": 3087,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9003:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9003:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -55837,23 +55837,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "8996:14:5",
+                        "src": "8996:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1647,
+                      "id": 3089,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "8996:26:5",
+                      "referencedDeclaration": 2216,
+                      "src": "8996:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -55863,18 +55863,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1648,
+                        "id": 3090,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "9025:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "9025:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1649,
+                      "id": 3091,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -55882,26 +55882,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9025:26:5",
+                      "src": "9025:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "8996:55:5",
+                    "src": "8996:55:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1651,
+                  "id": 3093,
                   "nodeType": "ExpressionStatement",
-                  "src": "8996:55:5"
+                  "src": "8996:55:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1658,
+                    "id": 3100,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55912,26 +55912,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1652,
+                          "id": 3094,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9061:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9061:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1654,
+                        "id": 3096,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1653,
+                          "id": 3095,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9068:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9068:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -55942,23 +55942,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9061:14:5",
+                        "src": "9061:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1655,
+                      "id": 3097,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 774,
-                      "src": "9061:26:5",
+                      "referencedDeclaration": 2216,
+                      "src": "9061:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -55968,18 +55968,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1656,
+                        "id": 3098,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 730,
-                        "src": "9090:11:5",
+                        "referencedDeclaration": 2172,
+                        "src": "9090:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$730_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 1657,
+                      "id": 3099,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -55987,26 +55987,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9090:26:5",
+                      "src": "9090:26:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$730",
+                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "9061:55:5",
+                    "src": "9061:55:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 1659,
+                  "id": 3101,
                   "nodeType": "ExpressionStatement",
-                  "src": "9061:55:5"
+                  "src": "9061:55:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1665,
+                    "id": 3107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56017,26 +56017,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1660,
+                          "id": 3102,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9126:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9126:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1662,
+                        "id": 3104,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1661,
+                          "id": 3103,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9133:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9133:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56047,21 +56047,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9126:14:5",
+                        "src": "9126:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1663,
+                      "id": 3105,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 798,
-                      "src": "9126:21:5",
+                      "referencedDeclaration": 2240,
+                      "src": "9126:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56071,31 +56071,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1664,
+                      "id": 3106,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "9150:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "9150:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9126:34:5",
+                    "src": "9126:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1666,
+                  "id": 3108,
                   "nodeType": "ExpressionStatement",
-                  "src": "9126:34:5"
+                  "src": "9126:34:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1672,
+                    "id": 3114,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56106,26 +56106,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1667,
+                          "id": 3109,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 896,
-                          "src": "9170:6:5",
+                          "referencedDeclaration": 2338,
+                          "src": "9170:6:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 1669,
+                        "id": 3111,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1668,
+                          "id": 3110,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9177:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9177:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56136,21 +56136,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9170:14:5",
+                        "src": "9170:14:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 1670,
+                      "id": 3112,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 798,
-                      "src": "9170:21:5",
+                      "referencedDeclaration": 2240,
+                      "src": "9170:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56160,26 +56160,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1671,
+                      "id": 3113,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 885,
-                      "src": "9194:10:5",
+                      "referencedDeclaration": 2327,
+                      "src": "9194:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9170:34:5",
+                    "src": "9170:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1673,
+                  "id": 3115,
                   "nodeType": "ExpressionStatement",
-                  "src": "9170:34:5"
+                  "src": "9170:34:7"
                 },
                 {
                   "eventCall": {
@@ -56187,12 +56187,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1675,
+                        "id": 3117,
                         "name": "_askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1318,
-                        "src": "9233:6:5",
+                        "referencedDeclaration": 2760,
+                        "src": "9233:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56206,18 +56206,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1674,
+                      "id": 3116,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "9220:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "9220:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1676,
+                    "id": 3118,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56225,15 +56225,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9220:20:5",
+                    "src": "9220:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1677,
+                  "id": 3119,
                   "nodeType": "EmitStatement",
-                  "src": "9215:25:5"
+                  "src": "9215:25:7"
                 },
                 {
                   "eventCall": {
@@ -56241,12 +56241,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1679,
+                        "id": 3121,
                         "name": "_bidID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1320,
-                        "src": "9268:6:5",
+                        "referencedDeclaration": 2762,
+                        "src": "9268:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56260,18 +56260,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1678,
+                      "id": 3120,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 818,
-                      "src": "9255:12:5",
+                      "referencedDeclaration": 2260,
+                      "src": "9255:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1680,
+                    "id": 3122,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56279,28 +56279,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9255:20:5",
+                    "src": "9255:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1681,
+                  "id": 3123,
                   "nodeType": "EmitStatement",
-                  "src": "9250:25:5"
+                  "src": "9250:25:7"
                 },
                 {
                   "assignments": [
-                    1683
+                    3125
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1683,
+                      "id": 3125,
                       "name": "startTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9286:14:5",
+                      "scope": 3185,
+                      "src": "9286:14:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56308,10 +56308,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1682,
+                        "id": 3124,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9286:4:5",
+                        "src": "9286:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56321,23 +56321,23 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1686,
+                  "id": 3128,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1684,
+                      "id": 3126,
                       "name": "block",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7759,
-                      "src": "9303:5:5",
+                      "referencedDeclaration": 11305,
+                      "src": "9303:5:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_block",
                         "typeString": "block"
                       }
                     },
-                    "id": 1685,
+                    "id": 3127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56345,27 +56345,27 @@
                     "memberName": "timestamp",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "9303:15:5",
+                    "src": "9303:15:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9286:32:5"
+                  "src": "9286:32:7"
                 },
                 {
                   "assignments": [
-                    1688
+                    3130
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1688,
+                      "id": 3130,
                       "name": "endTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9328:12:5",
+                      "scope": 3185,
+                      "src": "9328:12:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56373,10 +56373,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1687,
+                        "id": 3129,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9328:4:5",
+                        "src": "9328:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56386,18 +56386,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1690,
+                  "id": 3132,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 1689,
+                    "id": 3131,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "9343:1:5",
+                    "src": "9343:1:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -56406,7 +56406,7 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9328:16:5"
+                  "src": "9328:16:7"
                 },
                 {
                   "condition": {
@@ -56415,7 +56415,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1694,
+                    "id": 3136,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56424,26 +56424,26 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1691,
+                        "id": 3133,
                         "name": "ask",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1326,
-                        "src": "9419:3:5",
+                        "referencedDeclaration": 2768,
+                        "src": "9419:3:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                           "typeString": "struct Market.Order memory"
                         }
                       },
-                      "id": 1692,
+                      "id": 3134,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 780,
-                      "src": "9419:12:5",
+                      "referencedDeclaration": 2222,
+                      "src": "9419:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56454,14 +56454,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1693,
+                      "id": 3135,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9435:1:5",
+                      "src": "9435:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -56469,37 +56469,37 @@
                       },
                       "value": "0"
                     },
-                    "src": "9419:17:5",
+                    "src": "9419:17:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1704,
+                  "id": 3146,
                   "nodeType": "IfStatement",
-                  "src": "9415:85:5",
+                  "src": "9415:85:7",
                   "trueBody": {
-                    "id": 1703,
+                    "id": 3145,
                     "nodeType": "Block",
-                    "src": "9438:62:5",
+                    "src": "9438:62:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1701,
+                          "id": 3143,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1695,
+                            "id": 3137,
                             "name": "endTime",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1688,
-                            "src": "9452:7:5",
+                            "referencedDeclaration": 3130,
+                            "src": "9452:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -56514,26 +56514,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1698,
+                                  "id": 3140,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1332,
-                                  "src": "9476:3:5",
+                                  "referencedDeclaration": 2774,
+                                  "src": "9476:3:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 1699,
+                                "id": 3141,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "duration",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 780,
-                                "src": "9476:12:5",
+                                "referencedDeclaration": 2222,
+                                "src": "9476:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -56549,32 +56549,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1696,
+                                "id": 3138,
                                 "name": "startTime",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1683,
-                                "src": "9462:9:5",
+                                "referencedDeclaration": 3125,
+                                "src": "9462:9:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 1697,
+                              "id": 3139,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7249,
-                              "src": "9462:13:5",
+                              "referencedDeclaration": 10795,
+                              "src": "9462:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 1700,
+                            "id": 3142,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -56582,37 +56582,37 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "9462:27:5",
+                            "src": "9462:27:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "9452:37:5",
+                          "src": "9452:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1702,
+                        "id": 3144,
                         "nodeType": "ExpressionStatement",
-                        "src": "9452:37:5"
+                        "src": "9452:37:7"
                       }
                     ]
                   }
                 },
                 {
                   "assignments": [
-                    1706
+                    3148
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1706,
+                      "id": 3148,
                       "name": "blockedBalance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 1743,
-                      "src": "9509:19:5",
+                      "scope": 3185,
+                      "src": "9509:19:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56620,10 +56620,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 1705,
+                        "id": 3147,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9509:4:5",
+                        "src": "9509:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56633,43 +56633,43 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1709,
+                  "id": 3151,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 1707,
+                      "id": 3149,
                       "name": "bid",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1332,
-                      "src": "9531:3:5",
+                      "referencedDeclaration": 2774,
+                      "src": "9531:3:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "id": 1708,
+                    "id": 3150,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
                     "lValueRequested": false,
                     "memberName": "frozenSum",
                     "nodeType": "MemberAccess",
-                    "referencedDeclaration": 796,
-                    "src": "9531:13:5",
+                    "referencedDeclaration": 2238,
+                    "src": "9531:13:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9509:35:5"
+                  "src": "9509:35:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1736,
+                    "id": 3178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56678,26 +56678,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1710,
+                        "id": 3152,
                         "name": "deals",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 900,
-                        "src": "9554:5:5",
+                        "referencedDeclaration": 2342,
+                        "src": "9554:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                         }
                       },
-                      "id": 1712,
+                      "id": 3154,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1711,
+                        "id": 3153,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 885,
-                        "src": "9560:10:5",
+                        "referencedDeclaration": 2327,
+                        "src": "9560:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56708,9 +56708,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9554:17:5",
+                      "src": "9554:17:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                         "typeString": "struct Market.Deal storage ref"
                       }
                     },
@@ -56723,26 +56723,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1714,
+                            "id": 3156,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9579:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9579:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1715,
+                          "id": 3157,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "benchmarks",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 794,
-                          "src": "9579:14:5",
+                          "referencedDeclaration": 2236,
+                          "src": "9579:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
@@ -56752,26 +56752,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1716,
+                            "id": 3158,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9595:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9595:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1717,
+                          "id": 3159,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "9595:10:5",
+                          "referencedDeclaration": 2218,
+                          "src": "9595:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56781,26 +56781,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1718,
+                            "id": 3160,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "9607:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "9607:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1719,
+                          "id": 3161,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 776,
-                          "src": "9607:10:5",
+                          "referencedDeclaration": 2218,
+                          "src": "9607:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56808,12 +56808,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1720,
+                          "id": 3162,
                           "name": "master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1638,
-                          "src": "9619:6:5",
+                          "referencedDeclaration": 3080,
+                          "src": "9619:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56821,12 +56821,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1721,
+                          "id": 3163,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1318,
-                          "src": "9627:6:5",
+                          "referencedDeclaration": 2760,
+                          "src": "9627:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56834,12 +56834,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1722,
+                          "id": 3164,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1320,
-                          "src": "9635:6:5",
+                          "referencedDeclaration": 2762,
+                          "src": "9635:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56849,26 +56849,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1723,
+                            "id": 3165,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1332,
-                            "src": "9643:3:5",
+                            "referencedDeclaration": 2774,
+                            "src": "9643:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1724,
+                          "id": 3166,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 780,
-                          "src": "9643:12:5",
+                          "referencedDeclaration": 2222,
+                          "src": "9643:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56878,26 +56878,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1725,
+                            "id": 3167,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1326,
-                            "src": "9657:3:5",
+                            "referencedDeclaration": 2768,
+                            "src": "9657:3:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 1726,
+                          "id": 3168,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 782,
-                          "src": "9657:9:5",
+                          "referencedDeclaration": 2224,
+                          "src": "9657:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56905,12 +56905,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1727,
+                          "id": 3169,
                           "name": "startTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1683,
-                          "src": "9668:9:5",
+                          "referencedDeclaration": 3125,
+                          "src": "9668:9:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56918,12 +56918,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1728,
+                          "id": 3170,
                           "name": "endTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1688,
-                          "src": "9679:7:5",
+                          "referencedDeclaration": 3130,
+                          "src": "9679:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56933,18 +56933,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1729,
+                            "id": 3171,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "9688:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "9688:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 1730,
+                          "id": 3172,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -56952,20 +56952,20 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9688:26:5",
+                          "src": "9688:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1731,
+                          "id": 3173,
                           "name": "blockedBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1706,
-                          "src": "9716:14:5",
+                          "referencedDeclaration": 3148,
+                          "src": "9716:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56974,14 +56974,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1732,
+                          "id": 3174,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9732:1:5",
+                          "src": "9732:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -56993,18 +56993,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1733,
+                            "id": 3175,
                             "name": "block",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7759,
-                            "src": "9735:5:5",
+                            "referencedDeclaration": 11305,
+                            "src": "9735:5:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_block",
                               "typeString": "block"
                             }
                           },
-                          "id": 1734,
+                          "id": 3176,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57012,7 +57012,7 @@
                           "memberName": "timestamp",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9735:15:5",
+                          "src": "9735:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -57062,7 +57062,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           },
                           {
@@ -57078,18 +57078,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 1713,
+                        "id": 3155,
                         "name": "Deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 770,
-                        "src": "9574:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "9574:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Deal_$770_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Deal_$2212_storage_ptr_$",
                           "typeString": "type(struct Market.Deal storage pointer)"
                         }
                       },
-                      "id": 1735,
+                      "id": 3177,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -57097,21 +57097,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "9574:177:5",
+                      "src": "9574:177:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory",
                         "typeString": "struct Market.Deal memory"
                       }
                     },
-                    "src": "9554:197:5",
+                    "src": "9554:197:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
-                  "id": 1737,
+                  "id": 3179,
                   "nodeType": "ExpressionStatement",
-                  "src": "9554:197:5"
+                  "src": "9554:197:7"
                 },
                 {
                   "eventCall": {
@@ -57119,12 +57119,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1739,
+                        "id": 3181,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 885,
-                        "src": "9777:10:5",
+                        "referencedDeclaration": 2327,
+                        "src": "9777:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -57138,18 +57138,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1738,
+                      "id": 3180,
                       "name": "DealOpened",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 822,
-                      "src": "9766:10:5",
+                      "referencedDeclaration": 2264,
+                      "src": "9766:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1740,
+                    "id": 3182,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57157,57 +57157,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9766:22:5",
+                    "src": "9766:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1741,
+                  "id": 3183,
                   "nodeType": "EmitStatement",
-                  "src": "9761:27:5"
+                  "src": "9761:27:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1743,
+            "id": 3185,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1323,
+                "id": 2765,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1322,
+                  "id": 2764,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "6793:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "6793:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6793:13:5"
+                "src": "6793:13:7"
               }
             ],
             "name": "OpenDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1321,
+              "id": 2763,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1318,
+                  "id": 2760,
                   "name": "_askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1743,
-                  "src": "6767:11:5",
+                  "scope": 3185,
+                  "src": "6767:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -57215,10 +57215,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1317,
+                    "id": 2759,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6767:4:5",
+                    "src": "6767:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -57229,11 +57229,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1320,
+                  "id": 2762,
                   "name": "_bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1743,
-                  "src": "6780:11:5",
+                  "scope": 3185,
+                  "src": "6780:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -57241,10 +57241,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1319,
+                    "id": 2761,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6780:4:5",
+                    "src": "6780:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -57254,26 +57254,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6766:26:5"
+              "src": "6766:26:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1324,
+              "id": 2766,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6814:0:5"
+              "src": "6814:0:7"
             },
-            "scope": 3787,
-            "src": "6749:3046:5",
+            "scope": 5229,
+            "src": "6749:3046:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1833,
+              "id": 3275,
               "nodeType": "Block",
-              "src": "9883:573:5",
+              "src": "9883:573:7",
               "statements": [
                 {
                   "expression": {
@@ -57285,10 +57285,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 1759,
+                            "id": 3201,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57299,26 +57299,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1753,
+                                  "id": 3195,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "9902:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "9902:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1755,
+                                "id": 3197,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1754,
+                                  "id": 3196,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "9908:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "9908:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57329,23 +57329,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9902:13:5",
+                                "src": "9902:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1756,
+                              "id": 3198,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 763,
-                              "src": "9902:20:5",
+                              "referencedDeclaration": 2205,
+                              "src": "9902:20:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -57355,18 +57355,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1757,
+                                "id": 3199,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 722,
-                                "src": "9926:10:5",
+                                "referencedDeclaration": 2164,
+                                "src": "9926:10:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 1758,
+                              "id": 3200,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -57374,27 +57374,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9926:26:5",
+                              "src": "9926:26:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "9902:50:5",
+                            "src": "9902:50:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 1760,
+                        "id": 3202,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "9901:52:5",
+                        "src": "9901:52:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -57408,21 +57408,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1752,
+                      "id": 3194,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "9893:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "9893:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1761,
+                    "id": 3203,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57430,15 +57430,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9893:61:5",
+                    "src": "9893:61:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1762,
+                  "id": 3204,
                   "nodeType": "ExpressionStatement",
-                  "src": "9893:61:5"
+                  "src": "9893:61:7"
                 },
                 {
                   "expression": {
@@ -57450,7 +57450,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1786,
+                        "id": 3228,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -57461,7 +57461,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1778,
+                          "id": 3220,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57472,7 +57472,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1770,
+                            "id": 3212,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57481,18 +57481,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1764,
+                                "id": 3206,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "9972:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "9972:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1765,
+                              "id": 3207,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -57500,7 +57500,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9972:10:5",
+                              "src": "9972:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -57514,26 +57514,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1766,
+                                  "id": 3208,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "9986:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "9986:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1768,
+                                "id": 3210,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1767,
+                                  "id": 3209,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "9992:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "9992:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57544,27 +57544,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9986:13:5",
+                                "src": "9986:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1769,
+                              "id": 3211,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "9986:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "9986:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "9972:38:5",
+                            "src": "9972:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -57578,7 +57578,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1777,
+                            "id": 3219,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57587,18 +57587,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1771,
+                                "id": 3213,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10014:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10014:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1772,
+                              "id": 3214,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -57606,7 +57606,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10014:10:5",
+                              "src": "10014:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -57620,26 +57620,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1773,
+                                  "id": 3215,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10028:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10028:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1775,
+                                "id": 3217,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1774,
+                                  "id": 3216,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1745,
-                                  "src": "10034:6:5",
+                                  "referencedDeclaration": 3187,
+                                  "src": "10034:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57650,33 +57650,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10028:13:5",
+                                "src": "10028:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1776,
+                              "id": 3218,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "10028:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "10028:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10014:38:5",
+                            "src": "10014:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "9972:80:5",
+                          "src": "9972:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -57690,7 +57690,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 1785,
+                          "id": 3227,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57699,18 +57699,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1779,
+                              "id": 3221,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "10056:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "10056:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1780,
+                            "id": 3222,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57718,7 +57718,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10056:10:5",
+                            "src": "10056:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -57732,26 +57732,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1781,
+                                "id": 3223,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "10070:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "10070:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 1783,
+                              "id": 3225,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1782,
+                                "id": 3224,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1745,
-                                "src": "10076:6:5",
+                                "referencedDeclaration": 3187,
+                                "src": "10076:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -57762,33 +57762,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10070:13:5",
+                              "src": "10070:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 1784,
+                            "id": 3226,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "10070:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "10070:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10056:36:5",
+                          "src": "10056:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "9972:120:5",
+                        "src": "9972:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -57802,21 +57802,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1763,
+                      "id": 3205,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "9964:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "9964:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1787,
+                    "id": 3229,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57824,15 +57824,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9964:129:5",
+                    "src": "9964:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1788,
+                  "id": 3230,
                   "nodeType": "ExpressionStatement",
-                  "src": "9964:129:5"
+                  "src": "9964:129:7"
                 },
                 {
                   "condition": {
@@ -57841,7 +57841,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1801,
+                    "id": 3243,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57850,18 +57850,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1789,
+                        "id": 3231,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "10108:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "10108:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 1790,
+                      "id": 3232,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -57869,7 +57869,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "10108:15:5",
+                      "src": "10108:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -57886,26 +57886,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1796,
+                              "id": 3238,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10155:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10155:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1798,
+                            "id": 3240,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1797,
+                              "id": 3239,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1745,
-                              "src": "10161:6:5",
+                              "referencedDeclaration": 3187,
+                              "src": "10161:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -57916,21 +57916,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10155:13:5",
+                            "src": "10155:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1799,
+                          "id": 3241,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 755,
-                          "src": "10155:22:5",
+                          "referencedDeclaration": 2197,
+                          "src": "10155:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -57950,26 +57950,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1791,
+                              "id": 3233,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10127:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10127:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1793,
+                            "id": 3235,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1792,
+                              "id": 3234,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1745,
-                              "src": "10133:6:5",
+                              "referencedDeclaration": 3187,
+                              "src": "10133:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -57980,41 +57980,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10127:13:5",
+                            "src": "10127:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1794,
+                          "id": 3236,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 759,
-                          "src": "10127:23:5",
+                          "referencedDeclaration": 2201,
+                          "src": "10127:23:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1795,
+                        "id": 3237,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "10127:27:5",
+                        "referencedDeclaration": 10795,
+                        "src": "10127:27:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1800,
+                      "id": 3242,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -58022,26 +58022,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "10127:51:5",
+                      "src": "10127:51:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10108:70:5",
+                    "src": "10108:70:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1813,
+                  "id": 3255,
                   "nodeType": "IfStatement",
-                  "src": "10104:177:5",
+                  "src": "10104:177:7",
                   "trueBody": {
-                    "id": 1812,
+                    "id": 3254,
                     "nodeType": "Block",
-                    "src": "10180:101:5",
+                    "src": "10180:101:7",
                     "statements": [
                       {
                         "expression": {
@@ -58053,7 +58053,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 1809,
+                              "id": 3251,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58064,26 +58064,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 1803,
+                                    "id": 3245,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "10231:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "10231:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 1805,
+                                  "id": 3247,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1804,
+                                    "id": 3246,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1745,
-                                    "src": "10237:6:5",
+                                    "referencedDeclaration": 3187,
+                                    "src": "10237:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -58094,21 +58094,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "10231:13:5",
+                                  "src": "10231:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 1806,
+                                "id": 3248,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "10231:24:5",
+                                "referencedDeclaration": 2189,
+                                "src": "10231:24:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -58120,18 +58120,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 1807,
+                                  "id": 3249,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "10259:3:5",
+                                  "referencedDeclaration": 11315,
+                                  "src": "10259:3:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 1808,
+                                "id": 3250,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -58139,13 +58139,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "10259:10:5",
+                                "src": "10259:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "10231:38:5",
+                              "src": "10231:38:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -58159,21 +58159,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1802,
+                            "id": 3244,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "10223:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "10223:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1810,
+                          "id": 3252,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -58181,15 +58181,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10223:47:5",
+                          "src": "10223:47:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1811,
+                        "id": 3253,
                         "nodeType": "ExpressionStatement",
-                        "src": "10223:47:5"
+                        "src": "10223:47:7"
                       }
                     ]
                   }
@@ -58200,12 +58200,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1815,
+                        "id": 3257,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10305:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10305:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58213,14 +58213,14 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1816,
+                        "id": 3258,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1747,
-                        "src": "10313:11:5",
+                        "referencedDeclaration": 3189,
+                        "src": "10313:11:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       }
@@ -58232,22 +58232,22 @@
                           "typeString": "uint256"
                         },
                         {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       ],
-                      "id": 1814,
+                      "id": 3256,
                       "name": "AddToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3489,
-                      "src": "10290:14:5",
+                      "referencedDeclaration": 4931,
+                      "src": "10290:14:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$740_$returns$__$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2182_$returns$__$",
                         "typeString": "function (uint256,enum Market.BlacklistPerson)"
                       }
                     },
-                    "id": 1817,
+                    "id": 3259,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58255,15 +58255,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10290:35:5",
+                    "src": "10290:35:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1818,
+                  "id": 3260,
                   "nodeType": "ExpressionStatement",
-                  "src": "10290:35:5"
+                  "src": "10290:35:7"
                 },
                 {
                   "expression": {
@@ -58271,12 +58271,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1820,
+                        "id": 3262,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10348:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10348:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58290,18 +58290,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1819,
+                      "id": 3261,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3200,
-                      "src": "10335:12:5",
+                      "referencedDeclaration": 4642,
+                      "src": "10335:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1821,
+                    "id": 3263,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58309,15 +58309,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10335:20:5",
+                    "src": "10335:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1822,
+                  "id": 3264,
                   "nodeType": "ExpressionStatement",
-                  "src": "10335:20:5"
+                  "src": "10335:20:7"
                 },
                 {
                   "expression": {
@@ -58325,12 +58325,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1824,
+                        "id": 3266,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10383:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10383:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58344,18 +58344,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1823,
+                      "id": 3265,
                       "name": "InternalCloseDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3562,
-                      "src": "10365:17:5",
+                      "referencedDeclaration": 5004,
+                      "src": "10365:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1825,
+                    "id": 3267,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58363,15 +58363,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10365:25:5",
+                    "src": "10365:25:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1826,
+                  "id": 3268,
                   "nodeType": "ExpressionStatement",
-                  "src": "10365:25:5"
+                  "src": "10365:25:7"
                 },
                 {
                   "expression": {
@@ -58379,12 +58379,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1828,
+                        "id": 3270,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1745,
-                        "src": "10421:6:5",
+                        "referencedDeclaration": 3187,
+                        "src": "10421:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58398,18 +58398,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1827,
+                      "id": 3269,
                       "name": "RefundRemainingFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3386,
-                      "src": "10400:20:5",
+                      "referencedDeclaration": 4828,
+                      "src": "10400:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1829,
+                    "id": 3271,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58417,28 +58417,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10400:28:5",
+                    "src": "10400:28:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1830,
+                  "id": 3272,
                   "nodeType": "ExpressionStatement",
-                  "src": "10400:28:5"
+                  "src": "10400:28:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1831,
+                    "id": 3273,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10445:4:5",
+                    "src": "10445:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -58446,15 +58446,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1751,
-                  "id": 1832,
+                  "functionReturnParameters": 3193,
+                  "id": 3274,
                   "nodeType": "Return",
-                  "src": "10438:11:5"
+                  "src": "10438:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1834,
+            "id": 3276,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -58462,16 +58462,16 @@
             "name": "CloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1748,
+              "id": 3190,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1745,
+                  "id": 3187,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9820:11:5",
+                  "scope": 3276,
+                  "src": "9820:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58479,10 +58479,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1744,
+                    "id": 3186,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9820:4:5",
+                    "src": "9820:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -58493,26 +58493,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 1747,
+                  "id": 3189,
                   "name": "blacklisted",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9833:27:5",
+                  "scope": 3276,
+                  "src": "9833:27:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 1746,
+                    "id": 3188,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 740,
-                    "src": "9833:15:5",
+                    "referencedDeclaration": 2182,
+                    "src": "9833:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -58520,20 +58520,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9819:42:5"
+              "src": "9819:42:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1751,
+              "id": 3193,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1750,
+                  "id": 3192,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1834,
-                  "src": "9878:4:5",
+                  "scope": 3276,
+                  "src": "9878:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58541,10 +58541,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1749,
+                    "id": 3191,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9878:4:5",
+                    "src": "9878:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -58554,19 +58554,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9877:6:5"
+              "src": "9877:6:7"
             },
-            "scope": 3787,
-            "src": "9801:655:5",
+            "scope": 5229,
+            "src": "9801:655:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1851,
+              "id": 3293,
               "nodeType": "Block",
-              "src": "10510:98:5",
+              "src": "10510:98:7",
               "statements": [
                 {
                   "expression": {
@@ -58574,12 +58574,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1842,
+                        "id": 3284,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1836,
-                        "src": "10533:6:5",
+                        "referencedDeclaration": 3278,
+                        "src": "10533:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58593,18 +58593,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1841,
+                      "id": 3283,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3200,
-                      "src": "10520:12:5",
+                      "referencedDeclaration": 4642,
+                      "src": "10520:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1843,
+                    "id": 3285,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58612,15 +58612,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10520:20:5",
+                    "src": "10520:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1844,
+                  "id": 3286,
                   "nodeType": "ExpressionStatement",
-                  "src": "10520:20:5"
+                  "src": "10520:20:7"
                 },
                 {
                   "expression": {
@@ -58628,12 +58628,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1846,
+                        "id": 3288,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1836,
-                        "src": "10573:6:5",
+                        "referencedDeclaration": 3278,
+                        "src": "10573:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58647,18 +58647,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1845,
+                      "id": 3287,
                       "name": "ReserveNextPeriodFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3348,
-                      "src": "10550:22:5",
+                      "referencedDeclaration": 4790,
+                      "src": "10550:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 1847,
+                    "id": 3289,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58666,28 +58666,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10550:30:5",
+                    "src": "10550:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1848,
+                  "id": 3290,
                   "nodeType": "ExpressionStatement",
-                  "src": "10550:30:5"
+                  "src": "10550:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1849,
+                    "id": 3291,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10597:4:5",
+                    "src": "10597:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -58695,15 +58695,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1840,
-                  "id": 1850,
+                  "functionReturnParameters": 3282,
+                  "id": 3292,
                   "nodeType": "Return",
-                  "src": "10590:11:5"
+                  "src": "10590:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 1852,
+            "id": 3294,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -58711,16 +58711,16 @@
             "name": "Bill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1837,
+              "id": 3279,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1836,
+                  "id": 3278,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1852,
-                  "src": "10476:11:5",
+                  "scope": 3294,
+                  "src": "10476:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58728,10 +58728,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1835,
+                    "id": 3277,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10476:4:5",
+                    "src": "10476:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -58741,20 +58741,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10475:13:5"
+              "src": "10475:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1840,
+              "id": 3282,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1839,
+                  "id": 3281,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1852,
-                  "src": "10505:4:5",
+                  "scope": 3294,
+                  "src": "10505:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58762,10 +58762,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1838,
+                    "id": 3280,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10505:4:5",
+                    "src": "10505:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -58775,19 +58775,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10504:6:5"
+              "src": "10504:6:7"
             },
-            "scope": 3787,
-            "src": "10462:146:5",
+            "scope": 5229,
+            "src": "10462:146:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2345,
+              "id": 3787,
               "nodeType": "Block",
-              "src": "10727:3974:5",
+              "src": "10727:3974:7",
               "statements": [
                 {
                   "expression": {
@@ -58799,7 +58799,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1886,
+                        "id": 3328,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -58810,7 +58810,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 1878,
+                          "id": 3320,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -58821,7 +58821,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1870,
+                            "id": 3312,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -58830,18 +58830,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1864,
+                                "id": 3306,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10745:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10745:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1865,
+                              "id": 3307,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58849,7 +58849,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10745:10:5",
+                              "src": "10745:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -58863,26 +58863,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1866,
+                                  "id": 3308,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10759:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10759:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1868,
+                                "id": 3310,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1867,
+                                  "id": 3309,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "10765:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "10765:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -58893,27 +58893,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10759:13:5",
+                                "src": "10759:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1869,
+                              "id": 3311,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "10759:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "10759:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10745:38:5",
+                            "src": "10745:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -58927,7 +58927,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 1877,
+                            "id": 3319,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -58936,18 +58936,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1871,
+                                "id": 3313,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "10787:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "10787:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1872,
+                              "id": 3314,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58955,7 +58955,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10787:10:5",
+                              "src": "10787:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -58969,26 +58969,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1873,
+                                  "id": 3315,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "10801:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "10801:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 1875,
+                                "id": 3317,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1874,
+                                  "id": 3316,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "10807:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "10807:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -58999,33 +58999,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10801:13:5",
+                                "src": "10801:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 1876,
+                              "id": 3318,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 749,
-                              "src": "10801:22:5",
+                              "referencedDeclaration": 2191,
+                              "src": "10801:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10787:36:5",
+                            "src": "10787:36:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "10745:78:5",
+                          "src": "10745:78:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -59039,7 +59039,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 1885,
+                          "id": 3327,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -59048,18 +59048,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1879,
+                              "id": 3321,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "10827:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "10827:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 1880,
+                            "id": 3322,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -59067,7 +59067,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10827:10:5",
+                            "src": "10827:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -59081,26 +59081,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1881,
+                                "id": 3323,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "10841:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "10841:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 1883,
+                              "id": 3325,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1882,
+                                "id": 3324,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "10847:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "10847:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -59111,33 +59111,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10841:13:5",
+                              "src": "10841:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 1884,
+                            "id": 3326,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "supplierID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 745,
-                            "src": "10841:24:5",
+                            "referencedDeclaration": 2187,
+                            "src": "10841:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10827:38:5",
+                          "src": "10827:38:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10745:120:5",
+                        "src": "10745:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -59151,21 +59151,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1863,
+                      "id": 3305,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "10737:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "10737:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1887,
+                    "id": 3329,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59173,15 +59173,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10737:129:5",
+                    "src": "10737:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1888,
+                  "id": 3330,
                   "nodeType": "ExpressionStatement",
-                  "src": "10737:129:5"
+                  "src": "10737:129:7"
                 },
                 {
                   "expression": {
@@ -59190,10 +59190,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 1896,
+                        "id": 3338,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -59204,26 +59204,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1890,
+                              "id": 3332,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "10884:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "10884:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 1892,
+                            "id": 3334,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 1891,
+                              "id": 3333,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "10890:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "10890:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -59234,23 +59234,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10884:13:5",
+                            "src": "10884:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 1893,
+                          "id": 3335,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 763,
-                          "src": "10884:20:5",
+                          "referencedDeclaration": 2205,
+                          "src": "10884:20:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -59260,18 +59260,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1894,
+                            "id": 3336,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "10908:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "10908:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 1895,
+                          "id": 3337,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -59279,13 +59279,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "10908:26:5",
+                          "src": "10908:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "10884:50:5",
+                        "src": "10884:50:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -59299,21 +59299,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1889,
+                      "id": 3331,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "10876:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "10876:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1897,
+                    "id": 3339,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59321,15 +59321,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10876:59:5",
+                    "src": "10876:59:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1898,
+                  "id": 3340,
                   "nodeType": "ExpressionStatement",
-                  "src": "10876:59:5"
+                  "src": "10876:59:7"
                 },
                 {
                   "condition": {
@@ -59337,12 +59337,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1900,
+                        "id": 3342,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1854,
-                        "src": "10957:6:5",
+                        "referencedDeclaration": 3296,
+                        "src": "10957:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -59356,18 +59356,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1899,
+                      "id": 3341,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3401,
-                      "src": "10950:6:5",
+                      "referencedDeclaration": 4843,
+                      "src": "10950:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 1901,
+                    "id": 3343,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59375,20 +59375,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10950:14:5",
+                    "src": "10950:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1909,
+                  "id": 3351,
                   "nodeType": "IfStatement",
-                  "src": "10946:70:5",
+                  "src": "10946:70:7",
                   "trueBody": {
-                    "id": 1908,
+                    "id": 3350,
                     "nodeType": "Block",
-                    "src": "10966:50:5",
+                    "src": "10966:50:7",
                     "statements": [
                       {
                         "expression": {
@@ -59400,19 +59400,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 1905,
+                              "id": 3347,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 1903,
+                                "id": 3345,
                                 "name": "newDuration",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1858,
-                                "src": "10988:11:5",
+                                "referencedDeclaration": 3300,
+                                "src": "10988:11:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -59423,14 +59423,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 1904,
+                                "id": 3346,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11003:1:5",
+                                "src": "11003:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -59438,7 +59438,7 @@
                                 },
                                 "value": "0"
                               },
-                              "src": "10988:16:5",
+                              "src": "10988:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -59452,21 +59452,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 1902,
+                            "id": 3344,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "10980:7:5",
+                            "referencedDeclaration": 11318,
+                            "src": "10980:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 1906,
+                          "id": 3348,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -59474,15 +59474,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10980:25:5",
+                          "src": "10980:25:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1907,
+                        "id": 3349,
                         "nodeType": "ExpressionStatement",
-                        "src": "10980:25:5"
+                        "src": "10980:25:7"
                       }
                     ]
                   }
@@ -59490,19 +59490,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1915,
+                    "id": 3357,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1910,
+                      "id": 3352,
                       "name": "requestsAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 888,
-                      "src": "11026:14:5",
+                      "referencedDeclaration": 2330,
+                      "src": "11026:14:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -59516,14 +59516,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 1913,
+                          "id": 3355,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "11062:1:5",
+                          "src": "11062:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -59541,32 +59541,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1911,
+                          "id": 3353,
                           "name": "requestsAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 888,
-                          "src": "11043:14:5",
+                          "referencedDeclaration": 2330,
+                          "src": "11043:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1912,
+                        "id": 3354,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "11043:18:5",
+                        "referencedDeclaration": 10795,
+                        "src": "11043:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 1914,
+                      "id": 3356,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -59574,47 +59574,47 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11043:21:5",
+                      "src": "11043:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11026:38:5",
+                    "src": "11026:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1916,
+                  "id": 3358,
                   "nodeType": "ExpressionStatement",
-                  "src": "11026:38:5"
+                  "src": "11026:38:7"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 1918,
+                      "id": 3360,
                       "name": "requestType",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2346,
-                      "src": "11075:21:5",
+                      "scope": 3788,
+                      "src": "11075:21:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 1917,
+                        "id": 3359,
                         "name": "OrderType",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 726,
-                        "src": "11075:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "11075:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -59622,10 +59622,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 1919,
+                  "id": 3361,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11075:21:5"
+                  "src": "11075:21:7"
                 },
                 {
                   "condition": {
@@ -59634,7 +59634,7 @@
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "id": 1926,
+                    "id": 3368,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59643,18 +59643,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1920,
+                        "id": 3362,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "11111:3:5",
+                        "referencedDeclaration": 11315,
+                        "src": "11111:3:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 1921,
+                      "id": 3363,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -59662,7 +59662,7 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11111:10:5",
+                      "src": "11111:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -59676,26 +59676,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1922,
+                          "id": 3364,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "11125:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "11125:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 1924,
+                        "id": 3366,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1923,
+                          "id": 3365,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "11131:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "11131:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59706,55 +59706,55 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11125:13:5",
+                        "src": "11125:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 1925,
+                      "id": 3367,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "consumerID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 747,
-                      "src": "11125:24:5",
+                      "referencedDeclaration": 2189,
+                      "src": "11125:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "11111:38:5",
+                    "src": "11111:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 1938,
+                    "id": 3380,
                     "nodeType": "Block",
-                    "src": "11215:58:5",
+                    "src": "11215:58:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1936,
+                          "id": 3378,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1933,
+                            "id": 3375,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1918,
-                            "src": "11229:11:5",
+                            "referencedDeclaration": 3360,
+                            "src": "11229:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -59764,18 +59764,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1934,
+                              "id": 3376,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 726,
-                              "src": "11243:9:5",
+                              "referencedDeclaration": 2168,
+                              "src": "11243:9:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 1935,
+                            "id": 3377,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -59783,50 +59783,50 @@
                             "memberName": "ORDER_ASK",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11243:19:5",
+                            "src": "11243:19:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11229:33:5",
+                          "src": "11229:33:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 1937,
+                        "id": 3379,
                         "nodeType": "ExpressionStatement",
-                        "src": "11229:33:5"
+                        "src": "11229:33:7"
                       }
                     ]
                   },
-                  "id": 1939,
+                  "id": 3381,
                   "nodeType": "IfStatement",
-                  "src": "11107:166:5",
+                  "src": "11107:166:7",
                   "trueBody": {
-                    "id": 1932,
+                    "id": 3374,
                     "nodeType": "Block",
-                    "src": "11151:58:5",
+                    "src": "11151:58:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1930,
+                          "id": 3372,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 1927,
+                            "id": 3369,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1918,
-                            "src": "11165:11:5",
+                            "referencedDeclaration": 3360,
+                            "src": "11165:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -59836,18 +59836,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1928,
+                              "id": 3370,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 726,
-                              "src": "11179:9:5",
+                              "referencedDeclaration": 2168,
+                              "src": "11179:9:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 1929,
+                            "id": 3371,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -59855,21 +59855,21 @@
                             "memberName": "ORDER_BID",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11179:19:5",
+                            "src": "11179:19:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$726",
+                              "typeIdentifier": "t_enum$_OrderType_$2168",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11165:33:5",
+                          "src": "11165:33:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 1931,
+                        "id": 3373,
                         "nodeType": "ExpressionStatement",
-                        "src": "11165:33:5"
+                        "src": "11165:33:7"
                       }
                     ]
                   }
@@ -59877,7 +59877,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1951,
+                    "id": 3393,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59886,26 +59886,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1940,
+                        "id": 3382,
                         "name": "requests",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 909,
-                        "src": "11283:8:5",
+                        "referencedDeclaration": 2351,
+                        "src": "11283:8:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                         }
                       },
-                      "id": 1942,
+                      "id": 3384,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1941,
+                        "id": 3383,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 888,
-                        "src": "11292:14:5",
+                        "referencedDeclaration": 2330,
+                        "src": "11292:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -59916,9 +59916,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "11283:24:5",
+                      "src": "11283:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                         "typeString": "struct Market.ChangeRequest storage ref"
                       }
                     },
@@ -59929,12 +59929,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 1944,
+                          "id": 3386,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "11324:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "11324:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59942,25 +59942,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1945,
+                          "id": 3387,
                           "name": "requestType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1918,
-                          "src": "11332:11:5",
+                          "referencedDeclaration": 3360,
+                          "src": "11332:11:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1946,
+                          "id": 3388,
                           "name": "newPrice",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1856,
-                          "src": "11345:8:5",
+                          "referencedDeclaration": 3298,
+                          "src": "11345:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59968,12 +59968,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 1947,
+                          "id": 3389,
                           "name": "newDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1858,
-                          "src": "11355:11:5",
+                          "referencedDeclaration": 3300,
+                          "src": "11355:11:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59983,18 +59983,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1948,
+                            "id": 3390,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 736,
-                            "src": "11368:13:5",
+                            "referencedDeclaration": 2178,
+                            "src": "11368:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 1949,
+                          "id": 3391,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -60002,9 +60002,9 @@
                           "memberName": "REQUEST_CREATED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "11368:29:5",
+                          "src": "11368:29:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         }
@@ -60016,7 +60016,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$726",
+                            "typeIdentifier": "t_enum$_OrderType_$2168",
                             "typeString": "enum Market.OrderType"
                           },
                           {
@@ -60028,22 +60028,22 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         ],
-                        "id": 1943,
+                        "id": 3385,
                         "name": "ChangeRequest",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 810,
-                        "src": "11310:13:5",
+                        "referencedDeclaration": 2252,
+                        "src": "11310:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$810_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2252_storage_ptr_$",
                           "typeString": "type(struct Market.ChangeRequest storage pointer)"
                         }
                       },
-                      "id": 1950,
+                      "id": 3392,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -60051,21 +60051,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11310:88:5",
+                      "src": "11310:88:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory",
                         "typeString": "struct Market.ChangeRequest memory"
                       }
                     },
-                    "src": "11283:115:5",
+                    "src": "11283:115:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
-                  "id": 1952,
+                  "id": 3394,
                   "nodeType": "ExpressionStatement",
-                  "src": "11283:115:5"
+                  "src": "11283:115:7"
                 },
                 {
                   "eventCall": {
@@ -60073,12 +60073,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1954,
+                        "id": 3396,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 888,
-                        "src": "11434:14:5",
+                        "referencedDeclaration": 2330,
+                        "src": "11434:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -60092,18 +60092,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 1953,
+                      "id": 3395,
                       "name": "DealChangeRequestSet",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 836,
-                      "src": "11413:20:5",
+                      "referencedDeclaration": 2278,
+                      "src": "11413:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 1955,
+                    "id": 3397,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -60111,38 +60111,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11413:36:5",
+                    "src": "11413:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1956,
+                  "id": 3398,
                   "nodeType": "EmitStatement",
-                  "src": "11408:41:5"
+                  "src": "11408:41:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 1960,
+                    "id": 3402,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1957,
+                      "id": 3399,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1918,
-                      "src": "11464:11:5",
+                      "referencedDeclaration": 3360,
+                      "src": "11464:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -60152,18 +60152,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1958,
+                        "id": 3400,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "11479:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "11479:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 1959,
+                      "id": 3401,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -60171,26 +60171,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11479:19:5",
+                      "src": "11479:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "11464:34:5",
+                    "src": "11464:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2161,
+                  "id": 3603,
                   "nodeType": "IfStatement",
-                  "src": "11460:1719:5",
+                  "src": "11460:1719:7",
                   "trueBody": {
-                    "id": 2160,
+                    "id": 3602,
                     "nodeType": "Block",
-                    "src": "11500:1679:5",
+                    "src": "11500:1679:7",
                     "statements": [
                       {
                         "eventCall": {
@@ -60202,26 +60202,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 1962,
+                                  "id": 3404,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "11544:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "11544:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 1964,
+                                "id": 3406,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 1963,
+                                  "id": 3405,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11559:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11559:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60232,24 +60232,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11544:22:5",
+                                "src": "11544:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 1966,
+                              "id": 3408,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 1965,
+                                "id": 3407,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11567:1:5",
+                                "src": "11567:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -60262,7 +60262,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11544:25:5",
+                              "src": "11544:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60276,18 +60276,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 1961,
+                            "id": 3403,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "11519:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "11519:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 1967,
+                          "id": 3409,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60295,20 +60295,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "11519:51:5",
+                          "src": "11519:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 1968,
+                        "id": 3410,
                         "nodeType": "EmitStatement",
-                        "src": "11514:56:5"
+                        "src": "11514:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1979,
+                          "id": 3421,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60319,44 +60319,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1969,
+                                "id": 3411,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "11584:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "11584:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 1975,
+                              "id": 3417,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 1970,
+                                    "id": 3412,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "11593:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "11593:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 1972,
+                                  "id": 3414,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 1971,
+                                    "id": 3413,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "11608:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "11608:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -60367,24 +60367,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "11593:22:5",
+                                  "src": "11593:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 1974,
+                                "id": 3416,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 1973,
+                                  "id": 3415,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "11616:1:5",
+                                  "src": "11616:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -60397,7 +60397,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11593:25:5",
+                                "src": "11593:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60408,23 +60408,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11584:35:5",
+                              "src": "11584:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 1976,
+                            "id": 3418,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "11584:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "11584:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -60434,18 +60434,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 1977,
+                              "id": 3419,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "11629:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "11629:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 1978,
+                            "id": 3420,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -60453,26 +60453,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11629:30:5",
+                            "src": "11629:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "11584:75:5",
+                          "src": "11584:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 1980,
+                        "id": 3422,
                         "nodeType": "ExpressionStatement",
-                        "src": "11584:75:5"
+                        "src": "11584:75:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1987,
+                          "id": 3429,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60483,26 +60483,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1981,
+                                "id": 3423,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "11673:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "11673:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 1984,
+                              "id": 3426,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1982,
+                                "id": 3424,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "11688:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "11688:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60513,24 +60513,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11673:22:5",
+                              "src": "11673:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 1985,
+                            "id": 3427,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 1983,
+                              "id": 3425,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11696:1:5",
+                              "src": "11696:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -60543,7 +60543,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "11673:25:5",
+                            "src": "11673:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -60553,54 +60553,54 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 1986,
+                            "id": 3428,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "11701:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "11701:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "11673:42:5",
+                          "src": "11673:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 1988,
+                        "id": 3430,
                         "nodeType": "ExpressionStatement",
-                        "src": "11673:42:5"
+                        "src": "11673:42:7"
                       },
                       {
                         "assignments": [
-                          1990
+                          3432
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 1990,
+                            "id": 3432,
                             "name": "matchingRequest",
                             "nodeType": "VariableDeclaration",
-                            "scope": 2346,
-                            "src": "11729:36:5",
+                            "scope": 3788,
+                            "src": "11729:36:7",
                             "stateVariable": false,
                             "storageLocation": "memory",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 1989,
+                              "id": 3431,
                               "name": "ChangeRequest",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 810,
-                              "src": "11729:13:5",
+                              "referencedDeclaration": 2252,
+                              "src": "11729:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                                 "typeString": "struct Market.ChangeRequest"
                               }
                             },
@@ -60608,49 +60608,49 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 1998,
+                        "id": 3440,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1991,
+                            "id": 3433,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "11768:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "11768:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 1997,
+                          "id": 3439,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 1992,
+                                "id": 3434,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "11777:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "11777:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 1994,
+                              "id": 3436,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 1993,
+                                "id": 3435,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "11792:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "11792:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60661,24 +60661,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11777:22:5",
+                              "src": "11777:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 1996,
+                            "id": 3438,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 1995,
+                              "id": 3437,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11800:1:5",
+                              "src": "11800:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -60691,7 +60691,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "11777:25:5",
+                            "src": "11777:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -60702,14 +60702,14 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "11768:35:5",
+                          "src": "11768:35:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "11729:74:5"
+                        "src": "11729:74:7"
                       },
                       {
                         "condition": {
@@ -60718,7 +60718,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2011,
+                          "id": 3453,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60729,19 +60729,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2004,
+                            "id": 3446,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 1999,
+                              "id": 3441,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1858,
-                              "src": "11822:11:5",
+                              "referencedDeclaration": 3300,
+                              "src": "11822:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60755,26 +60755,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2000,
+                                  "id": 3442,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "11837:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "11837:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2002,
+                                "id": 3444,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2001,
+                                  "id": 3443,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11843:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11843:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60785,27 +60785,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11837:13:5",
+                                "src": "11837:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2003,
+                              "id": 3445,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 755,
-                              "src": "11837:22:5",
+                              "referencedDeclaration": 2197,
+                              "src": "11837:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11822:37:5",
+                            "src": "11822:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -60819,19 +60819,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2010,
+                            "id": 3452,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2005,
+                              "id": 3447,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1856,
-                              "src": "11863:8:5",
+                              "referencedDeclaration": 3298,
+                              "src": "11863:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60845,26 +60845,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2006,
+                                  "id": 3448,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "11874:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "11874:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2008,
+                                "id": 3450,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2007,
+                                  "id": 3449,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "11880:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "11880:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60875,33 +60875,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11874:13:5",
+                                "src": "11874:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2009,
+                              "id": 3451,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 757,
-                              "src": "11874:19:5",
+                              "referencedDeclaration": 2199,
+                              "src": "11874:19:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11863:30:5",
+                            "src": "11863:30:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "11822:71:5",
+                          "src": "11822:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -60914,7 +60914,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 2058,
+                            "id": 3500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -60925,7 +60925,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2053,
+                              "id": 3495,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -60933,10 +60933,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 2048,
+                                "id": 3490,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -60945,28 +60945,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2044,
+                                    "id": 3486,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "12190:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "12190:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2045,
+                                  "id": 3487,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "12190:22:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "12190:22:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -60976,18 +60976,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2046,
+                                    "id": 3488,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "12216:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "12216:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2047,
+                                  "id": 3489,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -60995,13 +60995,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "12216:29:5",
+                                  "src": "12216:29:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "12190:55:5",
+                                "src": "12190:55:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -61015,7 +61015,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 2052,
+                                "id": 3494,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -61024,26 +61024,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2049,
+                                    "id": 3491,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "12249:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "12249:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2050,
+                                  "id": 3492,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 807,
-                                  "src": "12249:24:5",
+                                  "referencedDeclaration": 2249,
+                                  "src": "12249:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -61053,24 +61053,24 @@
                                 "operator": ">=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2051,
+                                  "id": 3493,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1858,
-                                  "src": "12277:11:5",
+                                  "referencedDeclaration": 3300,
+                                  "src": "12277:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12249:39:5",
+                                "src": "12249:39:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "12190:98:5",
+                              "src": "12190:98:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -61084,7 +61084,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2057,
+                              "id": 3499,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -61093,26 +61093,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2054,
+                                  "id": 3496,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1990,
-                                  "src": "12292:15:5",
+                                  "referencedDeclaration": 3432,
+                                  "src": "12292:15:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2055,
+                                "id": 3497,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 805,
-                                "src": "12292:21:5",
+                                "referencedDeclaration": 2247,
+                                "src": "12292:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -61122,67 +61122,67 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2056,
+                                "id": 3498,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1856,
-                                "src": "12317:8:5",
+                                "referencedDeclaration": 3298,
+                                "src": "12317:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "12292:33:5",
+                              "src": "12292:33:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "12190:135:5",
+                            "src": "12190:135:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2129,
+                            "id": 3571,
                             "nodeType": "Block",
-                            "src": "12899:54:5",
+                            "src": "12899:54:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2127,
+                                  "id": 3569,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 888,
-                                  "src": "12924:14:5",
+                                  "referencedDeclaration": 2330,
+                                  "src": "12924:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 1862,
-                                "id": 2128,
+                                "functionReturnParameters": 3304,
+                                "id": 3570,
                                 "nodeType": "Return",
-                                "src": "12917:21:5"
+                                "src": "12917:21:7"
                               }
                             ]
                           },
-                          "id": 2130,
+                          "id": 3572,
                           "nodeType": "IfStatement",
-                          "src": "12186:767:5",
+                          "src": "12186:767:7",
                           "trueBody": {
-                            "id": 2126,
+                            "id": 3568,
                             "nodeType": "Block",
-                            "src": "12327:566:5",
+                            "src": "12327:566:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2065,
+                                  "id": 3507,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61193,26 +61193,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2059,
+                                        "id": 3501,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "12345:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "12345:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2061,
+                                      "id": 3503,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2060,
+                                        "id": 3502,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 888,
-                                        "src": "12354:14:5",
+                                        "referencedDeclaration": 2330,
+                                        "src": "12354:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61223,23 +61223,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12345:24:5",
+                                      "src": "12345:24:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2062,
+                                    "id": 3504,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "12345:31:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "12345:31:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -61249,18 +61249,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2063,
+                                      "id": 3505,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "12379:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "12379:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2064,
+                                    "id": 3506,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -61268,26 +61268,26 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12379:30:5",
+                                    "src": "12379:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12345:64:5",
+                                  "src": "12345:64:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2066,
+                                "id": 3508,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12345:64:5"
+                                "src": "12345:64:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2077,
+                                  "id": 3519,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61298,44 +61298,44 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2067,
+                                        "id": 3509,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "12427:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "12427:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2073,
+                                      "id": 3515,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
                                           "baseExpression": {
                                             "argumentTypes": null,
-                                            "id": 2068,
+                                            "id": 3510,
                                             "name": "actualRequests",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 915,
-                                            "src": "12436:14:5",
+                                            "referencedDeclaration": 2357,
+                                            "src": "12436:14:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                               "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                             }
                                           },
-                                          "id": 2070,
+                                          "id": 3512,
                                           "indexExpression": {
                                             "argumentTypes": null,
-                                            "id": 2069,
+                                            "id": 3511,
                                             "name": "dealID",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 1854,
-                                            "src": "12451:6:5",
+                                            "referencedDeclaration": 3296,
+                                            "src": "12451:6:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -61346,24 +61346,24 @@
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "nodeType": "IndexAccess",
-                                          "src": "12436:22:5",
+                                          "src": "12436:22:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                             "typeString": "uint256[2] storage ref"
                                           }
                                         },
-                                        "id": 2072,
+                                        "id": 3514,
                                         "indexExpression": {
                                           "argumentTypes": null,
                                           "hexValue": "30",
-                                          "id": 2071,
+                                          "id": 3513,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": true,
                                           "kind": "number",
                                           "lValueRequested": false,
                                           "nodeType": "Literal",
-                                          "src": "12459:1:5",
+                                          "src": "12459:1:7",
                                           "subdenomination": null,
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_rational_0_by_1",
@@ -61376,7 +61376,7 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12436:25:5",
+                                        "src": "12436:25:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61387,23 +61387,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12427:35:5",
+                                      "src": "12427:35:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2074,
+                                    "id": 3516,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "12427:42:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "12427:42:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -61413,18 +61413,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2075,
+                                      "id": 3517,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "12472:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "12472:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2076,
+                                    "id": 3518,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -61432,21 +61432,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12472:30:5",
+                                    "src": "12472:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12427:75:5",
+                                  "src": "12427:75:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2078,
+                                "id": 3520,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12427:75:5"
+                                "src": "12427:75:7"
                               },
                               {
                                 "eventCall": {
@@ -61458,26 +61458,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 2080,
+                                          "id": 3522,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 915,
-                                          "src": "12550:14:5",
+                                          "referencedDeclaration": 2357,
+                                          "src": "12550:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 2082,
+                                        "id": 3524,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 2081,
+                                          "id": 3523,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1854,
-                                          "src": "12565:6:5",
+                                          "referencedDeclaration": 3296,
+                                          "src": "12565:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -61488,24 +61488,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12550:22:5",
+                                        "src": "12550:22:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 2084,
+                                      "id": 3526,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "30",
-                                        "id": 2083,
+                                        "id": 3525,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "12573:1:5",
+                                        "src": "12573:1:7",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_0_by_1",
@@ -61518,7 +61518,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12550:25:5",
+                                      "src": "12550:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -61532,18 +61532,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2079,
+                                    "id": 3521,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "12525:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "12525:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2085,
+                                  "id": 3527,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61551,20 +61551,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12525:51:5",
+                                  "src": "12525:51:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2086,
+                                "id": 3528,
                                 "nodeType": "EmitStatement",
-                                "src": "12520:56:5"
+                                "src": "12520:56:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2093,
+                                  "id": 3535,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61575,26 +61575,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2087,
+                                        "id": 3529,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "12594:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "12594:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2090,
+                                      "id": 3532,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2088,
+                                        "id": 3530,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12609:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12609:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61605,24 +61605,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12594:22:5",
+                                      "src": "12594:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2091,
+                                    "id": 3533,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 2089,
+                                      "id": 3531,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12617:1:5",
+                                      "src": "12617:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -61635,7 +61635,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12594:25:5",
+                                    "src": "12594:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61646,14 +61646,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2092,
+                                    "id": 3534,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12622:1:5",
+                                    "src": "12622:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -61661,20 +61661,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12594:29:5",
+                                  "src": "12594:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2094,
+                                "id": 3536,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12594:29:5"
+                                "src": "12594:29:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2101,
+                                  "id": 3543,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61685,26 +61685,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2095,
+                                        "id": 3537,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "12641:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "12641:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2098,
+                                      "id": 3540,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2096,
+                                        "id": 3538,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12656:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12656:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61715,24 +61715,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12641:22:5",
+                                      "src": "12641:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2099,
+                                    "id": 3541,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2097,
+                                      "id": 3539,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12664:1:5",
+                                      "src": "12664:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -61745,7 +61745,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12641:25:5",
+                                    "src": "12641:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61756,14 +61756,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2100,
+                                    "id": 3542,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12669:1:5",
+                                    "src": "12669:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -61771,15 +61771,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12641:29:5",
+                                  "src": "12641:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2102,
+                                "id": 3544,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12641:29:5"
+                                "src": "12641:29:7"
                               },
                               {
                                 "expression": {
@@ -61787,12 +61787,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2104,
+                                      "id": 3546,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12693:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12693:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -61806,18 +61806,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2103,
+                                    "id": 3545,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1852,
-                                    "src": "12688:4:5",
+                                    "referencedDeclaration": 3294,
+                                    "src": "12688:4:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 2105,
+                                  "id": 3547,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61825,20 +61825,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12688:12:5",
+                                  "src": "12688:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 2106,
+                                "id": 3548,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12688:12:5"
+                                "src": "12688:12:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2113,
+                                  "id": 3555,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61849,26 +61849,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2107,
+                                        "id": 3549,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "12718:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "12718:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2109,
+                                      "id": 3551,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2108,
+                                        "id": 3550,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12724:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12724:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61879,21 +61879,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12718:13:5",
+                                      "src": "12718:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2110,
+                                    "id": 3552,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 757,
-                                    "src": "12718:19:5",
+                                    "referencedDeclaration": 2199,
+                                    "src": "12718:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61905,45 +61905,45 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2111,
+                                      "id": 3553,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1990,
-                                      "src": "12740:15:5",
+                                      "referencedDeclaration": 3432,
+                                      "src": "12740:15:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 2112,
+                                    "id": 3554,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 805,
-                                    "src": "12740:21:5",
+                                    "referencedDeclaration": 2247,
+                                    "src": "12740:21:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12718:43:5",
+                                  "src": "12718:43:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2114,
+                                "id": 3556,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12718:43:5"
+                                "src": "12718:43:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2120,
+                                  "id": 3562,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61954,26 +61954,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2115,
+                                        "id": 3557,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "12779:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "12779:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2117,
+                                      "id": 3559,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2116,
+                                        "id": 3558,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "12785:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "12785:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61984,21 +61984,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12779:13:5",
+                                      "src": "12779:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2118,
+                                    "id": 3560,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 755,
-                                    "src": "12779:22:5",
+                                    "referencedDeclaration": 2197,
+                                    "src": "12779:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62008,26 +62008,26 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2119,
+                                    "id": 3561,
                                     "name": "newDuration",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1858,
-                                    "src": "12804:11:5",
+                                    "referencedDeclaration": 3300,
+                                    "src": "12804:11:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12779:36:5",
+                                  "src": "12779:36:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2121,
+                                "id": 3563,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12779:36:5"
+                                "src": "12779:36:7"
                               },
                               {
                                 "eventCall": {
@@ -62035,12 +62035,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2123,
+                                      "id": 3565,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "12863:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "12863:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62054,18 +62054,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2122,
+                                    "id": 3564,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "12838:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "12838:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2124,
+                                  "id": 3566,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -62073,31 +62073,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12838:40:5",
+                                  "src": "12838:40:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2125,
+                                "id": 3567,
                                 "nodeType": "EmitStatement",
-                                "src": "12833:45:5"
+                                "src": "12833:45:7"
                               }
                             ]
                           }
                         },
-                        "id": 2131,
+                        "id": 3573,
                         "nodeType": "IfStatement",
-                        "src": "11818:1135:5",
+                        "src": "11818:1135:7",
                         "trueBody": {
-                          "id": 2043,
+                          "id": 3485,
                           "nodeType": "Block",
-                          "src": "11895:285:5",
+                          "src": "11895:285:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2018,
+                                "id": 3460,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62108,26 +62108,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2012,
+                                      "id": 3454,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "11913:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "11913:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2014,
+                                    "id": 3456,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2013,
+                                      "id": 3455,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "11922:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "11922:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62138,23 +62138,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "11913:24:5",
+                                    "src": "11913:24:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2015,
+                                  "id": 3457,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "11913:31:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "11913:31:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -62164,18 +62164,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2016,
+                                    "id": 3458,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "11947:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "11947:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2017,
+                                  "id": 3459,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -62183,21 +62183,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "11947:30:5",
+                                  "src": "11947:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "11913:64:5",
+                                "src": "11913:64:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2019,
+                              "id": 3461,
                               "nodeType": "ExpressionStatement",
-                              "src": "11913:64:5"
+                              "src": "11913:64:7"
                             },
                             {
                               "expression": {
@@ -62205,12 +62205,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2021,
+                                    "id": 3463,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "12000:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "12000:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62224,18 +62224,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2020,
+                                  "id": 3462,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1852,
-                                  "src": "11995:4:5",
+                                  "referencedDeclaration": 3294,
+                                  "src": "11995:4:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 2022,
+                                "id": 3464,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62243,20 +62243,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "11995:12:5",
+                                "src": "11995:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 2023,
+                              "id": 3465,
                               "nodeType": "ExpressionStatement",
-                              "src": "11995:12:5"
+                              "src": "11995:12:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2029,
+                                "id": 3471,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62267,26 +62267,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2024,
+                                      "id": 3466,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "12025:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "12025:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 2026,
+                                    "id": 3468,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2025,
+                                      "id": 3467,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12031:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12031:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62297,21 +62297,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12025:13:5",
+                                    "src": "12025:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 2027,
+                                  "id": 3469,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "12025:19:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "12025:19:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62321,31 +62321,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2028,
+                                  "id": 3470,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1856,
-                                  "src": "12047:8:5",
+                                  "referencedDeclaration": 3298,
+                                  "src": "12047:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12025:30:5",
+                                "src": "12025:30:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2030,
+                              "id": 3472,
                               "nodeType": "ExpressionStatement",
-                              "src": "12025:30:5"
+                              "src": "12025:30:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2037,
+                                "id": 3479,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62356,26 +62356,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2031,
+                                      "id": 3473,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 915,
-                                      "src": "12073:14:5",
+                                      "referencedDeclaration": 2357,
+                                      "src": "12073:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 2034,
+                                    "id": 3476,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2032,
+                                      "id": 3474,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "12088:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "12088:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62386,24 +62386,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12073:22:5",
+                                    "src": "12073:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 2035,
+                                  "id": 3477,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "31",
-                                    "id": 2033,
+                                    "id": 3475,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12096:1:5",
+                                    "src": "12096:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_1_by_1",
@@ -62416,7 +62416,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "12073:25:5",
+                                  "src": "12073:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62427,14 +62427,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2036,
+                                  "id": 3478,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12101:1:5",
+                                  "src": "12101:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -62442,15 +62442,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "12073:29:5",
+                                "src": "12073:29:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2038,
+                              "id": 3480,
                               "nodeType": "ExpressionStatement",
-                              "src": "12073:29:5"
+                              "src": "12073:29:7"
                             },
                             {
                               "eventCall": {
@@ -62458,12 +62458,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2040,
+                                    "id": 3482,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 888,
-                                    "src": "12150:14:5",
+                                    "referencedDeclaration": 2330,
+                                    "src": "12150:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62477,18 +62477,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2039,
+                                  "id": 3481,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 840,
-                                  "src": "12125:24:5",
+                                  "referencedDeclaration": 2282,
+                                  "src": "12125:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 2041,
+                                "id": 3483,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62496,15 +62496,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "12125:40:5",
+                                "src": "12125:40:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 2042,
+                              "id": 3484,
                               "nodeType": "EmitStatement",
-                              "src": "12120:45:5"
+                              "src": "12120:45:7"
                             }
                           ]
                         }
@@ -62512,7 +62512,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2142,
+                          "id": 3584,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62523,44 +62523,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2132,
+                                "id": 3574,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "12967:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "12967:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 2138,
+                              "id": 3580,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 2133,
+                                    "id": 3575,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "12976:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "12976:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 2135,
+                                  "id": 3577,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 2134,
+                                    "id": 3576,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "12991:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "12991:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62571,24 +62571,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "12976:22:5",
+                                  "src": "12976:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 2137,
+                                "id": 3579,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 2136,
+                                  "id": 3578,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12999:1:5",
+                                  "src": "12999:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -62601,7 +62601,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "12976:25:5",
+                                "src": "12976:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -62612,23 +62612,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12967:35:5",
+                              "src": "12967:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 2139,
+                            "id": 3581,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "12967:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "12967:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -62638,18 +62638,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2140,
+                              "id": 3582,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "13012:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "13012:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 2141,
+                            "id": 3583,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -62657,21 +62657,21 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13012:30:5",
+                            "src": "13012:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "12967:75:5",
+                          "src": "12967:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 2143,
+                        "id": 3585,
                         "nodeType": "ExpressionStatement",
-                        "src": "12967:75:5"
+                        "src": "12967:75:7"
                       },
                       {
                         "eventCall": {
@@ -62683,26 +62683,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2145,
+                                  "id": 3587,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13086:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13086:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2147,
+                                "id": 3589,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2146,
+                                  "id": 3588,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13101:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13101:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62713,24 +62713,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13086:22:5",
+                                "src": "13086:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2149,
+                              "id": 3591,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 2148,
+                                "id": 3590,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13109:1:5",
+                                "src": "13109:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -62743,7 +62743,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13086:25:5",
+                              "src": "13086:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -62757,18 +62757,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2144,
+                            "id": 3586,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "13061:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "13061:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2150,
+                          "id": 3592,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62776,20 +62776,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13061:51:5",
+                          "src": "13061:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2151,
+                        "id": 3593,
                         "nodeType": "EmitStatement",
-                        "src": "13056:56:5"
+                        "src": "13056:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2158,
+                          "id": 3600,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62800,26 +62800,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2152,
+                                "id": 3594,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "13126:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "13126:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2155,
+                              "id": 3597,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2153,
+                                "id": 3595,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "13141:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "13141:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -62830,24 +62830,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13126:22:5",
+                              "src": "13126:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2156,
+                            "id": 3598,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2154,
+                              "id": 3596,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13149:1:5",
+                              "src": "13149:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -62860,7 +62860,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13126:25:5",
+                            "src": "13126:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -62870,26 +62870,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2157,
+                            "id": 3599,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "13154:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "13154:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13126:42:5",
+                          "src": "13126:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2159,
+                        "id": 3601,
                         "nodeType": "ExpressionStatement",
-                        "src": "13126:42:5"
+                        "src": "13126:42:7"
                       }
                     ]
                   }
@@ -62898,24 +62898,24 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2165,
+                    "id": 3607,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2162,
+                      "id": 3604,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1918,
-                      "src": "13193:11:5",
+                      "referencedDeclaration": 3360,
+                      "src": "13193:11:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -62925,18 +62925,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2163,
+                        "id": 3605,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "13208:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "13208:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2164,
+                      "id": 3606,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -62944,26 +62944,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "13208:19:5",
+                      "src": "13208:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "13193:34:5",
+                    "src": "13193:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2326,
+                  "id": 3768,
                   "nodeType": "IfStatement",
-                  "src": "13189:1389:5",
+                  "src": "13189:1389:7",
                   "trueBody": {
-                    "id": 2325,
+                    "id": 3767,
                     "nodeType": "Block",
-                    "src": "13229:1349:5",
+                    "src": "13229:1349:7",
                     "statements": [
                       {
                         "eventCall": {
@@ -62975,26 +62975,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2167,
+                                  "id": 3609,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13273:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13273:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2169,
+                                "id": 3611,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2168,
+                                  "id": 3610,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13288:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13288:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63005,24 +63005,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13273:22:5",
+                                "src": "13273:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2171,
+                              "id": 3613,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 2170,
+                                "id": 3612,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13296:1:5",
+                                "src": "13296:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -63035,7 +63035,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13273:25:5",
+                              "src": "13273:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63049,18 +63049,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2166,
+                            "id": 3608,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "13248:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "13248:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2172,
+                          "id": 3614,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63068,20 +63068,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13248:51:5",
+                          "src": "13248:51:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2173,
+                        "id": 3615,
                         "nodeType": "EmitStatement",
-                        "src": "13243:56:5"
+                        "src": "13243:56:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2184,
+                          "id": 3626,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63092,44 +63092,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2174,
+                                "id": 3616,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 909,
-                                "src": "13313:8:5",
+                                "referencedDeclaration": 2351,
+                                "src": "13313:8:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 2180,
+                              "id": 3622,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 2175,
+                                    "id": 3617,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 915,
-                                    "src": "13322:14:5",
+                                    "referencedDeclaration": 2357,
+                                    "src": "13322:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 2177,
+                                  "id": 3619,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 2176,
+                                    "id": 3618,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "13337:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "13337:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -63140,24 +63140,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "13322:22:5",
+                                  "src": "13322:22:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 2179,
+                                "id": 3621,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2178,
+                                  "id": 3620,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13345:1:5",
+                                  "src": "13345:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -63170,7 +63170,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13322:25:5",
+                                "src": "13322:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63181,23 +63181,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13313:35:5",
+                              "src": "13313:35:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 2181,
+                            "id": 3623,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 809,
-                            "src": "13313:42:5",
+                            "referencedDeclaration": 2251,
+                            "src": "13313:42:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -63207,18 +63207,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2182,
+                              "id": 3624,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 736,
-                              "src": "13358:13:5",
+                              "referencedDeclaration": 2178,
+                              "src": "13358:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 2183,
+                            "id": 3625,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -63226,26 +63226,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13358:30:5",
+                            "src": "13358:30:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$736",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "13313:75:5",
+                          "src": "13313:75:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 2185,
+                        "id": 3627,
                         "nodeType": "ExpressionStatement",
-                        "src": "13313:75:5"
+                        "src": "13313:75:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2192,
+                          "id": 3634,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63256,26 +63256,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2186,
+                                "id": 3628,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "13402:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "13402:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2189,
+                              "id": 3631,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2187,
+                                "id": 3629,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1854,
-                                "src": "13417:6:5",
+                                "referencedDeclaration": 3296,
+                                "src": "13417:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63286,24 +63286,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13402:22:5",
+                              "src": "13402:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2190,
+                            "id": 3632,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 2188,
+                              "id": 3630,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13425:1:5",
+                              "src": "13425:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -63316,7 +63316,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13402:25:5",
+                            "src": "13402:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -63326,45 +63326,45 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2191,
+                            "id": 3633,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 888,
-                            "src": "13430:14:5",
+                            "referencedDeclaration": 2330,
+                            "src": "13430:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13402:42:5",
+                          "src": "13402:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2193,
+                        "id": 3635,
                         "nodeType": "ExpressionStatement",
-                        "src": "13402:42:5"
+                        "src": "13402:42:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2202,
+                          "id": 3644,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2194,
+                            "id": 3636,
                             "name": "matchingRequest",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1990,
-                            "src": "13458:15:5",
+                            "referencedDeclaration": 3432,
+                            "src": "13458:15:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
@@ -63374,44 +63374,44 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2195,
+                              "id": 3637,
                               "name": "requests",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 909,
-                              "src": "13476:8:5",
+                              "referencedDeclaration": 2351,
+                              "src": "13476:8:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                               }
                             },
-                            "id": 2201,
+                            "id": 3643,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2196,
+                                  "id": 3638,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 915,
-                                  "src": "13485:14:5",
+                                  "referencedDeclaration": 2357,
+                                  "src": "13485:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 2198,
+                                "id": 3640,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2197,
+                                  "id": 3639,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13500:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13500:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63422,24 +63422,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13485:22:5",
+                                "src": "13485:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 2200,
+                              "id": 3642,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 2199,
+                                "id": 3641,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13508:1:5",
+                                "src": "13508:1:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -63452,7 +63452,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13485:25:5",
+                              "src": "13485:25:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63463,21 +63463,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "13476:35:5",
+                            "src": "13476:35:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                               "typeString": "struct Market.ChangeRequest storage ref"
                             }
                           },
-                          "src": "13458:53:5",
+                          "src": "13458:53:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                             "typeString": "struct Market.ChangeRequest memory"
                           }
                         },
-                        "id": 2203,
+                        "id": 3645,
                         "nodeType": "ExpressionStatement",
-                        "src": "13458:53:5"
+                        "src": "13458:53:7"
                       },
                       {
                         "condition": {
@@ -63486,7 +63486,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2216,
+                          "id": 3658,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63497,19 +63497,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2209,
+                            "id": 3651,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2204,
+                              "id": 3646,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1858,
-                              "src": "13530:11:5",
+                              "referencedDeclaration": 3300,
+                              "src": "13530:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63523,26 +63523,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2205,
+                                  "id": 3647,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "13545:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "13545:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2207,
+                                "id": 3649,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2206,
+                                  "id": 3648,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13551:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13551:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63553,27 +63553,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13545:13:5",
+                                "src": "13545:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2208,
+                              "id": 3650,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 755,
-                              "src": "13545:22:5",
+                              "referencedDeclaration": 2197,
+                              "src": "13545:22:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13530:37:5",
+                            "src": "13530:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -63587,19 +63587,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2215,
+                            "id": 3657,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2210,
+                              "id": 3652,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1856,
-                              "src": "13571:8:5",
+                              "referencedDeclaration": 3298,
+                              "src": "13571:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63613,26 +63613,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2211,
+                                  "id": 3653,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "13582:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "13582:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2213,
+                                "id": 3655,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2212,
+                                  "id": 3654,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1854,
-                                  "src": "13588:6:5",
+                                  "referencedDeclaration": 3296,
+                                  "src": "13588:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63643,33 +63643,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13582:13:5",
+                                "src": "13582:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2214,
+                              "id": 3656,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 757,
-                              "src": "13582:19:5",
+                              "referencedDeclaration": 2199,
+                              "src": "13582:19:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13571:30:5",
+                            "src": "13571:30:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "13530:71:5",
+                          "src": "13530:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -63682,7 +63682,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 2263,
+                            "id": 3705,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -63693,7 +63693,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2258,
+                              "id": 3700,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -63701,10 +63701,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 2253,
+                                "id": 3695,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -63713,28 +63713,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2249,
+                                    "id": 3691,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "13898:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "13898:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2250,
+                                  "id": 3692,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "13898:22:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "13898:22:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -63744,18 +63744,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2251,
+                                    "id": 3693,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "13924:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "13924:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2252,
+                                  "id": 3694,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -63763,13 +63763,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13924:29:5",
+                                  "src": "13924:29:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13898:55:5",
+                                "src": "13898:55:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -63783,7 +63783,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 2257,
+                                "id": 3699,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -63792,26 +63792,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2254,
+                                    "id": 3696,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1990,
-                                    "src": "13957:15:5",
+                                    "referencedDeclaration": 3432,
+                                    "src": "13957:15:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2255,
+                                  "id": 3697,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 807,
-                                  "src": "13957:24:5",
+                                  "referencedDeclaration": 2249,
+                                  "src": "13957:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63821,24 +63821,24 @@
                                 "operator": "<=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2256,
+                                  "id": 3698,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1858,
-                                  "src": "13985:11:5",
+                                  "referencedDeclaration": 3300,
+                                  "src": "13985:11:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13957:39:5",
+                                "src": "13957:39:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "13898:98:5",
+                              "src": "13898:98:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -63852,7 +63852,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2262,
+                              "id": 3704,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -63861,26 +63861,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2259,
+                                  "id": 3701,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1990,
-                                  "src": "14000:15:5",
+                                  "referencedDeclaration": 3432,
+                                  "src": "14000:15:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2260,
+                                "id": 3702,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 805,
-                                "src": "14000:21:5",
+                                "referencedDeclaration": 2247,
+                                "src": "14000:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63890,67 +63890,67 @@
                               "operator": ">=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2261,
+                                "id": 3703,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 1856,
-                                "src": "14025:8:5",
+                                "referencedDeclaration": 3298,
+                                "src": "14025:8:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "14000:33:5",
+                              "src": "14000:33:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "13898:135:5",
+                            "src": "13898:135:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2322,
+                            "id": 3764,
                             "nodeType": "Block",
-                            "src": "14514:54:5",
+                            "src": "14514:54:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2320,
+                                  "id": 3762,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 888,
-                                  "src": "14539:14:5",
+                                  "referencedDeclaration": 2330,
+                                  "src": "14539:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 1862,
-                                "id": 2321,
+                                "functionReturnParameters": 3304,
+                                "id": 3763,
                                 "nodeType": "Return",
-                                "src": "14532:21:5"
+                                "src": "14532:21:7"
                               }
                             ]
                           },
-                          "id": 2323,
+                          "id": 3765,
                           "nodeType": "IfStatement",
-                          "src": "13894:674:5",
+                          "src": "13894:674:7",
                           "trueBody": {
-                            "id": 2319,
+                            "id": 3761,
                             "nodeType": "Block",
-                            "src": "14035:473:5",
+                            "src": "14035:473:7",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2270,
+                                  "id": 3712,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -63961,26 +63961,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2264,
+                                        "id": 3706,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 909,
-                                        "src": "14053:8:5",
+                                        "referencedDeclaration": 2351,
+                                        "src": "14053:8:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 2266,
+                                      "id": 3708,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2265,
+                                        "id": 3707,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 888,
-                                        "src": "14062:14:5",
+                                        "referencedDeclaration": 2330,
+                                        "src": "14062:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -63991,23 +63991,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14053:24:5",
+                                      "src": "14053:24:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 2267,
+                                    "id": 3709,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 809,
-                                    "src": "14053:31:5",
+                                    "referencedDeclaration": 2251,
+                                    "src": "14053:31:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -64017,18 +64017,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2268,
+                                      "id": 3710,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 736,
-                                      "src": "14087:13:5",
+                                      "referencedDeclaration": 2178,
+                                      "src": "14087:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 2269,
+                                    "id": 3711,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -64036,21 +64036,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "14087:30:5",
+                                    "src": "14087:30:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "14053:64:5",
+                                  "src": "14053:64:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 2271,
+                                "id": 3713,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14053:64:5"
+                                "src": "14053:64:7"
                               },
                               {
                                 "eventCall": {
@@ -64062,26 +64062,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 2273,
+                                          "id": 3715,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 915,
-                                          "src": "14165:14:5",
+                                          "referencedDeclaration": 2357,
+                                          "src": "14165:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 2275,
+                                        "id": 3717,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 2274,
+                                          "id": 3716,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 1854,
-                                          "src": "14180:6:5",
+                                          "referencedDeclaration": 3296,
+                                          "src": "14180:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -64092,24 +64092,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "14165:22:5",
+                                        "src": "14165:22:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 2277,
+                                      "id": 3719,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 2276,
+                                        "id": 3718,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "14188:1:5",
+                                        "src": "14188:1:7",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_1_by_1",
@@ -64122,7 +64122,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14165:25:5",
+                                      "src": "14165:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64136,18 +64136,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2272,
+                                    "id": 3714,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "14140:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "14140:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2278,
+                                  "id": 3720,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64155,20 +64155,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14140:51:5",
+                                  "src": "14140:51:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2279,
+                                "id": 3721,
                                 "nodeType": "EmitStatement",
-                                "src": "14135:56:5"
+                                "src": "14135:56:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2286,
+                                  "id": 3728,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64179,26 +64179,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2280,
+                                        "id": 3722,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "14209:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "14209:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2283,
+                                      "id": 3725,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2281,
+                                        "id": 3723,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14224:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14224:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64209,24 +64209,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14209:22:5",
+                                      "src": "14209:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2284,
+                                    "id": 3726,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 2282,
+                                      "id": 3724,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14232:1:5",
+                                      "src": "14232:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -64239,7 +64239,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14209:25:5",
+                                    "src": "14209:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64250,14 +64250,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2285,
+                                    "id": 3727,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14237:1:5",
+                                    "src": "14237:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -64265,20 +64265,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14209:29:5",
+                                  "src": "14209:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2287,
+                                "id": 3729,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14209:29:5"
+                                "src": "14209:29:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2294,
+                                  "id": 3736,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64289,26 +64289,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2288,
+                                        "id": 3730,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 915,
-                                        "src": "14256:14:5",
+                                        "referencedDeclaration": 2357,
+                                        "src": "14256:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 2291,
+                                      "id": 3733,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2289,
+                                        "id": 3731,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14271:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14271:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64319,24 +64319,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14256:22:5",
+                                      "src": "14256:22:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 2292,
+                                    "id": 3734,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2290,
+                                      "id": 3732,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14279:1:5",
+                                      "src": "14279:1:7",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -64349,7 +64349,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14256:25:5",
+                                    "src": "14256:25:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64360,14 +64360,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2293,
+                                    "id": 3735,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14284:1:5",
+                                    "src": "14284:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -64375,15 +64375,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14256:29:5",
+                                  "src": "14256:29:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2295,
+                                "id": 3737,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14256:29:5"
+                                "src": "14256:29:7"
                               },
                               {
                                 "expression": {
@@ -64391,12 +64391,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2297,
+                                      "id": 3739,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "14308:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "14308:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64410,18 +64410,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2296,
+                                    "id": 3738,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1852,
-                                    "src": "14303:4:5",
+                                    "referencedDeclaration": 3294,
+                                    "src": "14303:4:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 2298,
+                                  "id": 3740,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64429,20 +64429,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14303:12:5",
+                                  "src": "14303:12:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 2299,
+                                "id": 3741,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14303:12:5"
+                                "src": "14303:12:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2305,
+                                  "id": 3747,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64453,26 +64453,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2300,
+                                        "id": 3742,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "14333:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "14333:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2302,
+                                      "id": 3744,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2301,
+                                        "id": 3743,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14339:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14339:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64483,21 +64483,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14333:13:5",
+                                      "src": "14333:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2303,
+                                    "id": 3745,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 757,
-                                    "src": "14333:19:5",
+                                    "referencedDeclaration": 2199,
+                                    "src": "14333:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64507,31 +64507,31 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2304,
+                                    "id": 3746,
                                     "name": "newPrice",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1856,
-                                    "src": "14355:8:5",
+                                    "referencedDeclaration": 3298,
+                                    "src": "14355:8:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14333:30:5",
+                                  "src": "14333:30:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2306,
+                                "id": 3748,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14333:30:5"
+                                "src": "14333:30:7"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2313,
+                                  "id": 3755,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64542,26 +64542,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 2307,
+                                        "id": 3749,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "14381:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "14381:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 2309,
+                                      "id": 3751,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 2308,
+                                        "id": 3750,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 1854,
-                                        "src": "14387:6:5",
+                                        "referencedDeclaration": 3296,
+                                        "src": "14387:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64572,21 +64572,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14381:13:5",
+                                      "src": "14381:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 2310,
+                                    "id": 3752,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 755,
-                                    "src": "14381:22:5",
+                                    "referencedDeclaration": 2197,
+                                    "src": "14381:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64598,40 +64598,40 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2311,
+                                      "id": 3753,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1990,
-                                      "src": "14406:15:5",
+                                      "referencedDeclaration": 3432,
+                                      "src": "14406:15:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 2312,
+                                    "id": 3754,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 807,
-                                    "src": "14406:24:5",
+                                    "referencedDeclaration": 2249,
+                                    "src": "14406:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14381:49:5",
+                                  "src": "14381:49:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2314,
+                                "id": 3756,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14381:49:5"
+                                "src": "14381:49:7"
                               },
                               {
                                 "eventCall": {
@@ -64639,12 +64639,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2316,
+                                      "id": 3758,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "14478:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "14478:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64658,18 +64658,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 2315,
+                                    "id": 3757,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 840,
-                                    "src": "14453:24:5",
+                                    "referencedDeclaration": 2282,
+                                    "src": "14453:24:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 2317,
+                                  "id": 3759,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64677,31 +64677,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14453:40:5",
+                                  "src": "14453:40:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 2318,
+                                "id": 3760,
                                 "nodeType": "EmitStatement",
-                                "src": "14448:45:5"
+                                "src": "14448:45:7"
                               }
                             ]
                           }
                         },
-                        "id": 2324,
+                        "id": 3766,
                         "nodeType": "IfStatement",
-                        "src": "13526:1042:5",
+                        "src": "13526:1042:7",
                         "trueBody": {
-                          "id": 2248,
+                          "id": 3690,
                           "nodeType": "Block",
-                          "src": "13603:285:5",
+                          "src": "13603:285:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2223,
+                                "id": 3665,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64712,26 +64712,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2217,
+                                      "id": 3659,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "13621:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "13621:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2219,
+                                    "id": 3661,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2218,
+                                      "id": 3660,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 888,
-                                      "src": "13630:14:5",
+                                      "referencedDeclaration": 2330,
+                                      "src": "13630:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64742,23 +64742,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13621:24:5",
+                                    "src": "13621:24:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2220,
+                                  "id": 3662,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "13621:31:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "13621:31:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -64768,18 +64768,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2221,
+                                    "id": 3663,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "13655:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "13655:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2222,
+                                  "id": 3664,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -64787,21 +64787,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13655:30:5",
+                                  "src": "13655:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13621:64:5",
+                                "src": "13621:64:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2224,
+                              "id": 3666,
                               "nodeType": "ExpressionStatement",
-                              "src": "13621:64:5"
+                              "src": "13621:64:7"
                             },
                             {
                               "expression": {
@@ -64809,12 +64809,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2226,
+                                    "id": 3668,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 1854,
-                                    "src": "13708:6:5",
+                                    "referencedDeclaration": 3296,
+                                    "src": "13708:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64828,18 +64828,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2225,
+                                  "id": 3667,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1852,
-                                  "src": "13703:4:5",
+                                  "referencedDeclaration": 3294,
+                                  "src": "13703:4:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 2227,
+                                "id": 3669,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64847,20 +64847,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13703:12:5",
+                                "src": "13703:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 2228,
+                              "id": 3670,
                               "nodeType": "ExpressionStatement",
-                              "src": "13703:12:5"
+                              "src": "13703:12:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2234,
+                                "id": 3676,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64871,26 +64871,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2229,
+                                      "id": 3671,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "13733:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "13733:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 2231,
+                                    "id": 3673,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2230,
+                                      "id": 3672,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "13739:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "13739:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64901,21 +64901,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13733:13:5",
+                                    "src": "13733:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 2232,
+                                  "id": 3674,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "13733:19:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "13733:19:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -64925,31 +64925,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2233,
+                                  "id": 3675,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 1856,
-                                  "src": "13755:8:5",
+                                  "referencedDeclaration": 3298,
+                                  "src": "13755:8:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13733:30:5",
+                                "src": "13733:30:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2235,
+                              "id": 3677,
                               "nodeType": "ExpressionStatement",
-                              "src": "13733:30:5"
+                              "src": "13733:30:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2242,
+                                "id": 3684,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64960,26 +64960,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2236,
+                                      "id": 3678,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 915,
-                                      "src": "13781:14:5",
+                                      "referencedDeclaration": 2357,
+                                      "src": "13781:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 2239,
+                                    "id": 3681,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2237,
+                                      "id": 3679,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 1854,
-                                      "src": "13796:6:5",
+                                      "referencedDeclaration": 3296,
+                                      "src": "13796:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64990,24 +64990,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13781:22:5",
+                                    "src": "13781:22:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 2240,
+                                  "id": 3682,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 2238,
+                                    "id": 3680,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "13804:1:5",
+                                    "src": "13804:1:7",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -65020,7 +65020,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "13781:25:5",
+                                  "src": "13781:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65031,14 +65031,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 2241,
+                                  "id": 3683,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13809:1:5",
+                                  "src": "13809:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -65046,15 +65046,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "13781:29:5",
+                                "src": "13781:29:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2243,
+                              "id": 3685,
                               "nodeType": "ExpressionStatement",
-                              "src": "13781:29:5"
+                              "src": "13781:29:7"
                             },
                             {
                               "eventCall": {
@@ -65062,12 +65062,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 2245,
+                                    "id": 3687,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 888,
-                                    "src": "13858:14:5",
+                                    "referencedDeclaration": 2330,
+                                    "src": "13858:14:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -65081,18 +65081,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 2244,
+                                  "id": 3686,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 840,
-                                  "src": "13833:24:5",
+                                  "referencedDeclaration": 2282,
+                                  "src": "13833:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 2246,
+                                "id": 3688,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -65100,15 +65100,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13833:40:5",
+                                "src": "13833:40:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 2247,
+                              "id": 3689,
                               "nodeType": "EmitStatement",
-                              "src": "13828:45:5"
+                              "src": "13828:45:7"
                             }
                           ]
                         }
@@ -65119,7 +65119,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2341,
+                    "id": 3783,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -65130,26 +65130,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2327,
+                          "id": 3769,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "14588:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "14588:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 2329,
+                        "id": 3771,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2328,
+                          "id": 3770,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1854,
-                          "src": "14594:6:5",
+                          "referencedDeclaration": 3296,
+                          "src": "14594:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -65160,21 +65160,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "14588:13:5",
+                        "src": "14588:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 2330,
+                      "id": 3772,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 761,
-                      "src": "14588:21:5",
+                      "referencedDeclaration": 2203,
+                      "src": "14588:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -65191,26 +65191,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2336,
+                              "id": 3778,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "14640:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "14640:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2338,
+                            "id": 3780,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2337,
+                              "id": 3779,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "14646:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "14646:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -65221,21 +65221,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14640:13:5",
+                            "src": "14640:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2339,
+                          "id": 3781,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 755,
-                          "src": "14640:22:5",
+                          "referencedDeclaration": 2197,
+                          "src": "14640:22:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -65255,26 +65255,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2331,
+                              "id": 3773,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "14612:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "14612:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2333,
+                            "id": 3775,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2332,
+                              "id": 3774,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 1854,
-                              "src": "14618:6:5",
+                              "referencedDeclaration": 3296,
+                              "src": "14618:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -65285,41 +65285,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14612:13:5",
+                            "src": "14612:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2334,
+                          "id": 3776,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 759,
-                          "src": "14612:23:5",
+                          "referencedDeclaration": 2201,
+                          "src": "14612:23:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2335,
+                        "id": 3777,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "14612:27:5",
+                        "referencedDeclaration": 10795,
+                        "src": "14612:27:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 2340,
+                      "id": 3782,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -65327,45 +65327,45 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "14612:51:5",
+                      "src": "14612:51:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "14588:75:5",
+                    "src": "14588:75:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2342,
+                  "id": 3784,
                   "nodeType": "ExpressionStatement",
-                  "src": "14588:75:5"
+                  "src": "14588:75:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2343,
+                    "id": 3785,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 888,
-                    "src": "14680:14:5",
+                    "referencedDeclaration": 2330,
+                    "src": "14680:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1862,
-                  "id": 2344,
+                  "functionReturnParameters": 3304,
+                  "id": 3786,
                   "nodeType": "Return",
-                  "src": "14673:21:5"
+                  "src": "14673:21:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2346,
+            "id": 3788,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -65373,16 +65373,16 @@
             "name": "CreateChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1859,
+              "id": 3301,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1854,
+                  "id": 3296,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10643:11:5",
+                  "scope": 3788,
+                  "src": "10643:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65390,10 +65390,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1853,
+                    "id": 3295,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10643:4:5",
+                    "src": "10643:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65404,11 +65404,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1856,
+                  "id": 3298,
                   "name": "newPrice",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10656:13:5",
+                  "scope": 3788,
+                  "src": "10656:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65416,10 +65416,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1855,
+                    "id": 3297,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10656:4:5",
+                    "src": "10656:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65430,11 +65430,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1858,
+                  "id": 3300,
                   "name": "newDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10671:16:5",
+                  "scope": 3788,
+                  "src": "10671:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65442,10 +65442,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1857,
+                    "id": 3299,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10671:4:5",
+                    "src": "10671:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65455,20 +65455,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10642:46:5"
+              "src": "10642:46:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1862,
+              "id": 3304,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1861,
+                  "id": 3303,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2346,
-                  "src": "10705:20:5",
+                  "scope": 3788,
+                  "src": "10705:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65476,10 +65476,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1860,
+                    "id": 3302,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10705:4:5",
+                    "src": "10705:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65489,47 +65489,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10704:22:5"
+              "src": "10704:22:7"
             },
-            "scope": 3787,
-            "src": "10614:4087:5",
+            "scope": 5229,
+            "src": "10614:4087:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2492,
+              "id": 3934,
               "nodeType": "Block",
-              "src": "14780:1218:5",
+              "src": "14780:1218:7",
               "statements": [
                 {
                   "assignments": [
-                    2354
+                    3796
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2354,
+                      "id": 3796,
                       "name": "request",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2493,
-                      "src": "14790:28:5",
+                      "scope": 3935,
+                      "src": "14790:28:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                         "typeString": "struct Market.ChangeRequest"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2353,
+                        "id": 3795,
                         "name": "ChangeRequest",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 810,
-                        "src": "14790:13:5",
+                        "referencedDeclaration": 2252,
+                        "src": "14790:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_storage_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
                           "typeString": "struct Market.ChangeRequest"
                         }
                       },
@@ -65537,31 +65537,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2358,
+                  "id": 3800,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2355,
+                      "id": 3797,
                       "name": "requests",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 909,
-                      "src": "14821:8:5",
+                      "referencedDeclaration": 2351,
+                      "src": "14821:8:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                       }
                     },
-                    "id": 2357,
+                    "id": 3799,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2356,
+                      "id": 3798,
                       "name": "changeRequestID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2348,
-                      "src": "14830:15:5",
+                      "referencedDeclaration": 3790,
+                      "src": "14830:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -65572,14 +65572,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "14821:25:5",
+                    "src": "14821:25:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "14790:56:5"
+                  "src": "14790:56:7"
                 },
                 {
                   "expression": {
@@ -65591,7 +65591,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2385,
+                        "id": 3827,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -65602,7 +65602,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2376,
+                          "id": 3818,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -65613,7 +65613,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2367,
+                            "id": 3809,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65622,18 +65622,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2360,
+                                "id": 3802,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "14864:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "14864:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2361,
+                              "id": 3803,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -65641,7 +65641,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14864:10:5",
+                              "src": "14864:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -65655,42 +65655,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2362,
+                                  "id": 3804,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "14878:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "14878:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2365,
+                                "id": 3807,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2363,
+                                    "id": 3805,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2354,
-                                    "src": "14884:7:5",
+                                    "referencedDeclaration": 3796,
+                                    "src": "14884:7:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2364,
+                                  "id": 3806,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 801,
-                                  "src": "14884:14:5",
+                                  "referencedDeclaration": 2243,
+                                  "src": "14884:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65701,27 +65701,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14878:21:5",
+                                "src": "14878:21:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2366,
+                              "id": 3808,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "14878:32:5",
+                              "referencedDeclaration": 2187,
+                              "src": "14878:32:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14864:46:5",
+                            "src": "14864:46:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -65735,7 +65735,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2375,
+                            "id": 3817,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65744,18 +65744,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2368,
+                                "id": 3810,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "14914:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "14914:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2369,
+                              "id": 3811,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -65763,7 +65763,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14914:10:5",
+                              "src": "14914:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -65777,42 +65777,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2370,
+                                  "id": 3812,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "14928:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "14928:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2373,
+                                "id": 3815,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2371,
+                                    "id": 3813,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2354,
-                                    "src": "14934:7:5",
+                                    "referencedDeclaration": 3796,
+                                    "src": "14934:7:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 2372,
+                                  "id": 3814,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 801,
-                                  "src": "14934:14:5",
+                                  "referencedDeclaration": 2243,
+                                  "src": "14934:14:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65823,33 +65823,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14928:21:5",
+                                "src": "14928:21:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2374,
+                              "id": 3816,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 749,
-                              "src": "14928:30:5",
+                              "referencedDeclaration": 2191,
+                              "src": "14928:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14914:44:5",
+                            "src": "14914:44:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "14864:94:5",
+                          "src": "14864:94:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -65863,7 +65863,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2384,
+                          "id": 3826,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -65872,18 +65872,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2377,
+                              "id": 3819,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "14962:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "14962:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2378,
+                            "id": 3820,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65891,7 +65891,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "14962:10:5",
+                            "src": "14962:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -65905,42 +65905,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2379,
+                                "id": 3821,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "14976:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "14976:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2382,
+                              "id": 3824,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2380,
+                                  "id": 3822,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "14982:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "14982:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2381,
+                                "id": 3823,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "14982:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "14982:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -65951,33 +65951,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "14976:21:5",
+                              "src": "14976:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2383,
+                            "id": 3825,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "14976:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "14976:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "14962:46:5",
+                          "src": "14962:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "14864:144:5",
+                        "src": "14864:144:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -65991,21 +65991,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2359,
+                      "id": 3801,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "14856:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "14856:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2386,
+                    "id": 3828,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66013,15 +66013,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "14856:153:5",
+                    "src": "14856:153:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2387,
+                  "id": 3829,
                   "nodeType": "ExpressionStatement",
-                  "src": "14856:153:5"
+                  "src": "14856:153:7"
                 },
                 {
                   "expression": {
@@ -66030,10 +66030,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$736",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
                           "typeString": "enum Market.RequestStatus"
                         },
-                        "id": 2393,
+                        "id": 3835,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -66042,28 +66042,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2389,
+                            "id": 3831,
                             "name": "request",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2354,
-                            "src": "15027:7:5",
+                            "referencedDeclaration": 3796,
+                            "src": "15027:7:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
-                          "id": 2390,
+                          "id": 3832,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 809,
-                          "src": "15027:14:5",
+                          "referencedDeclaration": 2251,
+                          "src": "15027:14:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
@@ -66073,18 +66073,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2391,
+                            "id": 3833,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 736,
-                            "src": "15045:13:5",
+                            "referencedDeclaration": 2178,
+                            "src": "15045:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 2392,
+                          "id": 3834,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -66092,13 +66092,13 @@
                           "memberName": "REQUEST_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "15045:30:5",
+                          "src": "15045:30:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$736",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "src": "15027:48:5",
+                        "src": "15027:48:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -66112,21 +66112,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2388,
+                      "id": 3830,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "15019:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "15019:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2394,
+                    "id": 3836,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66134,24 +66134,24 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "15019:57:5",
+                    "src": "15019:57:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2395,
+                  "id": 3837,
                   "nodeType": "ExpressionStatement",
-                  "src": "15019:57:5"
+                  "src": "15019:57:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2400,
+                    "id": 3842,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66160,28 +66160,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2396,
+                        "id": 3838,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2354,
-                        "src": "15091:7:5",
+                        "referencedDeclaration": 3796,
+                        "src": "15091:7:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 2397,
+                      "id": 3839,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 803,
-                      "src": "15091:19:5",
+                      "referencedDeclaration": 2245,
+                      "src": "15091:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -66191,18 +66191,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2398,
+                        "id": 3840,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "15114:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "15114:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2399,
+                      "id": 3841,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -66210,26 +66210,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15114:19:5",
+                      "src": "15114:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15091:42:5",
+                    "src": "15091:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2442,
+                  "id": 3884,
                   "nodeType": "IfStatement",
-                  "src": "15087:437:5",
+                  "src": "15087:437:7",
                   "trueBody": {
-                    "id": 2441,
+                    "id": 3883,
                     "nodeType": "Block",
-                    "src": "15135:389:5",
+                    "src": "15135:389:7",
                     "statements": [
                       {
                         "condition": {
@@ -66238,7 +66238,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2408,
+                          "id": 3850,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66247,18 +66247,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2401,
+                              "id": 3843,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "15153:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "15153:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2402,
+                            "id": 3844,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -66266,7 +66266,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15153:10:5",
+                            "src": "15153:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -66280,42 +66280,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2403,
+                                "id": 3845,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "15167:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "15167:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2406,
+                              "id": 3848,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2404,
+                                  "id": 3846,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15173:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15173:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2405,
+                                "id": 3847,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15173:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15173:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66326,41 +66326,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15167:21:5",
+                              "src": "15167:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2407,
+                            "id": 3849,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "15167:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "15167:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15153:46:5",
+                          "src": "15153:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 2426,
+                          "id": 3868,
                           "nodeType": "Block",
-                          "src": "15305:98:5",
+                          "src": "15305:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2424,
+                                "id": 3866,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66371,26 +66371,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2418,
+                                      "id": 3860,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15323:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15323:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2420,
+                                    "id": 3862,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2419,
+                                      "id": 3861,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15332:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15332:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -66401,23 +66401,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15323:25:5",
+                                    "src": "15323:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2421,
+                                  "id": 3863,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15323:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15323:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -66427,18 +66427,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2422,
+                                    "id": 3864,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15358:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15358:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2423,
+                                  "id": 3865,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -66446,36 +66446,36 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15358:30:5",
+                                  "src": "15358:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15323:65:5",
+                                "src": "15323:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2425,
+                              "id": 3867,
                               "nodeType": "ExpressionStatement",
-                              "src": "15323:65:5"
+                              "src": "15323:65:7"
                             }
                           ]
                         },
-                        "id": 2427,
+                        "id": 3869,
                         "nodeType": "IfStatement",
-                        "src": "15149:254:5",
+                        "src": "15149:254:7",
                         "trueBody": {
-                          "id": 2417,
+                          "id": 3859,
                           "nodeType": "Block",
-                          "src": "15201:98:5",
+                          "src": "15201:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2415,
+                                "id": 3857,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66486,26 +66486,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2409,
+                                      "id": 3851,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15219:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15219:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2411,
+                                    "id": 3853,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2410,
+                                      "id": 3852,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15228:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15228:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -66516,23 +66516,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15219:25:5",
+                                    "src": "15219:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2412,
+                                  "id": 3854,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15219:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15219:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -66542,18 +66542,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2413,
+                                    "id": 3855,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15254:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15254:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2414,
+                                  "id": 3856,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -66561,21 +66561,21 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15254:30:5",
+                                  "src": "15254:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15219:65:5",
+                                "src": "15219:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2416,
+                              "id": 3858,
                               "nodeType": "ExpressionStatement",
-                              "src": "15219:65:5"
+                              "src": "15219:65:7"
                             }
                           ]
                         }
@@ -66583,7 +66583,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2435,
+                          "id": 3877,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66594,42 +66594,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2428,
+                                "id": 3870,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "15416:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "15416:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2432,
+                              "id": 3874,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2429,
+                                  "id": 3871,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15431:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15431:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2430,
+                                "id": 3872,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15431:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15431:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66640,24 +66640,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15416:30:5",
+                              "src": "15416:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2433,
+                            "id": 3875,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 2431,
+                              "id": 3873,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15447:1:5",
+                              "src": "15447:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -66670,7 +66670,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15416:33:5",
+                            "src": "15416:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -66681,14 +66681,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2434,
+                            "id": 3876,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15452:1:5",
+                            "src": "15452:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -66696,15 +66696,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15416:37:5",
+                          "src": "15416:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2436,
+                        "id": 3878,
                         "nodeType": "ExpressionStatement",
-                        "src": "15416:37:5"
+                        "src": "15416:37:7"
                       },
                       {
                         "eventCall": {
@@ -66712,12 +66712,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2438,
+                              "id": 3880,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2348,
-                              "src": "15497:15:5",
+                              "referencedDeclaration": 3790,
+                              "src": "15497:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -66731,18 +66731,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2437,
+                            "id": 3879,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "15472:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "15472:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2439,
+                          "id": 3881,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66750,15 +66750,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15472:41:5",
+                          "src": "15472:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2440,
+                        "id": 3882,
                         "nodeType": "EmitStatement",
-                        "src": "15467:46:5"
+                        "src": "15467:46:7"
                       }
                     ]
                   }
@@ -66767,10 +66767,10 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2447,
+                    "id": 3889,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66779,28 +66779,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2443,
+                        "id": 3885,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2354,
-                        "src": "15538:7:5",
+                        "referencedDeclaration": 3796,
+                        "src": "15538:7:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 2444,
+                      "id": 3886,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 803,
-                      "src": "15538:19:5",
+                      "referencedDeclaration": 2245,
+                      "src": "15538:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -66810,18 +66810,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2445,
+                        "id": 3887,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 726,
-                        "src": "15561:9:5",
+                        "referencedDeclaration": 2168,
+                        "src": "15561:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$726_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2446,
+                      "id": 3888,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -66829,26 +66829,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15561:19:5",
+                      "src": "15561:19:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$726",
+                        "typeIdentifier": "t_enum$_OrderType_$2168",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15538:42:5",
+                    "src": "15538:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2489,
+                  "id": 3931,
                   "nodeType": "IfStatement",
-                  "src": "15534:437:5",
+                  "src": "15534:437:7",
                   "trueBody": {
-                    "id": 2488,
+                    "id": 3930,
                     "nodeType": "Block",
-                    "src": "15582:389:5",
+                    "src": "15582:389:7",
                     "statements": [
                       {
                         "condition": {
@@ -66857,7 +66857,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2455,
+                          "id": 3897,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66866,18 +66866,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2448,
+                              "id": 3890,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "15600:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "15600:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2449,
+                            "id": 3891,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -66885,7 +66885,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15600:10:5",
+                            "src": "15600:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -66899,42 +66899,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2450,
+                                "id": 3892,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "15614:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "15614:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2453,
+                              "id": 3895,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2451,
+                                  "id": 3893,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15620:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15620:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2452,
+                                "id": 3894,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15620:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15620:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66945,41 +66945,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15614:21:5",
+                              "src": "15614:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2454,
+                            "id": 3896,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "15614:32:5",
+                            "referencedDeclaration": 2189,
+                            "src": "15614:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15600:46:5",
+                          "src": "15600:46:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 2473,
+                          "id": 3915,
                           "nodeType": "Block",
-                          "src": "15752:98:5",
+                          "src": "15752:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2471,
+                                "id": 3913,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66990,26 +66990,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2465,
+                                      "id": 3907,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15770:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15770:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2467,
+                                    "id": 3909,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2466,
+                                      "id": 3908,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15779:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15779:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -67020,23 +67020,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15770:25:5",
+                                    "src": "15770:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2468,
+                                  "id": 3910,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15770:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15770:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -67046,18 +67046,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2469,
+                                    "id": 3911,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15805:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15805:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2470,
+                                  "id": 3912,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -67065,36 +67065,36 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15805:30:5",
+                                  "src": "15805:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15770:65:5",
+                                "src": "15770:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2472,
+                              "id": 3914,
                               "nodeType": "ExpressionStatement",
-                              "src": "15770:65:5"
+                              "src": "15770:65:7"
                             }
                           ]
                         },
-                        "id": 2474,
+                        "id": 3916,
                         "nodeType": "IfStatement",
-                        "src": "15596:254:5",
+                        "src": "15596:254:7",
                         "trueBody": {
-                          "id": 2464,
+                          "id": 3906,
                           "nodeType": "Block",
-                          "src": "15648:98:5",
+                          "src": "15648:98:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2462,
+                                "id": 3904,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -67105,26 +67105,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 2456,
+                                      "id": 3898,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 909,
-                                      "src": "15666:8:5",
+                                      "referencedDeclaration": 2351,
+                                      "src": "15666:8:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 2458,
+                                    "id": 3900,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 2457,
+                                      "id": 3899,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2348,
-                                      "src": "15675:15:5",
+                                      "referencedDeclaration": 3790,
+                                      "src": "15675:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -67135,23 +67135,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15666:25:5",
+                                    "src": "15666:25:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 2459,
+                                  "id": 3901,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 809,
-                                  "src": "15666:32:5",
+                                  "referencedDeclaration": 2251,
+                                  "src": "15666:32:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -67161,18 +67161,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2460,
+                                    "id": 3902,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 736,
-                                    "src": "15701:13:5",
+                                    "referencedDeclaration": 2178,
+                                    "src": "15701:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$736_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 2461,
+                                  "id": 3903,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -67180,21 +67180,21 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15701:30:5",
+                                  "src": "15701:30:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15666:65:5",
+                                "src": "15666:65:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$736",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 2463,
+                              "id": 3905,
                               "nodeType": "ExpressionStatement",
-                              "src": "15666:65:5"
+                              "src": "15666:65:7"
                             }
                           ]
                         }
@@ -67202,7 +67202,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2482,
+                          "id": 3924,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67213,42 +67213,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2475,
+                                "id": 3917,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 915,
-                                "src": "15863:14:5",
+                                "referencedDeclaration": 2357,
+                                "src": "15863:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 2479,
+                              "id": 3921,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2476,
+                                  "id": 3918,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2354,
-                                  "src": "15878:7:5",
+                                  "referencedDeclaration": 3796,
+                                  "src": "15878:7:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$810_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 2477,
+                                "id": 3919,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 801,
-                                "src": "15878:14:5",
+                                "referencedDeclaration": 2243,
+                                "src": "15878:14:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -67259,24 +67259,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15863:30:5",
+                              "src": "15863:30:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 2480,
+                            "id": 3922,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2478,
+                              "id": 3920,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15894:1:5",
+                              "src": "15894:1:7",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -67289,7 +67289,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15863:33:5",
+                            "src": "15863:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -67300,14 +67300,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2481,
+                            "id": 3923,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15899:1:5",
+                            "src": "15899:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -67315,15 +67315,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15863:37:5",
+                          "src": "15863:37:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2483,
+                        "id": 3925,
                         "nodeType": "ExpressionStatement",
-                        "src": "15863:37:5"
+                        "src": "15863:37:7"
                       },
                       {
                         "eventCall": {
@@ -67331,12 +67331,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2485,
+                              "id": 3927,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2348,
-                              "src": "15944:15:5",
+                              "referencedDeclaration": 3790,
+                              "src": "15944:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -67350,18 +67350,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 2484,
+                            "id": 3926,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 840,
-                            "src": "15919:24:5",
+                            "referencedDeclaration": 2282,
+                            "src": "15919:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 2486,
+                          "id": 3928,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67369,15 +67369,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15919:41:5",
+                          "src": "15919:41:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2487,
+                        "id": 3929,
                         "nodeType": "EmitStatement",
-                        "src": "15914:46:5"
+                        "src": "15914:46:7"
                       }
                     ]
                   }
@@ -67386,14 +67386,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2490,
+                    "id": 3932,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "15987:4:5",
+                    "src": "15987:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -67401,15 +67401,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2352,
-                  "id": 2491,
+                  "functionReturnParameters": 3794,
+                  "id": 3933,
                   "nodeType": "Return",
-                  "src": "15980:11:5"
+                  "src": "15980:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2493,
+            "id": 3935,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -67417,16 +67417,16 @@
             "name": "CancelChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2349,
+              "id": 3791,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2348,
+                  "id": 3790,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2493,
-                  "src": "14736:20:5",
+                  "scope": 3935,
+                  "src": "14736:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -67434,10 +67434,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2347,
+                    "id": 3789,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14736:4:5",
+                    "src": "14736:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -67447,20 +67447,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14735:22:5"
+              "src": "14735:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2352,
+              "id": 3794,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2351,
+                  "id": 3793,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2493,
-                  "src": "14774:4:5",
+                  "scope": 3935,
+                  "src": "14774:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -67468,10 +67468,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2350,
+                    "id": 3792,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14774:4:5",
+                    "src": "14774:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -67481,19 +67481,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14773:6:5"
+              "src": "14773:6:7"
             },
-            "scope": 3787,
-            "src": "14707:1291:5",
+            "scope": 5229,
+            "src": "14707:1291:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2546,
+              "id": 3988,
               "nodeType": "Block",
-              "src": "16113:280:5",
+              "src": "16113:280:7",
               "statements": [
                 {
                   "expression": {
@@ -67505,7 +67505,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2509,
+                        "id": 3951,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67517,18 +67517,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2504,
+                                "id": 3946,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "16141:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "16141:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2505,
+                              "id": 3947,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -67536,7 +67536,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16141:10:5",
+                              "src": "16141:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -67550,18 +67550,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 2503,
+                            "id": 3945,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2856,
-                            "src": "16131:9:5",
+                            "referencedDeclaration": 4298,
+                            "src": "16131:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 2506,
+                          "id": 3948,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67569,7 +67569,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16131:21:5",
+                          "src": "16131:21:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67581,18 +67581,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2507,
+                            "id": 3949,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "16156:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "16156:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2508,
+                          "id": 3950,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67600,13 +67600,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16156:10:5",
+                          "src": "16156:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16131:35:5",
+                        "src": "16131:35:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67620,21 +67620,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2502,
+                      "id": 3944,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16123:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16123:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2510,
+                    "id": 3952,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67642,15 +67642,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16123:44:5",
+                    "src": "16123:44:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2511,
+                  "id": 3953,
                   "nodeType": "ExpressionStatement",
-                  "src": "16123:44:5"
+                  "src": "16123:44:7"
                 },
                 {
                   "expression": {
@@ -67662,7 +67662,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2518,
+                        "id": 3960,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67671,34 +67671,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2513,
+                            "id": 3955,
                             "name": "isMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 923,
-                            "src": "16185:8:5",
+                            "referencedDeclaration": 2365,
+                            "src": "16185:8:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 2516,
+                          "id": 3958,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2514,
+                              "id": 3956,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "16194:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "16194:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2515,
+                            "id": 3957,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -67706,7 +67706,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "16194:10:5",
+                            "src": "16194:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -67717,7 +67717,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16185:20:5",
+                          "src": "16185:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -67728,14 +67728,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 2517,
+                          "id": 3959,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16209:5:5",
+                          "src": "16209:5:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -67743,7 +67743,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "16185:29:5",
+                        "src": "16185:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67757,21 +67757,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2512,
+                      "id": 3954,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16177:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16177:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2519,
+                    "id": 3961,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67779,15 +67779,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16177:38:5",
+                    "src": "16177:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2520,
+                  "id": 3962,
                   "nodeType": "ExpressionStatement",
-                  "src": "16177:38:5"
+                  "src": "16177:38:7"
                 },
                 {
                   "expression": {
@@ -67799,7 +67799,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2526,
+                        "id": 3968,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67809,12 +67809,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 2523,
+                              "id": 3965,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2495,
-                              "src": "16243:7:5",
+                              "referencedDeclaration": 3937,
+                              "src": "16243:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -67828,18 +67828,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 2522,
+                            "id": 3964,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2856,
-                            "src": "16233:9:5",
+                            "referencedDeclaration": 4298,
+                            "src": "16233:9:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 2524,
+                          "id": 3966,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67847,7 +67847,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16233:18:5",
+                          "src": "16233:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67857,18 +67857,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2525,
+                          "id": 3967,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2495,
-                          "src": "16255:7:5",
+                          "referencedDeclaration": 3937,
+                          "src": "16255:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16233:29:5",
+                        "src": "16233:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67882,21 +67882,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2521,
+                      "id": 3963,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16225:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16225:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2527,
+                    "id": 3969,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67904,20 +67904,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16225:38:5",
+                    "src": "16225:38:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2528,
+                  "id": 3970,
                   "nodeType": "ExpressionStatement",
-                  "src": "16225:38:5"
+                  "src": "16225:38:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2536,
+                    "id": 3978,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67928,26 +67928,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2529,
+                          "id": 3971,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 929,
-                          "src": "16273:13:5",
+                          "referencedDeclaration": 2371,
+                          "src": "16273:13:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 2533,
+                        "id": 3975,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2530,
+                          "id": 3972,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2495,
-                          "src": "16287:7:5",
+                          "referencedDeclaration": 3937,
+                          "src": "16287:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67958,29 +67958,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16273:22:5",
+                        "src": "16273:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2534,
+                      "id": 3976,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2531,
+                          "id": 3973,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16296:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16296:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2532,
+                        "id": 3974,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67988,7 +67988,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16296:10:5",
+                        "src": "16296:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -67999,7 +67999,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16273:34:5",
+                      "src": "16273:34:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68010,14 +68010,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 2535,
+                      "id": 3977,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16310:4:5",
+                      "src": "16310:4:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -68025,15 +68025,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "16273:41:5",
+                    "src": "16273:41:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2537,
+                  "id": 3979,
                   "nodeType": "ExpressionStatement",
-                  "src": "16273:41:5"
+                  "src": "16273:41:7"
                 },
                 {
                   "eventCall": {
@@ -68043,18 +68043,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2539,
+                          "id": 3981,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16345:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16345:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2540,
+                        "id": 3982,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68062,7 +68062,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16345:10:5",
+                        "src": "16345:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68070,12 +68070,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2541,
+                        "id": 3983,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2495,
-                        "src": "16357:7:5",
+                        "referencedDeclaration": 3937,
+                        "src": "16357:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68093,18 +68093,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2538,
+                      "id": 3980,
                       "name": "WorkerAnnounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 846,
-                      "src": "16329:15:5",
+                      "referencedDeclaration": 2288,
+                      "src": "16329:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2542,
+                    "id": 3984,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68112,28 +68112,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16329:36:5",
+                    "src": "16329:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2543,
+                  "id": 3985,
                   "nodeType": "EmitStatement",
-                  "src": "16324:41:5"
+                  "src": "16324:41:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2544,
+                    "id": 3986,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16382:4:5",
+                    "src": "16382:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -68141,52 +68141,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2501,
-                  "id": 2545,
+                  "functionReturnParameters": 3943,
+                  "id": 3987,
                   "nodeType": "Return",
-                  "src": "16375:11:5"
+                  "src": "16375:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2547,
+            "id": 3989,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2498,
+                "id": 3940,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2497,
+                  "id": 3939,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16084:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16084:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16084:13:5"
+                "src": "16084:13:7"
               }
             ],
             "name": "RegisterWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2496,
+              "id": 3938,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2495,
+                  "id": 3937,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2547,
-                  "src": "16060:15:5",
+                  "scope": 3989,
+                  "src": "16060:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68194,10 +68194,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2494,
+                    "id": 3936,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16060:7:5",
+                    "src": "16060:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -68207,20 +68207,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16059:17:5"
+              "src": "16059:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2501,
+              "id": 3943,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2500,
+                  "id": 3942,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2547,
-                  "src": "16107:4:5",
+                  "scope": 3989,
+                  "src": "16107:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68228,10 +68228,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2499,
+                    "id": 3941,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16107:4:5",
+                    "src": "16107:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -68241,19 +68241,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16106:6:5"
+              "src": "16106:6:7"
             },
-            "scope": 3787,
-            "src": "16036:357:5",
+            "scope": 5229,
+            "src": "16036:357:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2597,
+              "id": 4039,
               "nodeType": "Block",
-              "src": "16475:268:5",
+              "src": "16475:268:7",
               "statements": [
                 {
                   "expression": {
@@ -68265,7 +68265,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2564,
+                        "id": 4006,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68276,34 +68276,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2557,
+                              "id": 3999,
                               "name": "masterRequest",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 929,
-                              "src": "16493:13:5",
+                              "referencedDeclaration": 2371,
+                              "src": "16493:13:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 2560,
+                            "id": 4002,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2558,
+                                "id": 4000,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "16507:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "16507:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2559,
+                              "id": 4001,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -68311,7 +68311,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16507:10:5",
+                              "src": "16507:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -68322,21 +68322,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "16493:25:5",
+                            "src": "16493:25:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 2562,
+                          "id": 4004,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2561,
+                            "id": 4003,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2549,
-                            "src": "16519:7:5",
+                            "referencedDeclaration": 3991,
+                            "src": "16519:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -68347,7 +68347,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16493:34:5",
+                          "src": "16493:34:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -68358,14 +68358,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 2563,
+                          "id": 4005,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16531:4:5",
+                          "src": "16531:4:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -68373,7 +68373,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "16493:42:5",
+                        "src": "16493:42:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -68387,21 +68387,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2556,
+                      "id": 3998,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16485:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16485:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2565,
+                    "id": 4007,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68409,20 +68409,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16485:51:5",
+                    "src": "16485:51:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2566,
+                  "id": 4008,
                   "nodeType": "ExpressionStatement",
-                  "src": "16485:51:5"
+                  "src": "16485:51:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2572,
+                    "id": 4014,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68431,26 +68431,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2567,
+                        "id": 4009,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 919,
-                        "src": "16546:8:5",
+                        "referencedDeclaration": 2361,
+                        "src": "16546:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 2569,
+                      "id": 4011,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2568,
+                        "id": 4010,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16555:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16555:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68461,7 +68461,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16546:17:5",
+                      "src": "16546:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -68473,18 +68473,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2570,
+                        "id": 4012,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "16566:3:5",
+                        "referencedDeclaration": 11315,
+                        "src": "16566:3:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 2571,
+                      "id": 4013,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -68492,26 +68492,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "16566:10:5",
+                      "src": "16566:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "16546:30:5",
+                    "src": "16546:30:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 2573,
+                  "id": 4015,
                   "nodeType": "ExpressionStatement",
-                  "src": "16546:30:5"
+                  "src": "16546:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2579,
+                    "id": 4021,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68520,34 +68520,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2574,
+                        "id": 4016,
                         "name": "isMaster",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 923,
-                        "src": "16586:8:5",
+                        "referencedDeclaration": 2365,
+                        "src": "16586:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2577,
+                      "id": 4019,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2575,
+                          "id": 4017,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16595:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16595:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2576,
+                        "id": 4018,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68555,7 +68555,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16595:10:5",
+                        "src": "16595:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68566,7 +68566,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16586:20:5",
+                      "src": "16586:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68577,14 +68577,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 2578,
+                      "id": 4020,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16609:4:5",
+                      "src": "16609:4:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -68592,20 +68592,20 @@
                       },
                       "value": "true"
                     },
-                    "src": "16586:27:5",
+                    "src": "16586:27:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2580,
+                  "id": 4022,
                   "nodeType": "ExpressionStatement",
-                  "src": "16586:27:5"
+                  "src": "16586:27:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2587,
+                    "id": 4029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68613,41 +68613,41 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16623:41:5",
+                    "src": "16623:41:7",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2581,
+                          "id": 4023,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 929,
-                          "src": "16630:13:5",
+                          "referencedDeclaration": 2371,
+                          "src": "16630:13:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 2584,
+                        "id": 4026,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2582,
+                            "id": 4024,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "16644:3:5",
+                            "referencedDeclaration": 11315,
+                            "src": "16644:3:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2583,
+                          "id": 4025,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -68655,7 +68655,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16644:10:5",
+                          "src": "16644:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -68666,21 +68666,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16630:25:5",
+                        "src": "16630:25:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 2586,
+                      "id": 4028,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2585,
+                        "id": 4027,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16656:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16656:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68691,7 +68691,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16630:34:5",
+                      "src": "16630:34:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68702,9 +68702,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2588,
+                  "id": 4030,
                   "nodeType": "ExpressionStatement",
-                  "src": "16623:41:5"
+                  "src": "16623:41:7"
                 },
                 {
                   "eventCall": {
@@ -68712,12 +68712,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2590,
+                        "id": 4032,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "16695:7:5",
+                        "referencedDeclaration": 3991,
+                        "src": "16695:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68727,18 +68727,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2591,
+                          "id": 4033,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "16704:3:5",
+                          "referencedDeclaration": 11315,
+                          "src": "16704:3:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 2592,
+                        "id": 4034,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68746,7 +68746,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16704:10:5",
+                        "src": "16704:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68764,18 +68764,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2589,
+                      "id": 4031,
                       "name": "WorkerConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 852,
-                      "src": "16679:15:5",
+                      "referencedDeclaration": 2294,
+                      "src": "16679:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2593,
+                    "id": 4035,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68783,28 +68783,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16679:36:5",
+                    "src": "16679:36:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2594,
+                  "id": 4036,
                   "nodeType": "EmitStatement",
-                  "src": "16674:41:5"
+                  "src": "16674:41:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2595,
+                    "id": 4037,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16732:4:5",
+                    "src": "16732:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -68812,52 +68812,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2555,
-                  "id": 2596,
+                  "functionReturnParameters": 3997,
+                  "id": 4038,
                   "nodeType": "Return",
-                  "src": "16725:11:5"
+                  "src": "16725:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2598,
+            "id": 4040,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2552,
+                "id": 3994,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2551,
+                  "id": 3993,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16446:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16446:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16446:13:5"
+                "src": "16446:13:7"
               }
             ],
             "name": "ConfirmWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2550,
+              "id": 3992,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2549,
+                  "id": 3991,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2598,
-                  "src": "16422:15:5",
+                  "scope": 4040,
+                  "src": "16422:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68865,10 +68865,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2548,
+                    "id": 3990,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16422:7:5",
+                    "src": "16422:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -68878,20 +68878,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16421:17:5"
+              "src": "16421:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2555,
+              "id": 3997,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2554,
+                  "id": 3996,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2598,
-                  "src": "16469:4:5",
+                  "scope": 4040,
+                  "src": "16469:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68899,10 +68899,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2553,
+                    "id": 3995,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16469:4:5",
+                    "src": "16469:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -68912,19 +68912,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16468:6:5"
+              "src": "16468:6:7"
             },
-            "scope": 3787,
-            "src": "16399:344:5",
+            "scope": 5229,
+            "src": "16399:344:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2640,
+              "id": 4082,
               "nodeType": "Block",
-              "src": "16841:208:5",
+              "src": "16841:208:7",
               "statements": [
                 {
                   "expression": {
@@ -68936,7 +68936,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2625,
+                        "id": 4067,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68947,7 +68947,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2614,
+                          "id": 4056,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -68957,12 +68957,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 2611,
+                                "id": 4053,
                                 "name": "_worker",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2600,
-                                "src": "16869:7:5",
+                                "referencedDeclaration": 4042,
+                                "src": "16869:7:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -68976,18 +68976,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 2610,
+                              "id": 4052,
                               "name": "GetMaster",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2856,
-                              "src": "16859:9:5",
+                              "referencedDeclaration": 4298,
+                              "src": "16859:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                 "typeString": "function (address) view returns (address)"
                               }
                             },
-                            "id": 2612,
+                            "id": 4054,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -68995,7 +68995,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "16859:18:5",
+                            "src": "16859:18:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -69005,18 +69005,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 2613,
+                            "id": 4055,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2602,
-                            "src": "16881:7:5",
+                            "referencedDeclaration": 4044,
+                            "src": "16881:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "16859:29:5",
+                          "src": "16859:29:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -69033,7 +69033,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 2623,
+                              "id": 4065,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -69044,7 +69044,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 2618,
+                                "id": 4060,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -69053,18 +69053,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2615,
+                                    "id": 4057,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "16893:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "16893:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2616,
+                                  "id": 4058,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -69072,7 +69072,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16893:10:5",
+                                  "src": "16893:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -69082,18 +69082,18 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2617,
+                                  "id": 4059,
                                   "name": "_worker",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2600,
-                                  "src": "16907:7:5",
+                                  "referencedDeclaration": 4042,
+                                  "src": "16907:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16893:21:5",
+                                "src": "16893:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -69107,7 +69107,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 2622,
+                                "id": 4064,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -69116,18 +69116,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2619,
+                                    "id": 4061,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "16918:3:5",
+                                    "referencedDeclaration": 11315,
+                                    "src": "16918:3:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2620,
+                                  "id": 4062,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -69135,7 +69135,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16918:10:5",
+                                  "src": "16918:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -69145,44 +69145,44 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 2621,
+                                  "id": 4063,
                                   "name": "_master",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2602,
-                                  "src": "16932:7:5",
+                                  "referencedDeclaration": 4044,
+                                  "src": "16932:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16918:21:5",
+                                "src": "16918:21:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "16893:46:5",
+                              "src": "16893:46:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 2624,
+                          "id": 4066,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "16892:48:5",
+                          "src": "16892:48:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "16859:81:5",
+                        "src": "16859:81:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -69196,21 +69196,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2609,
+                      "id": 4051,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "16851:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "16851:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2626,
+                    "id": 4068,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69218,20 +69218,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16851:90:5",
+                    "src": "16851:90:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2627,
+                  "id": 4069,
                   "nodeType": "ExpressionStatement",
-                  "src": "16851:90:5"
+                  "src": "16851:90:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2631,
+                    "id": 4073,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69239,31 +69239,31 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16951:24:5",
+                    "src": "16951:24:7",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2628,
+                        "id": 4070,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 919,
-                        "src": "16958:8:5",
+                        "referencedDeclaration": 2361,
+                        "src": "16958:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 2630,
+                      "id": 4072,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2629,
+                        "id": 4071,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2600,
-                        "src": "16967:7:5",
+                        "referencedDeclaration": 4042,
+                        "src": "16967:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69274,7 +69274,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16958:17:5",
+                      "src": "16958:17:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -69285,9 +69285,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2632,
+                  "id": 4074,
                   "nodeType": "ExpressionStatement",
-                  "src": "16951:24:5"
+                  "src": "16951:24:7"
                 },
                 {
                   "eventCall": {
@@ -69295,12 +69295,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2634,
+                        "id": 4076,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2600,
-                        "src": "17004:7:5",
+                        "referencedDeclaration": 4042,
+                        "src": "17004:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69308,12 +69308,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2635,
+                        "id": 4077,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2602,
-                        "src": "17013:7:5",
+                        "referencedDeclaration": 4044,
+                        "src": "17013:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69331,18 +69331,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 2633,
+                      "id": 4075,
                       "name": "WorkerRemoved",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 858,
-                      "src": "16990:13:5",
+                      "referencedDeclaration": 2300,
+                      "src": "16990:13:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 2636,
+                    "id": 4078,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69350,28 +69350,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16990:31:5",
+                    "src": "16990:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2637,
+                  "id": 4079,
                   "nodeType": "EmitStatement",
-                  "src": "16985:36:5"
+                  "src": "16985:36:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2638,
+                    "id": 4080,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "17038:4:5",
+                    "src": "17038:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -69379,52 +69379,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2608,
-                  "id": 2639,
+                  "functionReturnParameters": 4050,
+                  "id": 4081,
                   "nodeType": "Return",
-                  "src": "17031:11:5"
+                  "src": "17031:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2641,
+            "id": 4083,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2605,
+                "id": 4047,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2604,
+                  "id": 4046,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "16812:13:5",
+                  "referencedDeclaration": 10663,
+                  "src": "16812:13:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16812:13:5"
+                "src": "16812:13:7"
               }
             ],
             "name": "RemoveWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2603,
+              "id": 4045,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2600,
+                  "id": 4042,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16771:15:5",
+                  "scope": 4083,
+                  "src": "16771:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69432,10 +69432,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2599,
+                    "id": 4041,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16771:7:5",
+                    "src": "16771:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -69446,11 +69446,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2602,
+                  "id": 4044,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16788:15:5",
+                  "scope": 4083,
+                  "src": "16788:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69458,10 +69458,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2601,
+                    "id": 4043,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16788:7:5",
+                    "src": "16788:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -69471,20 +69471,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16770:34:5"
+              "src": "16770:34:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2608,
+              "id": 4050,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2607,
+                  "id": 4049,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "16835:4:5",
+                  "scope": 4083,
+                  "src": "16835:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69492,10 +69492,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2606,
+                    "id": 4048,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16835:4:5",
+                    "src": "16835:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -69505,47 +69505,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16834:6:5"
+              "src": "16834:6:7"
             },
-            "scope": 3787,
-            "src": "16749:300:5",
+            "scope": 5229,
+            "src": "16749:300:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2700,
+              "id": 4142,
               "nodeType": "Block",
-              "src": "17442:348:5",
+              "src": "17442:348:7",
               "statements": [
                 {
                   "assignments": [
-                    2671
+                    4113
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2671,
+                      "id": 4113,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2701,
-                      "src": "17452:18:5",
+                      "scope": 4143,
+                      "src": "17452:18:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2670,
+                        "id": 4112,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "17452:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "17452:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -69553,31 +69553,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2675,
+                  "id": 4117,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2672,
+                      "id": 4114,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "17473:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "17473:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2674,
+                    "id": 4116,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2673,
+                      "id": 4115,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2643,
-                      "src": "17480:7:5",
+                      "referencedDeclaration": 4085,
+                      "src": "17480:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -69588,14 +69588,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17473:15:5",
+                    "src": "17473:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17452:36:5"
+                  "src": "17452:36:7"
                 },
                 {
                   "expression": {
@@ -69605,28 +69605,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2676,
+                          "id": 4118,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17515:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17515:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2677,
+                        "id": 4119,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 772,
-                        "src": "17515:15:5",
+                        "referencedDeclaration": 2214,
+                        "src": "17515:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -69634,26 +69634,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2678,
+                          "id": 4120,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17540:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17540:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2679,
+                        "id": 4121,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 776,
-                        "src": "17540:12:5",
+                        "referencedDeclaration": 2218,
+                        "src": "17540:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69663,26 +69663,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2680,
+                          "id": 4122,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17562:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17562:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2681,
+                        "id": 4123,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "counterparty",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 778,
-                        "src": "17562:18:5",
+                        "referencedDeclaration": 2220,
+                        "src": "17562:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69692,26 +69692,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2682,
+                          "id": 4124,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17590:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17590:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2683,
+                        "id": 4125,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 780,
-                        "src": "17590:14:5",
+                        "referencedDeclaration": 2222,
+                        "src": "17590:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -69721,26 +69721,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2684,
+                          "id": 4126,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17614:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17614:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2685,
+                        "id": 4127,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 782,
-                        "src": "17614:11:5",
+                        "referencedDeclaration": 2224,
+                        "src": "17614:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -69750,26 +69750,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2686,
+                          "id": 4128,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17635:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17635:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2687,
+                        "id": 4129,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 785,
-                        "src": "17635:14:5",
+                        "referencedDeclaration": 2227,
+                        "src": "17635:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -69779,28 +69779,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2688,
+                          "id": 4130,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17659:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17659:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2689,
+                        "id": 4131,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "identityLevel",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 787,
-                        "src": "17659:19:5",
+                        "referencedDeclaration": 2229,
+                        "src": "17659:19:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -69808,26 +69808,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2690,
+                          "id": 4132,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17688:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17688:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2691,
+                        "id": 4133,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blacklist",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 789,
-                        "src": "17688:15:5",
+                        "referencedDeclaration": 2231,
+                        "src": "17688:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69837,26 +69837,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2692,
+                          "id": 4134,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17713:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17713:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2693,
+                        "id": 4135,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "tag",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 791,
-                        "src": "17713:9:5",
+                        "referencedDeclaration": 2233,
+                        "src": "17713:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -69866,26 +69866,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2694,
+                          "id": 4136,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17732:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17732:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2695,
+                        "id": 4137,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 794,
-                        "src": "17732:16:5",
+                        "referencedDeclaration": 2236,
+                        "src": "17732:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -69895,54 +69895,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2696,
+                          "id": 4138,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2671,
-                          "src": "17758:5:5",
+                          "referencedDeclaration": 4113,
+                          "src": "17758:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2697,
+                        "id": 4139,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "frozenSum",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 796,
-                        "src": "17758:15:5",
+                        "referencedDeclaration": 2238,
+                        "src": "17758:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2698,
+                    "id": 4140,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17505:278:5",
+                    "src": "17505:278:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$726_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$4931_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$2168_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderType,address,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2669,
-                  "id": 2699,
+                  "functionReturnParameters": 4111,
+                  "id": 4141,
                   "nodeType": "Return",
-                  "src": "17498:285:5"
+                  "src": "17498:285:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2701,
+            "id": 4143,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -69950,16 +69950,16 @@
             "name": "GetOrderInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2644,
+              "id": 4086,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2643,
+                  "id": 4085,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17093:12:5",
+                  "scope": 4143,
+                  "src": "17093:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69967,10 +69967,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2642,
+                    "id": 4084,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17093:4:5",
+                    "src": "17093:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -69980,35 +69980,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17092:14:5"
+              "src": "17092:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2669,
+              "id": 4111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2646,
+                  "id": 4088,
                   "name": "orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17141:19:5",
+                  "scope": 4143,
+                  "src": "17141:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2645,
+                    "id": 4087,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "17141:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "17141:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -70017,11 +70017,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2648,
+                  "id": 4090,
                   "name": "author",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17170:14:5",
+                  "scope": 4143,
+                  "src": "17170:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70029,10 +70029,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2647,
+                    "id": 4089,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17170:7:5",
+                    "src": "17170:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70043,11 +70043,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2650,
+                  "id": 4092,
                   "name": "counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17194:20:5",
+                  "scope": 4143,
+                  "src": "17194:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70055,10 +70055,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2649,
+                    "id": 4091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17194:7:5",
+                    "src": "17194:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70069,11 +70069,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2652,
+                  "id": 4094,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17224:13:5",
+                  "scope": 4143,
+                  "src": "17224:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70081,10 +70081,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2651,
+                    "id": 4093,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17224:4:5",
+                    "src": "17224:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70095,11 +70095,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2654,
+                  "id": 4096,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17247:10:5",
+                  "scope": 4143,
+                  "src": "17247:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70107,10 +70107,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2653,
+                    "id": 4095,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17247:4:5",
+                    "src": "17247:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70121,11 +70121,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2657,
+                  "id": 4099,
                   "name": "netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17267:15:5",
+                  "scope": 4143,
+                  "src": "17267:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70134,19 +70134,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2655,
+                      "id": 4097,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17267:4:5",
+                      "src": "17267:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 2656,
+                    "id": 4098,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17267:6:5",
+                    "src": "17267:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -70157,26 +70157,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2659,
+                  "id": 4101,
                   "name": "identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17292:43:5",
+                  "scope": 4143,
+                  "src": "17292:43:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2658,
+                    "id": 4100,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "17292:29:5",
+                    "referencedDeclaration": 9497,
+                    "src": "17292:29:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -70185,11 +70185,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2661,
+                  "id": 4103,
                   "name": "blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17345:17:5",
+                  "scope": 4143,
+                  "src": "17345:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70197,10 +70197,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2660,
+                    "id": 4102,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17345:7:5",
+                    "src": "17345:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70211,11 +70211,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2663,
+                  "id": 4105,
                   "name": "tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17372:11:5",
+                  "scope": 4143,
+                  "src": "17372:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70223,10 +70223,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 2662,
+                    "id": 4104,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17372:7:5",
+                    "src": "17372:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -70237,11 +70237,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2666,
+                  "id": 4108,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17393:19:5",
+                  "scope": 4143,
+                  "src": "17393:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70250,19 +70250,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2664,
+                      "id": 4106,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17393:6:5",
+                      "src": "17393:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2665,
+                    "id": 4107,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17393:8:5",
+                    "src": "17393:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -70273,11 +70273,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2668,
+                  "id": 4110,
                   "name": "frozenSum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2701,
-                  "src": "17422:14:5",
+                  "scope": 4143,
+                  "src": "17422:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70285,10 +70285,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2667,
+                    "id": 4109,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17422:4:5",
+                    "src": "17422:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70298,47 +70298,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17131:311:5"
+              "src": "17131:311:7"
             },
-            "scope": 3787,
-            "src": "17071:719:5",
+            "scope": 5229,
+            "src": "17071:719:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2722,
+              "id": 4164,
               "nodeType": "Block",
-              "src": "17919:129:5",
+              "src": "17919:129:7",
               "statements": [
                 {
                   "assignments": [
-                    2711
+                    4153
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2711,
+                      "id": 4153,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2723,
-                      "src": "17929:18:5",
+                      "scope": 4165,
+                      "src": "17929:18:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2710,
+                        "id": 4152,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 799,
-                        "src": "17929:5:5",
+                        "referencedDeclaration": 2241,
+                        "src": "17929:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$799_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -70346,31 +70346,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2715,
+                  "id": 4157,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2712,
+                      "id": 4154,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 896,
-                      "src": "17950:6:5",
+                      "referencedDeclaration": 2338,
+                      "src": "17950:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$799_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2714,
+                    "id": 4156,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2713,
+                      "id": 4155,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2703,
-                      "src": "17957:7:5",
+                      "referencedDeclaration": 4145,
+                      "src": "17957:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -70381,14 +70381,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17950:15:5",
+                    "src": "17950:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$799_storage",
+                      "typeIdentifier": "t_struct$_Order_$2241_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17929:36:5"
+                  "src": "17929:36:7"
                 },
                 {
                   "expression": {
@@ -70398,28 +70398,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2716,
+                          "id": 4158,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2711,
-                          "src": "17992:5:5",
+                          "referencedDeclaration": 4153,
+                          "src": "17992:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2717,
+                        "id": 4159,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderStatus",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 774,
-                        "src": "17992:17:5",
+                        "referencedDeclaration": 2216,
+                        "src": "17992:17:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$730",
+                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
                           "typeString": "enum Market.OrderStatus"
                         }
                       },
@@ -70427,54 +70427,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2718,
+                          "id": 4160,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2711,
-                          "src": "18019:5:5",
+                          "referencedDeclaration": 4153,
+                          "src": "18019:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$799_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2719,
+                        "id": 4161,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 798,
-                        "src": "18019:12:5",
+                        "referencedDeclaration": 2240,
+                        "src": "18019:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2720,
+                    "id": 4162,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17982:59:5",
+                    "src": "17982:59:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$730_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$2172_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderStatus,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2709,
-                  "id": 2721,
+                  "functionReturnParameters": 4151,
+                  "id": 4163,
                   "nodeType": "Return",
-                  "src": "17975:66:5"
+                  "src": "17975:66:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2723,
+            "id": 4165,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -70482,16 +70482,16 @@
             "name": "GetOrderParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2704,
+              "id": 4146,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2703,
+                  "id": 4145,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17821:12:5",
+                  "scope": 4165,
+                  "src": "17821:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70499,10 +70499,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2702,
+                    "id": 4144,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17821:4:5",
+                    "src": "17821:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70512,35 +70512,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17820:14:5"
+              "src": "17820:14:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2709,
+              "id": 4151,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2706,
+                  "id": 4148,
                   "name": "orderStatus",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17869:23:5",
+                  "scope": 4165,
+                  "src": "17869:23:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$730",
+                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
                     "typeString": "enum Market.OrderStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2705,
+                    "id": 4147,
                     "name": "OrderStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 730,
-                    "src": "17869:11:5",
+                    "referencedDeclaration": 2172,
+                    "src": "17869:11:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$730",
+                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
@@ -70549,11 +70549,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2708,
+                  "id": 4150,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2723,
-                  "src": "17902:11:5",
+                  "scope": 4165,
+                  "src": "17902:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70561,10 +70561,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2707,
+                    "id": 4149,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17902:4:5",
+                    "src": "17902:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70574,19 +70574,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17859:60:5"
+              "src": "17859:60:7"
             },
-            "scope": 3787,
-            "src": "17797:251:5",
+            "scope": 5229,
+            "src": "17797:251:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2773,
+              "id": 4215,
               "nodeType": "Block",
-              "src": "18293:260:5",
+              "src": "18293:260:7",
               "statements": [
                 {
                   "expression": {
@@ -70598,26 +70598,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2743,
+                            "id": 4185,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18320:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18320:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2745,
+                          "id": 4187,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2744,
+                            "id": 4186,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18326:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18326:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70628,21 +70628,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18320:13:5",
+                          "src": "18320:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2746,
+                        "id": 4188,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 743,
-                        "src": "18320:24:5",
+                        "referencedDeclaration": 2185,
+                        "src": "18320:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage",
                           "typeString": "uint64[] storage ref"
@@ -70654,26 +70654,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2747,
+                            "id": 4189,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18354:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18354:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2749,
+                          "id": 4191,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2748,
+                            "id": 4190,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18360:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18360:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70684,21 +70684,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18354:13:5",
+                          "src": "18354:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2750,
+                        "id": 4192,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "supplierID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 745,
-                        "src": "18354:24:5",
+                        "referencedDeclaration": 2187,
+                        "src": "18354:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70710,26 +70710,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2751,
+                            "id": 4193,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18388:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18388:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2753,
+                          "id": 4195,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2752,
+                            "id": 4194,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18394:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18394:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70740,21 +70740,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18388:13:5",
+                          "src": "18388:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2754,
+                        "id": 4196,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "consumerID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 747,
-                        "src": "18388:24:5",
+                        "referencedDeclaration": 2189,
+                        "src": "18388:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70766,26 +70766,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2755,
+                            "id": 4197,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18422:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18422:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2757,
+                          "id": 4199,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2756,
+                            "id": 4198,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18428:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18428:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70796,21 +70796,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18422:13:5",
+                          "src": "18422:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2758,
+                        "id": 4200,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "masterID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 749,
-                        "src": "18422:22:5",
+                        "referencedDeclaration": 2191,
+                        "src": "18422:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70822,26 +70822,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2759,
+                            "id": 4201,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18454:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18454:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2761,
+                          "id": 4203,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2760,
+                            "id": 4202,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18460:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18460:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70852,21 +70852,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18454:13:5",
+                          "src": "18454:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2762,
+                        "id": 4204,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "askID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 751,
-                        "src": "18454:19:5",
+                        "referencedDeclaration": 2193,
+                        "src": "18454:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -70878,26 +70878,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2763,
+                            "id": 4205,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18483:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18483:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2765,
+                          "id": 4207,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2764,
+                            "id": 4206,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18489:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18489:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70908,21 +70908,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18483:13:5",
+                          "src": "18483:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2766,
+                        "id": 4208,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "bidID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 753,
-                        "src": "18483:19:5",
+                        "referencedDeclaration": 2195,
+                        "src": "18483:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -70934,26 +70934,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2767,
+                            "id": 4209,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18512:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18512:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2769,
+                          "id": 4211,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2768,
+                            "id": 4210,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2725,
-                            "src": "18518:6:5",
+                            "referencedDeclaration": 4167,
+                            "src": "18518:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70964,49 +70964,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18512:13:5",
+                          "src": "18512:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2770,
+                        "id": 4212,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "startTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 759,
-                        "src": "18512:23:5",
+                        "referencedDeclaration": 2201,
+                        "src": "18512:23:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2771,
+                    "id": 4213,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18310:236:5",
+                    "src": "18310:236:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_array$_t_uint64_$dyn_storage_$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint64[] storage ref,address,address,address,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2742,
-                  "id": 2772,
+                  "functionReturnParameters": 4184,
+                  "id": 4214,
                   "nodeType": "Return",
-                  "src": "18303:243:5"
+                  "src": "18303:243:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2774,
+            "id": 4216,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -71014,16 +71014,16 @@
             "name": "GetDealInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2726,
+              "id": 4168,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2725,
+                  "id": 4167,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18075:11:5",
+                  "scope": 4216,
+                  "src": "18075:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71031,10 +71031,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2724,
+                    "id": 4166,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18075:4:5",
+                    "src": "18075:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71044,20 +71044,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18074:13:5"
+              "src": "18074:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2742,
+              "id": 4184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2729,
+                  "id": 4171,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18122:19:5",
+                  "scope": 4216,
+                  "src": "18122:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71066,19 +71066,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2727,
+                      "id": 4169,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "18122:6:5",
+                      "src": "18122:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2728,
+                    "id": 4170,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "18122:8:5",
+                    "src": "18122:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -71089,11 +71089,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2731,
+                  "id": 4173,
                   "name": "supplierID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18151:18:5",
+                  "scope": 4216,
+                  "src": "18151:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71101,10 +71101,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2730,
+                    "id": 4172,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18151:7:5",
+                    "src": "18151:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71115,11 +71115,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2733,
+                  "id": 4175,
                   "name": "consumerID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18179:18:5",
+                  "scope": 4216,
+                  "src": "18179:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71127,10 +71127,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2732,
+                    "id": 4174,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18179:7:5",
+                    "src": "18179:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71141,11 +71141,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2735,
+                  "id": 4177,
                   "name": "masterID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18207:16:5",
+                  "scope": 4216,
+                  "src": "18207:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71153,10 +71153,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2734,
+                    "id": 4176,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18207:7:5",
+                    "src": "18207:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71167,11 +71167,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2737,
+                  "id": 4179,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18233:10:5",
+                  "scope": 4216,
+                  "src": "18233:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71179,10 +71179,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2736,
+                    "id": 4178,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18233:4:5",
+                    "src": "18233:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71193,11 +71193,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2739,
+                  "id": 4181,
                   "name": "bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18253:10:5",
+                  "scope": 4216,
+                  "src": "18253:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71205,10 +71205,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2738,
+                    "id": 4180,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18253:4:5",
+                    "src": "18253:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71219,11 +71219,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2741,
+                  "id": 4183,
                   "name": "startTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2774,
-                  "src": "18273:14:5",
+                  "scope": 4216,
+                  "src": "18273:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71231,10 +71231,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2740,
+                    "id": 4182,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18273:4:5",
+                    "src": "18273:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71244,19 +71244,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18112:181:5"
+              "src": "18112:181:7"
             },
-            "scope": 3787,
-            "src": "18054:499:5",
+            "scope": 5229,
+            "src": "18054:499:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2823,
+              "id": 4265,
               "nodeType": "Block",
-              "src": "18797:263:5",
+              "src": "18797:263:7",
               "statements": [
                 {
                   "expression": {
@@ -71268,26 +71268,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2793,
+                            "id": 4235,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18824:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18824:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2795,
+                          "id": 4237,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2794,
+                            "id": 4236,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18830:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18830:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71298,21 +71298,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18824:13:5",
+                          "src": "18824:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2796,
+                        "id": 4238,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 755,
-                        "src": "18824:22:5",
+                        "referencedDeclaration": 2197,
+                        "src": "18824:22:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71324,26 +71324,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2797,
+                            "id": 4239,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18856:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18856:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2799,
+                          "id": 4241,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2798,
+                            "id": 4240,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18862:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18862:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71354,21 +71354,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18856:13:5",
+                          "src": "18856:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2800,
+                        "id": 4242,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 757,
-                        "src": "18856:19:5",
+                        "referencedDeclaration": 2199,
+                        "src": "18856:19:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71380,26 +71380,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2801,
+                            "id": 4243,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18885:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18885:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2803,
+                          "id": 4245,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2802,
+                            "id": 4244,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18891:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18891:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71410,21 +71410,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18885:13:5",
+                          "src": "18885:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2804,
+                        "id": 4246,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 761,
-                        "src": "18885:21:5",
+                        "referencedDeclaration": 2203,
+                        "src": "18885:21:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71436,26 +71436,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2805,
+                            "id": 4247,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18916:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18916:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2807,
+                          "id": 4249,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2806,
+                            "id": 4248,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18922:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18922:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71466,23 +71466,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18916:13:5",
+                          "src": "18916:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2808,
+                        "id": 4250,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 763,
-                        "src": "18916:20:5",
+                        "referencedDeclaration": 2205,
+                        "src": "18916:20:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         }
                       },
@@ -71492,26 +71492,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2809,
+                            "id": 4251,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18946:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18946:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2811,
+                          "id": 4253,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2810,
+                            "id": 4252,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18952:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18952:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71522,21 +71522,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18946:13:5",
+                          "src": "18946:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2812,
+                        "id": 4254,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blockedBalance",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 765,
-                        "src": "18946:28:5",
+                        "referencedDeclaration": 2207,
+                        "src": "18946:28:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71548,26 +71548,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2813,
+                            "id": 4255,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "18984:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "18984:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2815,
+                          "id": 4257,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2814,
+                            "id": 4256,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "18990:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "18990:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71578,21 +71578,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18984:13:5",
+                          "src": "18984:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2816,
+                        "id": 4258,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "totalPayout",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 767,
-                        "src": "18984:25:5",
+                        "referencedDeclaration": 2209,
+                        "src": "18984:25:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71604,26 +71604,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2817,
+                            "id": 4259,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 900,
-                            "src": "19019:5:5",
+                            "referencedDeclaration": 2342,
+                            "src": "19019:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 2819,
+                          "id": 4261,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2818,
+                            "id": 4260,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2776,
-                            "src": "19025:6:5",
+                            "referencedDeclaration": 4218,
+                            "src": "19025:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71634,49 +71634,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19019:13:5",
+                          "src": "19019:13:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 2820,
+                        "id": 4262,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 769,
-                        "src": "19019:24:5",
+                        "referencedDeclaration": 2211,
+                        "src": "19019:24:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 2821,
+                    "id": 4263,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18814:239:5",
+                    "src": "18814:239:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$722_$_t_uint256_$_t_uint256_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$2164_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint256,uint256,uint256,enum Market.DealStatus,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 2792,
-                  "id": 2822,
+                  "functionReturnParameters": 4234,
+                  "id": 4264,
                   "nodeType": "Return",
-                  "src": "18807:246:5"
+                  "src": "18807:246:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2824,
+            "id": 4266,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -71684,16 +71684,16 @@
             "name": "GetDealParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2777,
+              "id": 4219,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2776,
+                  "id": 4218,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18582:11:5",
+                  "scope": 4266,
+                  "src": "18582:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71701,10 +71701,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2775,
+                    "id": 4217,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18582:4:5",
+                    "src": "18582:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71714,20 +71714,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18581:13:5"
+              "src": "18581:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2792,
+              "id": 4234,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2779,
+                  "id": 4221,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18629:13:5",
+                  "scope": 4266,
+                  "src": "18629:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71735,10 +71735,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2778,
+                    "id": 4220,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18629:4:5",
+                    "src": "18629:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71749,11 +71749,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2781,
+                  "id": 4223,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18652:10:5",
+                  "scope": 4266,
+                  "src": "18652:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71761,10 +71761,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2780,
+                    "id": 4222,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18652:4:5",
+                    "src": "18652:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71775,11 +71775,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2783,
+                  "id": 4225,
                   "name": "endTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18672:12:5",
+                  "scope": 4266,
+                  "src": "18672:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71787,10 +71787,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2782,
+                    "id": 4224,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18672:4:5",
+                    "src": "18672:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71801,26 +71801,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2785,
+                  "id": 4227,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18694:17:5",
+                  "scope": 4266,
+                  "src": "18694:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$722",
+                    "typeIdentifier": "t_enum$_DealStatus_$2164",
                     "typeString": "enum Market.DealStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2784,
+                    "id": 4226,
                     "name": "DealStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 722,
-                    "src": "18694:10:5",
+                    "referencedDeclaration": 2164,
+                    "src": "18694:10:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
@@ -71829,11 +71829,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2787,
+                  "id": 4229,
                   "name": "blockedBalance",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18721:19:5",
+                  "scope": 4266,
+                  "src": "18721:19:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71841,10 +71841,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2786,
+                    "id": 4228,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18721:4:5",
+                    "src": "18721:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71855,11 +71855,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2789,
+                  "id": 4231,
                   "name": "totalPayout",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18750:16:5",
+                  "scope": 4266,
+                  "src": "18750:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71867,10 +71867,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2788,
+                    "id": 4230,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18750:4:5",
+                    "src": "18750:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71881,11 +71881,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2791,
+                  "id": 4233,
                   "name": "lastBillTS",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2824,
-                  "src": "18776:15:5",
+                  "scope": 4266,
+                  "src": "18776:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71893,10 +71893,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2790,
+                    "id": 4232,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18776:4:5",
+                    "src": "18776:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71906,19 +71906,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18619:178:5"
+              "src": "18619:178:7"
             },
-            "scope": 3787,
-            "src": "18559:501:5",
+            "scope": 5229,
+            "src": "18559:501:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2855,
+              "id": 4297,
               "nodeType": "Block",
-              "src": "19139:176:5",
+              "src": "19139:176:7",
               "statements": [
                 {
                   "condition": {
@@ -71927,7 +71927,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 2841,
+                    "id": 4283,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -71938,7 +71938,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 2835,
+                      "id": 4277,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -71947,26 +71947,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2831,
+                          "id": 4273,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 919,
-                          "src": "19153:8:5",
+                          "referencedDeclaration": 2361,
+                          "src": "19153:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 2833,
+                        "id": 4275,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2832,
+                          "id": 4274,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2826,
-                          "src": "19162:7:5",
+                          "referencedDeclaration": 4268,
+                          "src": "19162:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -71977,7 +71977,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19153:17:5",
+                        "src": "19153:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -71988,14 +71988,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "307830",
-                        "id": 2834,
+                        "id": 4276,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "19174:3:5",
+                        "src": "19174:3:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -72003,7 +72003,7 @@
                         },
                         "value": "0x0"
                       },
-                      "src": "19153:24:5",
+                      "src": "19153:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -72017,7 +72017,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 2840,
+                      "id": 4282,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -72026,26 +72026,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2836,
+                          "id": 4278,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 919,
-                          "src": "19181:8:5",
+                          "referencedDeclaration": 2361,
+                          "src": "19181:8:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 2838,
+                        "id": 4280,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2837,
+                          "id": 4279,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2826,
-                          "src": "19190:7:5",
+                          "referencedDeclaration": 4268,
+                          "src": "19190:7:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -72056,7 +72056,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19181:17:5",
+                        "src": "19181:17:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -72066,50 +72066,50 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 2839,
+                        "id": 4281,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2826,
-                        "src": "19202:7:5",
+                        "referencedDeclaration": 4268,
+                        "src": "19202:7:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "19181:28:5",
+                      "src": "19181:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "19153:56:5",
+                    "src": "19153:56:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 2853,
+                    "id": 4295,
                     "nodeType": "Block",
-                    "src": "19258:51:5",
+                    "src": "19258:51:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2851,
+                          "id": 4293,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2847,
+                            "id": 4289,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2829,
-                            "src": "19272:6:5",
+                            "referencedDeclaration": 4271,
+                            "src": "19272:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -72121,26 +72121,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2848,
+                              "id": 4290,
                               "name": "masterOf",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 919,
-                              "src": "19281:8:5",
+                              "referencedDeclaration": 2361,
+                              "src": "19281:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                                 "typeString": "mapping(address => address)"
                               }
                             },
-                            "id": 2850,
+                            "id": 4292,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2849,
+                              "id": 4291,
                               "name": "_worker",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2826,
-                              "src": "19290:7:5",
+                              "referencedDeclaration": 4268,
+                              "src": "19290:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -72151,48 +72151,48 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "19281:17:5",
+                            "src": "19281:17:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19272:26:5",
+                          "src": "19272:26:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 2852,
+                        "id": 4294,
                         "nodeType": "ExpressionStatement",
-                        "src": "19272:26:5"
+                        "src": "19272:26:7"
                       }
                     ]
                   },
-                  "id": 2854,
+                  "id": 4296,
                   "nodeType": "IfStatement",
-                  "src": "19149:160:5",
+                  "src": "19149:160:7",
                   "trueBody": {
-                    "id": 2846,
+                    "id": 4288,
                     "nodeType": "Block",
-                    "src": "19211:41:5",
+                    "src": "19211:41:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2844,
+                          "id": 4286,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 2842,
+                            "id": 4284,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2829,
-                            "src": "19225:6:5",
+                            "referencedDeclaration": 4271,
+                            "src": "19225:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -72202,26 +72202,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 2843,
+                            "id": 4285,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2826,
-                            "src": "19234:7:5",
+                            "referencedDeclaration": 4268,
+                            "src": "19234:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19225:16:5",
+                          "src": "19225:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 2845,
+                        "id": 4287,
                         "nodeType": "ExpressionStatement",
-                        "src": "19225:16:5"
+                        "src": "19225:16:7"
                       }
                     ]
                   }
@@ -72229,7 +72229,7 @@
               ]
             },
             "documentation": null,
-            "id": 2856,
+            "id": 4298,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72237,16 +72237,16 @@
             "name": "GetMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2827,
+              "id": 4269,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2826,
+                  "id": 4268,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2856,
-                  "src": "19085:15:5",
+                  "scope": 4298,
+                  "src": "19085:15:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72254,10 +72254,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2825,
+                    "id": 4267,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19085:7:5",
+                    "src": "19085:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -72267,20 +72267,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19084:17:5"
+              "src": "19084:17:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2830,
+              "id": 4272,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2829,
+                  "id": 4271,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2856,
-                  "src": "19123:14:5",
+                  "scope": 4298,
+                  "src": "19123:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72288,10 +72288,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2828,
+                    "id": 4270,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19123:7:5",
+                    "src": "19123:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -72301,19 +72301,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19122:16:5"
+              "src": "19122:16:7"
             },
-            "scope": 3787,
-            "src": "19066:249:5",
+            "scope": 5229,
+            "src": "19066:249:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2893,
+              "id": 4335,
               "nodeType": "Block",
-              "src": "19528:250:5",
+              "src": "19528:250:7",
               "statements": [
                 {
                   "expression": {
@@ -72325,26 +72325,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2871,
+                            "id": 4313,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19555:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19555:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2873,
+                          "id": 4315,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2872,
+                            "id": 4314,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19564:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19564:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72355,21 +72355,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19555:25:5",
+                          "src": "19555:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2874,
+                        "id": 4316,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 801,
-                        "src": "19555:32:5",
+                        "referencedDeclaration": 2243,
+                        "src": "19555:32:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72381,26 +72381,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2875,
+                            "id": 4317,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19597:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19597:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2877,
+                          "id": 4319,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2876,
+                            "id": 4318,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19606:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19606:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72411,23 +72411,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19597:25:5",
+                          "src": "19597:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2878,
+                        "id": 4320,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "requestType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 803,
-                        "src": "19597:37:5",
+                        "referencedDeclaration": 2245,
+                        "src": "19597:37:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$726",
+                          "typeIdentifier": "t_enum$_OrderType_$2168",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -72437,26 +72437,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2879,
+                            "id": 4321,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19644:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19644:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2881,
+                          "id": 4323,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2880,
+                            "id": 4322,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19653:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19653:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72467,21 +72467,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19644:25:5",
+                          "src": "19644:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2882,
+                        "id": 4324,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 805,
-                        "src": "19644:31:5",
+                        "referencedDeclaration": 2247,
+                        "src": "19644:31:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72493,26 +72493,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2883,
+                            "id": 4325,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19685:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19685:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2885,
+                          "id": 4327,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2884,
+                            "id": 4326,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19694:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19694:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72523,21 +72523,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19685:25:5",
+                          "src": "19685:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2886,
+                        "id": 4328,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 807,
-                        "src": "19685:34:5",
+                        "referencedDeclaration": 2249,
+                        "src": "19685:34:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72549,26 +72549,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 2887,
+                            "id": 4329,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 909,
-                            "src": "19729:8:5",
+                            "referencedDeclaration": 2351,
+                            "src": "19729:8:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$810_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 2889,
+                          "id": 4331,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 2888,
+                            "id": 4330,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2858,
-                            "src": "19738:15:5",
+                            "referencedDeclaration": 4300,
+                            "src": "19738:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72579,49 +72579,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19729:25:5",
+                          "src": "19729:25:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$810_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 2890,
+                        "id": 4332,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 809,
-                        "src": "19729:32:5",
+                        "referencedDeclaration": 2251,
+                        "src": "19729:32:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$736",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
                           "typeString": "enum Market.RequestStatus"
                         }
                       }
                     ],
-                    "id": 2891,
+                    "id": 4333,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "19545:226:5",
+                    "src": "19545:226:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$726_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$736_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$2168_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2178_$",
                       "typeString": "tuple(uint256,enum Market.OrderType,uint256,uint256,enum Market.RequestStatus)"
                     }
                   },
-                  "functionReturnParameters": 2870,
-                  "id": 2892,
+                  "functionReturnParameters": 4312,
+                  "id": 4334,
                   "nodeType": "Return",
-                  "src": "19538:233:5"
+                  "src": "19538:233:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2894,
+            "id": 4336,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72629,16 +72629,16 @@
             "name": "GetChangeRequestInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2859,
+              "id": 4301,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2858,
+                  "id": 4300,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19351:20:5",
+                  "scope": 4336,
+                  "src": "19351:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72646,10 +72646,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2857,
+                    "id": 4299,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19351:4:5",
+                    "src": "19351:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72659,20 +72659,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19350:22:5"
+              "src": "19350:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2870,
+              "id": 4312,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2861,
+                  "id": 4303,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19407:11:5",
+                  "scope": 4336,
+                  "src": "19407:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72680,10 +72680,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2860,
+                    "id": 4302,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19407:4:5",
+                    "src": "19407:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72694,26 +72694,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2863,
+                  "id": 4305,
                   "name": "requestType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19428:21:5",
+                  "scope": 4336,
+                  "src": "19428:21:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$726",
+                    "typeIdentifier": "t_enum$_OrderType_$2168",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2862,
+                    "id": 4304,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 726,
-                    "src": "19428:9:5",
+                    "referencedDeclaration": 2168,
+                    "src": "19428:9:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$726",
+                      "typeIdentifier": "t_enum$_OrderType_$2168",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -72722,11 +72722,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2865,
+                  "id": 4307,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19459:10:5",
+                  "scope": 4336,
+                  "src": "19459:10:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72734,10 +72734,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2864,
+                    "id": 4306,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19459:4:5",
+                    "src": "19459:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72748,11 +72748,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2867,
+                  "id": 4309,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19479:13:5",
+                  "scope": 4336,
+                  "src": "19479:13:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72760,10 +72760,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2866,
+                    "id": 4308,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19479:4:5",
+                    "src": "19479:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72774,26 +72774,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2869,
+                  "id": 4311,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2894,
-                  "src": "19502:20:5",
+                  "scope": 4336,
+                  "src": "19502:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$736",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
                     "typeString": "enum Market.RequestStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2868,
+                    "id": 4310,
                     "name": "RequestStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 736,
-                    "src": "19502:13:5",
+                    "referencedDeclaration": 2178,
+                    "src": "19502:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_RequestStatus_$736",
+                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
                       "typeString": "enum Market.RequestStatus"
                     }
                   },
@@ -72801,43 +72801,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19397:131:5"
+              "src": "19397:131:7"
             },
-            "scope": 3787,
-            "src": "19321:457:5",
+            "scope": 5229,
+            "src": "19321:457:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2901,
+              "id": 4343,
               "nodeType": "Block",
-              "src": "19836:34:5",
+              "src": "19836:34:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2899,
+                    "id": 4341,
                     "name": "dealAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 885,
-                    "src": "19853:10:5",
+                    "referencedDeclaration": 2327,
+                    "src": "19853:10:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2898,
-                  "id": 2900,
+                  "functionReturnParameters": 4340,
+                  "id": 4342,
                   "nodeType": "Return",
-                  "src": "19846:17:5"
+                  "src": "19846:17:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2902,
+            "id": 4344,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72845,23 +72845,23 @@
             "name": "GetDealsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2895,
+              "id": 4337,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19807:2:5"
+              "src": "19807:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2898,
+              "id": 4340,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2897,
+                  "id": 4339,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2902,
-                  "src": "19831:4:5",
+                  "scope": 4344,
+                  "src": "19831:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72869,10 +72869,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2896,
+                    "id": 4338,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19831:4:5",
+                    "src": "19831:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72882,43 +72882,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19830:6:5"
+              "src": "19830:6:7"
             },
-            "scope": 3787,
-            "src": "19784:86:5",
+            "scope": 5229,
+            "src": "19784:86:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2909,
+              "id": 4351,
               "nodeType": "Block",
-              "src": "19929:36:5",
+              "src": "19929:36:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2907,
+                    "id": 4349,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 882,
-                    "src": "19946:12:5",
+                    "referencedDeclaration": 2324,
+                    "src": "19946:12:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2906,
-                  "id": 2908,
+                  "functionReturnParameters": 4348,
+                  "id": 4350,
                   "nodeType": "Return",
-                  "src": "19939:19:5"
+                  "src": "19939:19:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2910,
+            "id": 4352,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72926,23 +72926,23 @@
             "name": "GetOrdersAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2903,
+              "id": 4345,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19900:2:5"
+              "src": "19900:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2906,
+              "id": 4348,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2905,
+                  "id": 4347,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2910,
-                  "src": "19924:4:5",
+                  "scope": 4352,
+                  "src": "19924:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72950,10 +72950,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2904,
+                    "id": 4346,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19924:4:5",
+                    "src": "19924:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72963,43 +72963,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19923:6:5"
+              "src": "19923:6:7"
             },
-            "scope": 3787,
-            "src": "19876:89:5",
+            "scope": 5229,
+            "src": "19876:89:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2917,
+              "id": 4359,
               "nodeType": "Block",
-              "src": "20032:38:5",
+              "src": "20032:38:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2915,
+                    "id": 4357,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 888,
-                    "src": "20049:14:5",
+                    "referencedDeclaration": 2330,
+                    "src": "20049:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2914,
-                  "id": 2916,
+                  "functionReturnParameters": 4356,
+                  "id": 4358,
                   "nodeType": "Return",
-                  "src": "20042:21:5"
+                  "src": "20042:21:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2918,
+            "id": 4360,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73007,23 +73007,23 @@
             "name": "GetChangeRequestsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2911,
+              "id": 4353,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20003:2:5"
+              "src": "20003:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2914,
+              "id": 4356,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2913,
+                  "id": 4355,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2918,
-                  "src": "20027:4:5",
+                  "scope": 4360,
+                  "src": "20027:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73031,10 +73031,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2912,
+                    "id": 4354,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20027:4:5",
+                    "src": "20027:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73044,43 +73044,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20026:6:5"
+              "src": "20026:6:7"
             },
-            "scope": 3787,
-            "src": "19971:99:5",
+            "scope": 5229,
+            "src": "19971:99:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2925,
+              "id": 4367,
               "nodeType": "Block",
-              "src": "20136:42:5",
+              "src": "20136:42:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2923,
+                    "id": 4365,
                     "name": "benchmarksQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 890,
-                    "src": "20153:18:5",
+                    "referencedDeclaration": 2332,
+                    "src": "20153:18:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2922,
-                  "id": 2924,
+                  "functionReturnParameters": 4364,
+                  "id": 4366,
                   "nodeType": "Return",
-                  "src": "20146:25:5"
+                  "src": "20146:25:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2926,
+            "id": 4368,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73088,23 +73088,23 @@
             "name": "GetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2919,
+              "id": 4361,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20106:2:5"
+              "src": "20106:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2922,
+              "id": 4364,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2921,
+                  "id": 4363,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2926,
-                  "src": "20130:4:5",
+                  "scope": 4368,
+                  "src": "20130:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73112,10 +73112,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2920,
+                    "id": 4362,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20130:4:5",
+                    "src": "20130:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73125,43 +73125,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20129:6:5"
+              "src": "20129:6:7"
             },
-            "scope": 3787,
-            "src": "20076:102:5",
+            "scope": 5229,
+            "src": "20076:102:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2933,
+              "id": 4375,
               "nodeType": "Block",
-              "src": "20242:40:5",
+              "src": "20242:40:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2931,
+                    "id": 4373,
                     "name": "netflagsQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 892,
-                    "src": "20259:16:5",
+                    "referencedDeclaration": 2334,
+                    "src": "20259:16:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2930,
-                  "id": 2932,
+                  "functionReturnParameters": 4372,
+                  "id": 4374,
                   "nodeType": "Return",
-                  "src": "20252:23:5"
+                  "src": "20252:23:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 2934,
+            "id": 4376,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73169,23 +73169,23 @@
             "name": "GetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2927,
+              "id": 4369,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20212:2:5"
+              "src": "20212:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2930,
+              "id": 4372,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2929,
+                  "id": 4371,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2934,
-                  "src": "20236:4:5",
+                  "scope": 4376,
+                  "src": "20236:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73193,10 +73193,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2928,
+                    "id": 4370,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20236:4:5",
+                    "src": "20236:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73206,19 +73206,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20235:6:5"
+              "src": "20235:6:7"
             },
-            "scope": 3787,
-            "src": "20184:98:5",
+            "scope": 5229,
+            "src": "20184:98:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3199,
+              "id": 4641,
               "nodeType": "Block",
-              "src": "20364:1917:5",
+              "src": "20364:1917:7",
               "statements": [
                 {
                   "expression": {
@@ -73227,10 +73227,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$722",
+                          "typeIdentifier": "t_enum$_DealStatus_$2164",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 2948,
+                        "id": 4390,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73241,26 +73241,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2942,
+                              "id": 4384,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "20382:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "20382:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 2944,
+                            "id": 4386,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2943,
+                              "id": 4385,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "20388:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "20388:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -73271,23 +73271,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "20382:13:5",
+                            "src": "20382:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 2945,
+                          "id": 4387,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 763,
-                          "src": "20382:20:5",
+                          "referencedDeclaration": 2205,
+                          "src": "20382:20:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -73297,18 +73297,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2946,
+                            "id": 4388,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 722,
-                            "src": "20406:10:5",
+                            "referencedDeclaration": 2164,
+                            "src": "20406:10:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 2947,
+                          "id": 4389,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -73316,13 +73316,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "20406:26:5",
+                          "src": "20406:26:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "20382:50:5",
+                        "src": "20382:50:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73336,21 +73336,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2941,
+                      "id": 4383,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "20374:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "20374:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2949,
+                    "id": 4391,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -73358,15 +73358,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20374:59:5",
+                    "src": "20374:59:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2950,
+                  "id": 4392,
                   "nodeType": "ExpressionStatement",
-                  "src": "20374:59:5"
+                  "src": "20374:59:7"
                 },
                 {
                   "expression": {
@@ -73378,7 +73378,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2974,
+                        "id": 4416,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73389,7 +73389,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2966,
+                          "id": 4408,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -73400,7 +73400,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2958,
+                            "id": 4400,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73409,18 +73409,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2952,
+                                "id": 4394,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "20451:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "20451:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2953,
+                              "id": 4395,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -73428,7 +73428,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20451:10:5",
+                              "src": "20451:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -73442,26 +73442,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2954,
+                                  "id": 4396,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "20465:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "20465:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2956,
+                                "id": 4398,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2955,
+                                  "id": 4397,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2936,
-                                  "src": "20471:6:5",
+                                  "referencedDeclaration": 4378,
+                                  "src": "20471:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -73472,27 +73472,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20465:13:5",
+                                "src": "20465:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2957,
+                              "id": 4399,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "20465:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "20465:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20451:38:5",
+                            "src": "20451:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -73506,7 +73506,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 2965,
+                            "id": 4407,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73515,18 +73515,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2959,
+                                "id": 4401,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "20493:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "20493:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2960,
+                              "id": 4402,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -73534,7 +73534,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20493:10:5",
+                              "src": "20493:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -73548,26 +73548,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2961,
+                                  "id": 4403,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "20507:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "20507:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 2963,
+                                "id": 4405,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2962,
+                                  "id": 4404,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2936,
-                                  "src": "20513:6:5",
+                                  "referencedDeclaration": 4378,
+                                  "src": "20513:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -73578,33 +73578,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20507:13:5",
+                                "src": "20507:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 2964,
+                              "id": 4406,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "20507:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "20507:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20493:38:5",
+                            "src": "20493:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "20451:80:5",
+                          "src": "20451:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -73618,7 +73618,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 2973,
+                          "id": 4415,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -73627,18 +73627,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2967,
+                              "id": 4409,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "20535:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "20535:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2968,
+                            "id": 4410,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73646,7 +73646,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20535:10:5",
+                            "src": "20535:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -73660,26 +73660,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2969,
+                                "id": 4411,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "20549:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "20549:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 2971,
+                              "id": 4413,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2970,
+                                "id": 4412,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2936,
-                                "src": "20555:6:5",
+                                "referencedDeclaration": 4378,
+                                "src": "20555:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -73690,33 +73690,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "20549:13:5",
+                              "src": "20549:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 2972,
+                            "id": 4414,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "20549:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "20549:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "20535:36:5",
+                          "src": "20535:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20451:120:5",
+                        "src": "20451:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73730,21 +73730,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2951,
+                      "id": 4393,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "20443:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "20443:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2975,
+                    "id": 4417,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -73752,43 +73752,43 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20443:129:5",
+                    "src": "20443:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2976,
+                  "id": 4418,
                   "nodeType": "ExpressionStatement",
-                  "src": "20443:129:5"
+                  "src": "20443:129:7"
                 },
                 {
                   "assignments": [
-                    2978
+                    4420
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2978,
+                      "id": 4420,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3200,
-                      "src": "20582:16:5",
+                      "scope": 4642,
+                      "src": "20582:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2977,
+                        "id": 4419,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 770,
-                        "src": "20582:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "20582:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -73796,31 +73796,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2982,
+                  "id": 4424,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2979,
+                      "id": 4421,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 900,
-                      "src": "20601:5:5",
+                      "referencedDeclaration": 2342,
+                      "src": "20601:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 2981,
+                    "id": 4423,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2980,
+                      "id": 4422,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2936,
-                      "src": "20607:6:5",
+                      "referencedDeclaration": 4378,
+                      "src": "20607:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -73831,25 +73831,25 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "20601:13:5",
+                    "src": "20601:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20582:32:5"
+                  "src": "20582:32:7"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2984,
+                      "id": 4426,
                       "name": "paidAmount",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3200,
-                      "src": "20625:15:5",
+                      "scope": 4642,
+                      "src": "20625:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -73857,10 +73857,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2983,
+                        "id": 4425,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "20625:4:5",
+                        "src": "20625:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -73870,10 +73870,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2985,
+                  "id": 4427,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20625:15:5"
+                  "src": "20625:15:7"
                 },
                 {
                   "condition": {
@@ -73882,14 +73882,14 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 2995,
+                    "id": 4437,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2989,
+                      "id": 4431,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -73897,18 +73897,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "!",
                       "prefix": true,
-                      "src": "20655:15:5",
+                      "src": "20655:15:7",
                       "subExpression": {
                         "argumentTypes": null,
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 2987,
+                            "id": 4429,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2936,
-                            "src": "20663:6:5",
+                            "referencedDeclaration": 4378,
+                            "src": "20663:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -73922,18 +73922,18 @@
                               "typeString": "uint256"
                             }
                           ],
-                          "id": 2986,
+                          "id": 4428,
                           "name": "IsSpot",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3401,
-                          "src": "20656:6:5",
+                          "referencedDeclaration": 4843,
+                          "src": "20656:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (uint256) view returns (bool)"
                           }
                         },
-                        "id": 2988,
+                        "id": 4430,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73941,7 +73941,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "20656:14:5",
+                        "src": "20656:14:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73960,7 +73960,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 2994,
+                      "id": 4436,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -73969,26 +73969,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2990,
+                          "id": 4432,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2978,
-                          "src": "20674:4:5",
+                          "referencedDeclaration": 4420,
+                          "src": "20674:4:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 2991,
+                        "id": 4433,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 769,
-                        "src": "20674:15:5",
+                        "referencedDeclaration": 2211,
+                        "src": "20674:15:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -74000,38 +74000,38 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2992,
+                          "id": 4434,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2978,
-                          "src": "20693:4:5",
+                          "referencedDeclaration": 4420,
+                          "src": "20693:4:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 2993,
+                        "id": 4435,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 761,
-                        "src": "20693:12:5",
+                        "referencedDeclaration": 2203,
+                        "src": "20693:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "20674:31:5",
+                      "src": "20674:31:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "20655:50:5",
+                    "src": "20655:50:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -74044,7 +74044,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 3014,
+                      "id": 4456,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -74055,14 +74055,14 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3008,
+                        "id": 4450,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3002,
+                          "id": 4444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74070,18 +74070,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "20811:15:5",
+                          "src": "20811:15:7",
                           "subExpression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3000,
+                                "id": 4442,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2936,
-                                "src": "20819:6:5",
+                                "referencedDeclaration": 4378,
+                                "src": "20819:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -74095,18 +74095,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 2999,
+                              "id": 4441,
                               "name": "IsSpot",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3401,
-                              "src": "20812:6:5",
+                              "referencedDeclaration": 4843,
+                              "src": "20812:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                                 "typeString": "function (uint256) view returns (bool)"
                               }
                             },
-                            "id": 3001,
+                            "id": 4443,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74114,7 +74114,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "20812:14:5",
+                            "src": "20812:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -74133,7 +74133,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3007,
+                          "id": 4449,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74142,18 +74142,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3003,
+                              "id": 4445,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "20830:5:5",
+                              "referencedDeclaration": 11305,
+                              "src": "20830:5:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 3004,
+                            "id": 4446,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74161,7 +74161,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20830:15:5",
+                            "src": "20830:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -74173,38 +74173,38 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3005,
+                              "id": 4447,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2978,
-                              "src": "20848:4:5",
+                              "referencedDeclaration": 4420,
+                              "src": "20848:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3006,
+                            "id": 4448,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 761,
-                            "src": "20848:12:5",
+                            "referencedDeclaration": 2203,
+                            "src": "20848:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "20830:30:5",
+                          "src": "20830:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20811:49:5",
+                        "src": "20811:49:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -74218,7 +74218,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3013,
+                        "id": 4455,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -74227,26 +74227,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3009,
+                            "id": 4451,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2978,
-                            "src": "20864:4:5",
+                            "referencedDeclaration": 4420,
+                            "src": "20864:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3010,
+                          "id": 4452,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lastBillTS",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 769,
-                          "src": "20864:15:5",
+                          "referencedDeclaration": 2211,
+                          "src": "20864:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -74258,64 +74258,64 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3011,
+                            "id": 4453,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2978,
-                            "src": "20882:4:5",
+                            "referencedDeclaration": 4420,
+                            "src": "20882:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3012,
+                          "id": 4454,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "endTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 761,
-                          "src": "20882:12:5",
+                          "referencedDeclaration": 2203,
+                          "src": "20882:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "20864:30:5",
+                        "src": "20864:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "20811:83:5",
+                      "src": "20811:83:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": {
-                      "id": 3042,
+                      "id": 4484,
                       "nodeType": "Block",
-                      "src": "21003:104:5",
+                      "src": "21003:104:7",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3040,
+                            "id": 4482,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 3029,
+                              "id": 4471,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2984,
-                              "src": "21017:10:5",
+                              "referencedDeclaration": 4426,
+                              "src": "21017:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -74330,26 +74330,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3031,
+                                    "id": 4473,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2978,
-                                    "src": "21047:4:5",
+                                    "referencedDeclaration": 4420,
+                                    "src": "21047:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3032,
+                                  "id": 4474,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "21047:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "21047:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74362,26 +74362,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3036,
+                                        "id": 4478,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "21079:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "21079:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3037,
+                                      "id": 4479,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 769,
-                                      "src": "21079:15:5",
+                                      "referencedDeclaration": 2211,
+                                      "src": "21079:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -74399,18 +74399,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3033,
+                                        "id": 4475,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7759,
-                                        "src": "21059:5:5",
+                                        "referencedDeclaration": 11305,
+                                        "src": "21059:5:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 3034,
+                                      "id": 4476,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -74418,27 +74418,27 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "21059:15:5",
+                                      "src": "21059:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3035,
+                                    "id": 4477,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "21059:19:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "21059:19:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3038,
+                                  "id": 4480,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -74446,7 +74446,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21059:36:5",
+                                  "src": "21059:36:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74464,18 +74464,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3030,
+                                "id": 4472,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "21030:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "21030:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3039,
+                              "id": 4481,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -74483,48 +74483,48 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "21030:66:5",
+                              "src": "21030:66:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "21017:79:5",
+                            "src": "21017:79:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3041,
+                          "id": 4483,
                           "nodeType": "ExpressionStatement",
-                          "src": "21017:79:5"
+                          "src": "21017:79:7"
                         }
                       ]
                     },
-                    "id": 3043,
+                    "id": 4485,
                     "nodeType": "IfStatement",
-                    "src": "20807:300:5",
+                    "src": "20807:300:7",
                     "trueBody": {
-                      "id": 3028,
+                      "id": 4470,
                       "nodeType": "Block",
-                      "src": "20896:101:5",
+                      "src": "20896:101:7",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3026,
+                            "id": 4468,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 3015,
+                              "id": 4457,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2984,
-                              "src": "20910:10:5",
+                              "referencedDeclaration": 4426,
+                              "src": "20910:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -74539,26 +74539,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3017,
+                                    "id": 4459,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2978,
-                                    "src": "20940:4:5",
+                                    "referencedDeclaration": 4420,
+                                    "src": "20940:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3018,
+                                  "id": 4460,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "20940:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "20940:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74571,26 +74571,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3022,
+                                        "id": 4464,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "20969:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "20969:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3023,
+                                      "id": 4465,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 769,
-                                      "src": "20969:15:5",
+                                      "referencedDeclaration": 2211,
+                                      "src": "20969:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -74608,46 +74608,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3019,
+                                        "id": 4461,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "20952:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "20952:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3020,
+                                      "id": 4462,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 761,
-                                      "src": "20952:12:5",
+                                      "referencedDeclaration": 2203,
+                                      "src": "20952:12:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3021,
+                                    "id": 4463,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "20952:16:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "20952:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3024,
+                                  "id": 4466,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -74655,7 +74655,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "20952:33:5",
+                                  "src": "20952:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74673,18 +74673,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3016,
+                                "id": 4458,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "20923:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "20923:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3025,
+                              "id": 4467,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -74692,45 +74692,45 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "20923:63:5",
+                              "src": "20923:63:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "20910:76:5",
+                            "src": "20910:76:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3027,
+                          "id": 4469,
                           "nodeType": "ExpressionStatement",
-                          "src": "20910:76:5"
+                          "src": "20910:76:7"
                         }
                       ]
                     }
                   },
-                  "id": 3044,
+                  "id": 4486,
                   "nodeType": "IfStatement",
-                  "src": "20651:456:5",
+                  "src": "20651:456:7",
                   "trueBody": {
-                    "id": 2998,
+                    "id": 4440,
                     "nodeType": "Block",
-                    "src": "20707:94:5",
+                    "src": "20707:94:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 2996,
+                          "id": 4438,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "20786:4:5",
+                          "src": "20786:4:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -74738,10 +74738,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 2940,
-                        "id": 2997,
+                        "functionReturnParameters": 4382,
+                        "id": 4439,
                         "nodeType": "Return",
-                        "src": "20779:11:5"
+                        "src": "20779:11:7"
                       }
                     ]
                   }
@@ -74753,19 +74753,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3048,
+                    "id": 4490,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3045,
+                      "id": 4487,
                       "name": "paidAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2984,
-                      "src": "21121:10:5",
+                      "referencedDeclaration": 4426,
+                      "src": "21121:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -74777,45 +74777,45 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3046,
+                        "id": 4488,
                         "name": "deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2978,
-                        "src": "21134:4:5",
+                        "referencedDeclaration": 4420,
+                        "src": "21134:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                           "typeString": "struct Market.Deal memory"
                         }
                       },
-                      "id": 3047,
+                      "id": 4489,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "21134:19:5",
+                      "referencedDeclaration": 2207,
+                      "src": "21134:19:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "21121:32:5",
+                    "src": "21121:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3148,
+                  "id": 4590,
                   "nodeType": "IfStatement",
-                  "src": "21117:820:5",
+                  "src": "21117:820:7",
                   "trueBody": {
-                    "id": 3147,
+                    "id": 4589,
                     "nodeType": "Block",
-                    "src": "21155:782:5",
+                    "src": "21155:782:7",
                     "statements": [
                       {
                         "condition": {
@@ -74824,7 +74824,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3059,
+                          "id": 4501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74836,26 +74836,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3051,
+                                  "id": 4493,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2978,
-                                  "src": "21189:4:5",
+                                  "referencedDeclaration": 4420,
+                                  "src": "21189:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3052,
+                                "id": 4494,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "21189:15:5",
+                                "referencedDeclaration": 2189,
+                                "src": "21189:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -74871,32 +74871,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3049,
+                                "id": 4491,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 873,
-                                "src": "21173:5:5",
+                                "referencedDeclaration": 2315,
+                                "src": "21173:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 3050,
+                              "id": 4492,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "21173:15:5",
+                              "referencedDeclaration": 10977,
+                              "src": "21173:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 3053,
+                            "id": 4495,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74904,7 +74904,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21173:32:5",
+                            "src": "21173:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -74919,26 +74919,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3056,
+                                  "id": 4498,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2978,
-                                  "src": "21224:4:5",
+                                  "referencedDeclaration": 4420,
+                                  "src": "21224:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3057,
+                                "id": 4499,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "blockedBalance",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 765,
-                                "src": "21224:19:5",
+                                "referencedDeclaration": 2207,
+                                "src": "21224:19:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -74954,32 +74954,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3054,
+                                "id": 4496,
                                 "name": "paidAmount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2984,
-                                "src": "21209:10:5",
+                                "referencedDeclaration": 4426,
+                                "src": "21209:10:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3055,
+                              "id": 4497,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "21209:14:5",
+                              "referencedDeclaration": 10771,
+                              "src": "21209:14:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3058,
+                            "id": 4500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74987,22 +74987,22 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21209:35:5",
+                            "src": "21209:35:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "21173:71:5",
+                          "src": "21173:71:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3145,
+                          "id": 4587,
                           "nodeType": "Block",
-                          "src": "21490:437:5",
+                          "src": "21490:437:7",
                           "statements": [
                             {
                               "eventCall": {
@@ -75010,12 +75010,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3093,
+                                    "id": 4535,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2936,
-                                    "src": "21520:6:5",
+                                    "referencedDeclaration": 4378,
+                                    "src": "21520:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75027,26 +75027,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3094,
+                                        "id": 4536,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "21528:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "21528:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3096,
+                                      "id": 4538,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3095,
+                                        "id": 4537,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2936,
-                                        "src": "21534:6:5",
+                                        "referencedDeclaration": 4378,
+                                        "src": "21534:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75057,21 +75057,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "21528:13:5",
+                                      "src": "21528:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3097,
+                                    "id": 4539,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 765,
-                                    "src": "21528:28:5",
+                                    "referencedDeclaration": 2207,
+                                    "src": "21528:28:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75089,18 +75089,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3092,
+                                  "id": 4534,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 832,
-                                  "src": "21513:6:5",
+                                  "referencedDeclaration": 2274,
+                                  "src": "21513:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 3098,
+                                "id": 4540,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75108,15 +75108,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21513:44:5",
+                                "src": "21513:44:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3099,
+                              "id": 4541,
                               "nodeType": "EmitStatement",
-                              "src": "21508:49:5"
+                              "src": "21508:49:7"
                             },
                             {
                               "expression": {
@@ -75124,12 +75124,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3101,
+                                    "id": 4543,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2936,
-                                    "src": "21593:6:5",
+                                    "referencedDeclaration": 4378,
+                                    "src": "21593:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75143,18 +75143,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3100,
+                                  "id": 4542,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3562,
-                                  "src": "21575:17:5",
+                                  "referencedDeclaration": 5004,
+                                  "src": "21575:17:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3102,
+                                "id": 4544,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75162,15 +75162,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21575:25:5",
+                                "src": "21575:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3103,
+                              "id": 4545,
                               "nodeType": "ExpressionStatement",
-                              "src": "21575:25:5"
+                              "src": "21575:25:7"
                             },
                             {
                               "expression": {
@@ -75183,26 +75183,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3107,
+                                          "id": 4549,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21641:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21641:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3108,
+                                        "id": 4550,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "masterID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 749,
-                                        "src": "21641:13:5",
+                                        "referencedDeclaration": 2191,
+                                        "src": "21641:13:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -75212,26 +75212,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3109,
+                                          "id": 4551,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21656:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21656:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3110,
+                                        "id": 4552,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "blockedBalance",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 765,
-                                        "src": "21656:19:5",
+                                        "referencedDeclaration": 2207,
+                                        "src": "21656:19:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75251,32 +75251,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3105,
+                                        "id": 4547,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "21626:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "21626:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3106,
+                                      "id": 4548,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transfer",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7419,
-                                      "src": "21626:14:5",
+                                      "referencedDeclaration": 10965,
+                                      "src": "21626:14:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3111,
+                                    "id": 4553,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -75284,7 +75284,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21626:50:5",
+                                    "src": "21626:50:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -75298,21 +75298,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3104,
+                                  "id": 4546,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "21618:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "21618:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3112,
+                                "id": 4554,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75320,20 +75320,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21618:59:5",
+                                "src": "21618:59:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3113,
+                              "id": 4555,
                               "nodeType": "ExpressionStatement",
-                              "src": "21618:59:5"
+                              "src": "21618:59:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3120,
+                                "id": 4562,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75344,26 +75344,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3114,
+                                      "id": 4556,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21695:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21695:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3116,
+                                    "id": 4558,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3115,
+                                      "id": 4557,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21701:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21701:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75374,21 +75374,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21695:13:5",
+                                    "src": "21695:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3117,
+                                  "id": 4559,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "lastBillTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 769,
-                                  "src": "21695:24:5",
+                                  "referencedDeclaration": 2211,
+                                  "src": "21695:24:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75400,18 +75400,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3118,
+                                    "id": 4560,
                                     "name": "block",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7759,
-                                    "src": "21722:5:5",
+                                    "referencedDeclaration": 11305,
+                                    "src": "21722:5:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_block",
                                       "typeString": "block"
                                     }
                                   },
-                                  "id": 3119,
+                                  "id": 4561,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -75419,26 +75419,26 @@
                                   "memberName": "timestamp",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "21722:15:5",
+                                  "src": "21722:15:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21695:42:5",
+                                "src": "21695:42:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3121,
+                              "id": 4563,
                               "nodeType": "ExpressionStatement",
-                              "src": "21695:42:5"
+                              "src": "21695:42:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3134,
+                                "id": 4576,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75449,26 +75449,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3122,
+                                      "id": 4564,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21755:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21755:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3124,
+                                    "id": 4566,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3123,
+                                      "id": 4565,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21761:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21761:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75479,21 +75479,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21755:13:5",
+                                    "src": "21755:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3125,
+                                  "id": 4567,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "totalPayout",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 767,
-                                  "src": "21755:25:5",
+                                  "referencedDeclaration": 2209,
+                                  "src": "21755:25:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75508,26 +75508,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3131,
+                                        "id": 4573,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2978,
-                                        "src": "21813:4:5",
+                                        "referencedDeclaration": 4420,
+                                        "src": "21813:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3132,
+                                      "id": 4574,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "21813:19:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "21813:19:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75547,26 +75547,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3126,
+                                          "id": 4568,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "21783:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "21783:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3128,
+                                        "id": 4570,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3127,
+                                          "id": 4569,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2936,
-                                          "src": "21789:6:5",
+                                          "referencedDeclaration": 4378,
+                                          "src": "21789:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -75577,41 +75577,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21783:13:5",
+                                        "src": "21783:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3129,
+                                      "id": 4571,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "totalPayout",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 767,
-                                      "src": "21783:25:5",
+                                      "referencedDeclaration": 2209,
+                                      "src": "21783:25:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3130,
+                                    "id": 4572,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "21783:29:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "21783:29:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3133,
+                                  "id": 4575,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -75619,26 +75619,26 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21783:50:5",
+                                  "src": "21783:50:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21755:78:5",
+                                "src": "21755:78:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3135,
+                              "id": 4577,
                               "nodeType": "ExpressionStatement",
-                              "src": "21755:78:5"
+                              "src": "21755:78:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3141,
+                                "id": 4583,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75649,26 +75649,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3136,
+                                      "id": 4578,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21851:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21851:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3138,
+                                    "id": 4580,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3137,
+                                      "id": 4579,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21857:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21857:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75679,21 +75679,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21851:13:5",
+                                    "src": "21851:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3139,
+                                  "id": 4581,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "21851:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "21851:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75704,14 +75704,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3140,
+                                  "id": 4582,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "21882:1:5",
+                                  "src": "21882:1:7",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -75719,28 +75719,28 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "21851:32:5",
+                                "src": "21851:32:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3142,
+                              "id": 4584,
                               "nodeType": "ExpressionStatement",
-                              "src": "21851:32:5"
+                              "src": "21851:32:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3143,
+                                "id": 4585,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "21908:4:5",
+                                "src": "21908:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -75748,20 +75748,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 2940,
-                              "id": 3144,
+                              "functionReturnParameters": 4382,
+                              "id": 4586,
                               "nodeType": "Return",
-                              "src": "21901:11:5"
+                              "src": "21901:11:7"
                             }
                           ]
                         },
-                        "id": 3146,
+                        "id": 4588,
                         "nodeType": "IfStatement",
-                        "src": "21169:758:5",
+                        "src": "21169:758:7",
                         "trueBody": {
-                          "id": 3091,
+                          "id": 4533,
                           "nodeType": "Block",
-                          "src": "21246:238:5",
+                          "src": "21246:238:7",
                           "statements": [
                             {
                               "expression": {
@@ -75774,26 +75774,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3063,
+                                          "id": 4505,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2978,
-                                          "src": "21291:4:5",
+                                          "referencedDeclaration": 4420,
+                                          "src": "21291:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3064,
+                                        "id": 4506,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 747,
-                                        "src": "21291:15:5",
+                                        "referencedDeclaration": 2189,
+                                        "src": "21291:15:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -75801,14 +75801,14 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3065,
+                                        "id": 4507,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7814,
-                                        "src": "21308:4:5",
+                                        "referencedDeclaration": 11366,
+                                        "src": "21308:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         }
                                       },
@@ -75819,26 +75819,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 3068,
+                                              "id": 4510,
                                               "name": "deal",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 2978,
-                                              "src": "21329:4:5",
+                                              "referencedDeclaration": 4420,
+                                              "src": "21329:4:7",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                                 "typeString": "struct Market.Deal memory"
                                               }
                                             },
-                                            "id": 3069,
+                                            "id": 4511,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "blockedBalance",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 765,
-                                            "src": "21329:19:5",
+                                            "referencedDeclaration": 2207,
+                                            "src": "21329:19:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -75854,32 +75854,32 @@
                                           ],
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 3066,
+                                            "id": 4508,
                                             "name": "paidAmount",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2984,
-                                            "src": "21314:10:5",
+                                            "referencedDeclaration": 4426,
+                                            "src": "21314:10:7",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             }
                                           },
-                                          "id": 3067,
+                                          "id": 4509,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "sub",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 7225,
-                                          "src": "21314:14:5",
+                                          "referencedDeclaration": 10771,
+                                          "src": "21314:14:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                                           }
                                         },
-                                        "id": 3070,
+                                        "id": 4512,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -75887,7 +75887,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "21314:35:5",
+                                        "src": "21314:35:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75901,7 +75901,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -75911,32 +75911,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3061,
+                                        "id": 4503,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "21272:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "21272:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3062,
+                                      "id": 4504,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7607,
-                                      "src": "21272:18:5",
+                                      "referencedDeclaration": 11153,
+                                      "src": "21272:18:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3071,
+                                    "id": 4513,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -75944,7 +75944,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21272:78:5",
+                                    "src": "21272:78:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -75958,21 +75958,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3060,
+                                  "id": 4502,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "21264:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "21264:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3072,
+                                "id": 4514,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75980,20 +75980,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21264:87:5",
+                                "src": "21264:87:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3073,
+                              "id": 4515,
                               "nodeType": "ExpressionStatement",
-                              "src": "21264:87:5"
+                              "src": "21264:87:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3089,
+                                "id": 4531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -76004,26 +76004,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3074,
+                                      "id": 4516,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "21369:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "21369:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3076,
+                                    "id": 4518,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3075,
+                                      "id": 4517,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2936,
-                                      "src": "21375:6:5",
+                                      "referencedDeclaration": 4378,
+                                      "src": "21375:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -76034,21 +76034,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21369:13:5",
+                                    "src": "21369:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3077,
+                                  "id": 4519,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "21369:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "21369:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -76066,26 +76066,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 3085,
+                                            "id": 4527,
                                             "name": "deal",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2978,
-                                            "src": "21448:4:5",
+                                            "referencedDeclaration": 4420,
+                                            "src": "21448:4:7",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                               "typeString": "struct Market.Deal memory"
                                             }
                                           },
-                                          "id": 3086,
+                                          "id": 4528,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blockedBalance",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 765,
-                                          "src": "21448:19:5",
+                                          "referencedDeclaration": 2207,
+                                          "src": "21448:19:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -76101,32 +76101,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3083,
+                                          "id": 4525,
                                           "name": "paidAmount",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2984,
-                                          "src": "21433:10:5",
+                                          "referencedDeclaration": 4426,
+                                          "src": "21433:10:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
                                           }
                                         },
-                                        "id": 3084,
+                                        "id": 4526,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "sub",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 7225,
-                                        "src": "21433:14:5",
+                                        "referencedDeclaration": 10771,
+                                        "src": "21433:14:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                                         }
                                       },
-                                      "id": 3087,
+                                      "id": 4529,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -76134,7 +76134,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "21433:35:5",
+                                      "src": "21433:35:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -76154,26 +76154,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3078,
+                                          "id": 4520,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "21400:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "21400:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3080,
+                                        "id": 4522,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3079,
+                                          "id": 4521,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2936,
-                                          "src": "21406:6:5",
+                                          "referencedDeclaration": 4378,
+                                          "src": "21406:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -76184,41 +76184,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21400:13:5",
+                                        "src": "21400:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3081,
+                                      "id": 4523,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "21400:28:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "21400:28:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3082,
+                                    "id": 4524,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "21400:32:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "21400:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3088,
+                                  "id": 4530,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -76226,21 +76226,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21400:69:5",
+                                  "src": "21400:69:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21369:100:5",
+                                "src": "21369:100:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3090,
+                              "id": 4532,
                               "nodeType": "ExpressionStatement",
-                              "src": "21369:100:5"
+                              "src": "21369:100:7"
                             }
                           ]
                         }
@@ -76259,26 +76259,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3152,
+                              "id": 4594,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2978,
-                              "src": "21969:4:5",
+                              "referencedDeclaration": 4420,
+                              "src": "21969:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3153,
+                            "id": 4595,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "21969:13:5",
+                            "referencedDeclaration": 2191,
+                            "src": "21969:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -76286,12 +76286,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 3154,
+                            "id": 4596,
                             "name": "paidAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2984,
-                            "src": "21984:10:5",
+                            "referencedDeclaration": 4426,
+                            "src": "21984:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -76311,32 +76311,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3150,
+                            "id": 4592,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "21954:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "21954:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 3151,
+                          "id": 4593,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "21954:14:5",
+                          "referencedDeclaration": 10965,
+                          "src": "21954:14:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 3155,
+                        "id": 4597,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -76344,7 +76344,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "21954:41:5",
+                        "src": "21954:41:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -76358,21 +76358,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3149,
+                      "id": 4591,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "21946:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "21946:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3156,
+                    "id": 4598,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76380,20 +76380,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "21946:50:5",
+                    "src": "21946:50:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3157,
+                  "id": 4599,
                   "nodeType": "ExpressionStatement",
-                  "src": "21946:50:5"
+                  "src": "21946:50:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3169,
+                    "id": 4611,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76404,26 +76404,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3158,
+                          "id": 4600,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22006:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22006:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3160,
+                        "id": 4602,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3159,
+                          "id": 4601,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22012:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22012:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76434,21 +76434,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22006:13:5",
+                        "src": "22006:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3161,
+                      "id": 4603,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "22006:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "22006:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76461,12 +76461,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3167,
+                          "id": 4609,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2984,
-                          "src": "22070:10:5",
+                          "referencedDeclaration": 4426,
+                          "src": "22070:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76486,26 +76486,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3162,
+                              "id": 4604,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "22037:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "22037:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3164,
+                            "id": 4606,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3163,
+                              "id": 4605,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "22043:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "22043:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -76516,41 +76516,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22037:13:5",
+                            "src": "22037:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3165,
+                          "id": 4607,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "blockedBalance",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 765,
-                          "src": "22037:28:5",
+                          "referencedDeclaration": 2207,
+                          "src": "22037:28:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3166,
+                        "id": 4608,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "22037:32:5",
+                        "referencedDeclaration": 10771,
+                        "src": "22037:32:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3168,
+                      "id": 4610,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76558,26 +76558,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22037:44:5",
+                      "src": "22037:44:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22006:75:5",
+                    "src": "22006:75:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3170,
+                  "id": 4612,
                   "nodeType": "ExpressionStatement",
-                  "src": "22006:75:5"
+                  "src": "22006:75:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3182,
+                    "id": 4624,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76588,26 +76588,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3171,
+                          "id": 4613,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22091:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22091:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3173,
+                        "id": 4615,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3172,
+                          "id": 4614,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22097:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22097:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76618,21 +76618,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22091:13:5",
+                        "src": "22091:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3174,
+                      "id": 4616,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "totalPayout",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 767,
-                      "src": "22091:25:5",
+                      "referencedDeclaration": 2209,
+                      "src": "22091:25:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76645,12 +76645,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3180,
+                          "id": 4622,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2984,
-                          "src": "22149:10:5",
+                          "referencedDeclaration": 4426,
+                          "src": "22149:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76670,26 +76670,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3175,
+                              "id": 4617,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 900,
-                              "src": "22119:5:5",
+                              "referencedDeclaration": 2342,
+                              "src": "22119:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3177,
+                            "id": 4619,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3176,
+                              "id": 4618,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2936,
-                              "src": "22125:6:5",
+                              "referencedDeclaration": 4378,
+                              "src": "22125:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -76700,41 +76700,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22119:13:5",
+                            "src": "22119:13:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3178,
+                          "id": 4620,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "totalPayout",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 767,
-                          "src": "22119:25:5",
+                          "referencedDeclaration": 2209,
+                          "src": "22119:25:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3179,
+                        "id": 4621,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "22119:29:5",
+                        "referencedDeclaration": 10795,
+                        "src": "22119:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3181,
+                      "id": 4623,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76742,26 +76742,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22119:41:5",
+                      "src": "22119:41:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22091:69:5",
+                    "src": "22091:69:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3183,
+                  "id": 4625,
                   "nodeType": "ExpressionStatement",
-                  "src": "22091:69:5"
+                  "src": "22091:69:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3190,
+                    "id": 4632,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76772,26 +76772,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3184,
+                          "id": 4626,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "22170:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "22170:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3186,
+                        "id": 4628,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3185,
+                          "id": 4627,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2936,
-                          "src": "22176:6:5",
+                          "referencedDeclaration": 4378,
+                          "src": "22176:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76802,21 +76802,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22170:13:5",
+                        "src": "22170:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3187,
+                      "id": 4629,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lastBillTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 769,
-                      "src": "22170:24:5",
+                      "referencedDeclaration": 2211,
+                      "src": "22170:24:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76828,18 +76828,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3188,
+                        "id": 4630,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "22197:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "22197:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3189,
+                      "id": 4631,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76847,21 +76847,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "22197:15:5",
+                      "src": "22197:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22170:42:5",
+                    "src": "22170:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3191,
+                  "id": 4633,
                   "nodeType": "ExpressionStatement",
-                  "src": "22170:42:5"
+                  "src": "22170:42:7"
                 },
                 {
                   "eventCall": {
@@ -76869,12 +76869,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3193,
+                        "id": 4635,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2936,
-                        "src": "22234:6:5",
+                        "referencedDeclaration": 4378,
+                        "src": "22234:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -76882,12 +76882,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3194,
+                        "id": 4636,
                         "name": "paidAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2984,
-                        "src": "22242:10:5",
+                        "referencedDeclaration": 4426,
+                        "src": "22242:10:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -76905,18 +76905,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3192,
+                      "id": 4634,
                       "name": "Billed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 832,
-                      "src": "22227:6:5",
+                      "referencedDeclaration": 2274,
+                      "src": "22227:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 3195,
+                    "id": 4637,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76924,28 +76924,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22227:26:5",
+                    "src": "22227:26:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3196,
+                  "id": 4638,
                   "nodeType": "EmitStatement",
-                  "src": "22222:31:5"
+                  "src": "22222:31:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3197,
+                    "id": 4639,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "22270:4:5",
+                    "src": "22270:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -76953,15 +76953,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2940,
-                  "id": 3198,
+                  "functionReturnParameters": 4382,
+                  "id": 4640,
                   "nodeType": "Return",
-                  "src": "22263:11:5"
+                  "src": "22263:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3200,
+            "id": 4642,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -76969,16 +76969,16 @@
             "name": "InternalBill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2937,
+              "id": 4379,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2936,
+                  "id": 4378,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3200,
-                  "src": "20328:11:5",
+                  "scope": 4642,
+                  "src": "20328:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -76986,10 +76986,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2935,
+                    "id": 4377,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20328:4:5",
+                    "src": "20328:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -76999,20 +76999,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20327:13:5"
+              "src": "20327:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2940,
+              "id": 4382,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2939,
+                  "id": 4381,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3200,
-                  "src": "20359:4:5",
+                  "scope": 4642,
+                  "src": "20359:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -77020,10 +77020,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2938,
+                    "id": 4380,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20359:4:5",
+                    "src": "20359:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -77033,30 +77033,30 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20358:6:5"
+              "src": "20358:6:7"
             },
-            "scope": 3787,
-            "src": "20306:1975:5",
+            "scope": 5229,
+            "src": "20306:1975:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3347,
+              "id": 4789,
               "nodeType": "Block",
-              "src": "22356:1314:5",
+              "src": "22356:1314:7",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3208,
+                      "id": 4650,
                       "name": "nextPeriod",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3348,
-                      "src": "22366:15:5",
+                      "scope": 4790,
+                      "src": "22366:15:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -77064,10 +77064,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3207,
+                        "id": 4649,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "22366:4:5",
+                        "src": "22366:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -77077,38 +77077,38 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3209,
+                  "id": 4651,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22366:15:5"
+                  "src": "22366:15:7"
                 },
                 {
                   "assignments": [
-                    3211
+                    4653
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3211,
+                      "id": 4653,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3348,
-                      "src": "22391:16:5",
+                      "scope": 4790,
+                      "src": "22391:16:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3210,
+                        "id": 4652,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 770,
-                        "src": "22391:4:5",
+                        "referencedDeclaration": 2212,
+                        "src": "22391:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -77116,31 +77116,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3215,
+                  "id": 4657,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 3212,
+                      "id": 4654,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 900,
-                      "src": "22410:5:5",
+                      "referencedDeclaration": 2342,
+                      "src": "22410:5:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 3214,
+                    "id": 4656,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 3213,
+                      "id": 4655,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3202,
-                      "src": "22416:6:5",
+                      "referencedDeclaration": 4644,
+                      "src": "22416:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77151,14 +77151,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "22410:13:5",
+                    "src": "22410:13:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22391:32:5"
+                  "src": "22391:32:7"
                 },
                 {
                   "condition": {
@@ -77166,12 +77166,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3217,
+                        "id": 4659,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3202,
-                        "src": "22445:6:5",
+                        "referencedDeclaration": 4644,
+                        "src": "22445:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -77185,18 +77185,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3216,
+                      "id": 4658,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3401,
-                      "src": "22438:6:5",
+                      "referencedDeclaration": 4843,
+                      "src": "22438:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 3218,
+                    "id": 4660,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -77204,16 +77204,16 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22438:14:5",
+                    "src": "22438:14:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 3266,
+                    "id": 4708,
                     "nodeType": "Block",
-                    "src": "22607:360:5",
+                    "src": "22607:360:7",
                     "statements": [
                       {
                         "condition": {
@@ -77222,7 +77222,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3237,
+                          "id": 4679,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77231,18 +77231,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3233,
+                              "id": 4675,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "22625:5:5",
+                              "referencedDeclaration": 11305,
+                              "src": "22625:5:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 3234,
+                            "id": 4676,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -77250,7 +77250,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22625:15:5",
+                            "src": "22625:15:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77262,58 +77262,58 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3235,
+                              "id": 4677,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3211,
-                              "src": "22643:4:5",
+                              "referencedDeclaration": 4653,
+                              "src": "22643:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3236,
+                            "id": 4678,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 761,
-                            "src": "22643:12:5",
+                            "referencedDeclaration": 2203,
+                            "src": "22643:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "22625:30:5",
+                          "src": "22625:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 3241,
+                        "id": 4683,
                         "nodeType": "IfStatement",
-                        "src": "22621:138:5",
+                        "src": "22621:138:7",
                         "trueBody": {
-                          "id": 3240,
+                          "id": 4682,
                           "nodeType": "Block",
-                          "src": "22657:102:5",
+                          "src": "22657:102:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3238,
+                                "id": 4680,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22740:4:5",
+                                "src": "22740:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -77321,10 +77321,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3239,
+                              "functionReturnParameters": 4648,
+                              "id": 4681,
                               "nodeType": "Return",
-                              "src": "22733:11:5"
+                              "src": "22733:11:7"
                             }
                           ]
                         }
@@ -77336,7 +77336,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3249,
+                          "id": 4691,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77348,18 +77348,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3245,
+                                  "id": 4687,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7759,
-                                  "src": "22793:5:5",
+                                  "referencedDeclaration": 11305,
+                                  "src": "22793:5:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 3246,
+                                "id": 4688,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -77367,7 +77367,7 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "22793:15:5",
+                                "src": "22793:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -77385,46 +77385,46 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3242,
+                                  "id": 4684,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3211,
-                                  "src": "22776:4:5",
+                                  "referencedDeclaration": 4653,
+                                  "src": "22776:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3243,
+                                "id": 4685,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "endTime",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 761,
-                                "src": "22776:12:5",
+                                "referencedDeclaration": 2203,
+                                "src": "22776:12:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3244,
+                              "id": 4686,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "22776:16:5",
+                              "referencedDeclaration": 10771,
+                              "src": "22776:16:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3247,
+                            "id": 4689,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -77432,7 +77432,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "22776:33:5",
+                            "src": "22776:33:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77443,14 +77443,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 3248,
+                            "id": 4690,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22812:6:5",
+                            "src": "22812:6:7",
                             "subdenomination": "days",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_86400_by_1",
@@ -77458,33 +77458,33 @@
                             },
                             "value": "1"
                           },
-                          "src": "22776:42:5",
+                          "src": "22776:42:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3264,
+                          "id": 4706,
                           "nodeType": "Block",
-                          "src": "22905:52:5",
+                          "src": "22905:52:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3262,
+                                "id": 4704,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3260,
+                                  "id": 4702,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "22923:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "22923:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -77495,14 +77495,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3261,
+                                  "id": 4703,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "22936:6:5",
+                                  "src": "22936:6:7",
                                   "subdenomination": "days",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_86400_by_1",
@@ -77510,42 +77510,42 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "22923:19:5",
+                                "src": "22923:19:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3263,
+                              "id": 4705,
                               "nodeType": "ExpressionStatement",
-                              "src": "22923:19:5"
+                              "src": "22923:19:7"
                             }
                           ]
                         },
-                        "id": 3265,
+                        "id": 4707,
                         "nodeType": "IfStatement",
-                        "src": "22772:185:5",
+                        "src": "22772:185:7",
                         "trueBody": {
-                          "id": 3259,
+                          "id": 4701,
                           "nodeType": "Block",
-                          "src": "22820:79:5",
+                          "src": "22820:79:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3257,
+                                "id": 4699,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3250,
+                                  "id": 4692,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "22838:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "22838:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -77560,18 +77560,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3254,
+                                        "id": 4696,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7759,
-                                        "src": "22868:5:5",
+                                        "referencedDeclaration": 11305,
+                                        "src": "22868:5:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 3255,
+                                      "id": 4697,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -77579,7 +77579,7 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "22868:15:5",
+                                      "src": "22868:15:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -77597,46 +77597,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3251,
+                                        "id": 4693,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3211,
-                                        "src": "22851:4:5",
+                                        "referencedDeclaration": 4653,
+                                        "src": "22851:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 3252,
+                                      "id": 4694,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 761,
-                                      "src": "22851:12:5",
+                                      "referencedDeclaration": 2203,
+                                      "src": "22851:12:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3253,
+                                    "id": 4695,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7225,
-                                    "src": "22851:16:5",
+                                    "referencedDeclaration": 10771,
+                                    "src": "22851:16:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3256,
+                                  "id": 4698,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -77644,43 +77644,43 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "22851:33:5",
+                                  "src": "22851:33:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "22838:46:5",
+                                "src": "22838:46:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3258,
+                              "id": 4700,
                               "nodeType": "ExpressionStatement",
-                              "src": "22838:46:5"
+                              "src": "22838:46:7"
                             }
                           ]
                         }
                       }
                     ]
                   },
-                  "id": 3267,
+                  "id": 4709,
                   "nodeType": "IfStatement",
-                  "src": "22434:533:5",
+                  "src": "22434:533:7",
                   "trueBody": {
-                    "id": 3232,
+                    "id": 4674,
                     "nodeType": "Block",
-                    "src": "22454:147:5",
+                    "src": "22454:147:7",
                     "statements": [
                       {
                         "condition": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_DealStatus_$722",
+                            "typeIdentifier": "t_enum$_DealStatus_$2164",
                             "typeString": "enum Market.DealStatus"
                           },
-                          "id": 3223,
+                          "id": 4665,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77689,28 +77689,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3219,
+                              "id": 4661,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3211,
-                              "src": "22472:4:5",
+                              "referencedDeclaration": 4653,
+                              "src": "22472:4:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 3220,
+                            "id": 4662,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 763,
-                            "src": "22472:11:5",
+                            "referencedDeclaration": 2205,
+                            "src": "22472:11:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
@@ -77720,18 +77720,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3221,
+                              "id": 4663,
                               "name": "DealStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 722,
-                              "src": "22487:10:5",
+                              "referencedDeclaration": 2164,
+                              "src": "22487:10:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                 "typeString": "type(enum Market.DealStatus)"
                               }
                             },
-                            "id": 3222,
+                            "id": 4664,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -77739,39 +77739,39 @@
                             "memberName": "STATUS_CLOSED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22487:24:5",
+                            "src": "22487:24:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
-                          "src": "22472:39:5",
+                          "src": "22472:39:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 3227,
+                        "id": 4669,
                         "nodeType": "IfStatement",
-                        "src": "22468:89:5",
+                        "src": "22468:89:7",
                         "trueBody": {
-                          "id": 3226,
+                          "id": 4668,
                           "nodeType": "Block",
-                          "src": "22513:44:5",
+                          "src": "22513:44:7",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3224,
+                                "id": 4666,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22538:4:5",
+                                "src": "22538:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -77779,10 +77779,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3225,
+                              "functionReturnParameters": 4648,
+                              "id": 4667,
                               "nodeType": "Return",
-                              "src": "22531:11:5"
+                              "src": "22531:11:7"
                             }
                           ]
                         }
@@ -77790,19 +77790,19 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3230,
+                          "id": 4672,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3228,
+                            "id": 4670,
                             "name": "nextPeriod",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3208,
-                            "src": "22570:10:5",
+                            "referencedDeclaration": 4650,
+                            "src": "22570:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77813,14 +77813,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 3229,
+                            "id": 4671,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22583:7:5",
+                            "src": "22583:7:7",
                             "subdenomination": "hours",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_3600_by_1",
@@ -77828,15 +77828,15 @@
                             },
                             "value": "1"
                           },
-                          "src": "22570:20:5",
+                          "src": "22570:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3231,
+                        "id": 4673,
                         "nodeType": "ExpressionStatement",
-                        "src": "22570:20:5"
+                        "src": "22570:20:7"
                       }
                     ]
                   }
@@ -77848,7 +77848,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3277,
+                    "id": 4719,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -77860,26 +77860,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3269,
+                            "id": 4711,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3211,
-                            "src": "22998:4:5",
+                            "referencedDeclaration": 4653,
+                            "src": "22998:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 3270,
+                          "id": 4712,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 757,
-                          "src": "22998:10:5",
+                          "referencedDeclaration": 2199,
+                          "src": "22998:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77887,12 +77887,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3271,
+                          "id": 4713,
                           "name": "nextPeriod",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3208,
-                          "src": "23010:10:5",
+                          "referencedDeclaration": 4650,
+                          "src": "23010:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77910,18 +77910,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 3268,
+                        "id": 4710,
                         "name": "CalculatePayment",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3428,
-                        "src": "22981:16:5",
+                        "referencedDeclaration": 4870,
+                        "src": "22981:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                           "typeString": "function (uint256,uint256) view returns (uint256)"
                         }
                       },
-                      "id": 3272,
+                      "id": 4714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -77929,7 +77929,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22981:40:5",
+                      "src": "22981:40:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77943,26 +77943,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3273,
+                          "id": 4715,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "23024:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "23024:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3275,
+                        "id": 4717,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3274,
+                          "id": 4716,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3202,
-                          "src": "23030:6:5",
+                          "referencedDeclaration": 4644,
+                          "src": "23030:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77973,53 +77973,53 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23024:13:5",
+                        "src": "23024:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3276,
+                      "id": 4718,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "23024:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "23024:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22981:71:5",
+                    "src": "22981:71:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3344,
+                  "id": 4786,
                   "nodeType": "IfStatement",
-                  "src": "22977:666:5",
+                  "src": "22977:666:7",
                   "trueBody": {
-                    "id": 3343,
+                    "id": 4785,
                     "nodeType": "Block",
-                    "src": "23054:589:5",
+                    "src": "23054:589:7",
                     "statements": [
                       {
                         "assignments": [
-                          3279
+                          4721
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 3279,
+                            "id": 4721,
                             "name": "nextPeriodSum",
                             "nodeType": "VariableDeclaration",
-                            "scope": 3348,
-                            "src": "23068:18:5",
+                            "scope": 4790,
+                            "src": "23068:18:7",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -78027,10 +78027,10 @@
                               "typeString": "uint256"
                             },
                             "typeName": {
-                              "id": 3278,
+                              "id": 4720,
                               "name": "uint",
                               "nodeType": "ElementaryTypeName",
-                              "src": "23068:4:5",
+                              "src": "23068:4:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -78040,7 +78040,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 3291,
+                        "id": 4733,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -78050,26 +78050,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3286,
+                                  "id": 4728,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23134:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23134:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3288,
+                                "id": 4730,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3287,
+                                  "id": 4729,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3202,
-                                  "src": "23140:6:5",
+                                  "referencedDeclaration": 4644,
+                                  "src": "23140:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78080,21 +78080,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23134:13:5",
+                                "src": "23134:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3289,
+                              "id": 4731,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 765,
-                              "src": "23134:28:5",
+                              "referencedDeclaration": 2207,
+                              "src": "23134:28:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -78115,26 +78115,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3281,
+                                    "id": 4723,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3211,
-                                    "src": "23106:4:5",
+                                    "referencedDeclaration": 4653,
+                                    "src": "23106:4:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 3282,
+                                  "id": 4724,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 757,
-                                  "src": "23106:10:5",
+                                  "referencedDeclaration": 2199,
+                                  "src": "23106:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78142,12 +78142,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 3283,
+                                  "id": 4725,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3208,
-                                  "src": "23118:10:5",
+                                  "referencedDeclaration": 4650,
+                                  "src": "23118:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78165,18 +78165,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 3280,
+                                "id": 4722,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3428,
-                                "src": "23089:16:5",
+                                "referencedDeclaration": 4870,
+                                "src": "23089:16:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 3284,
+                              "id": 4726,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -78184,27 +78184,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "23089:40:5",
+                              "src": "23089:40:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 3285,
+                            "id": 4727,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "sub",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7225,
-                            "src": "23089:44:5",
+                            "referencedDeclaration": 10771,
+                            "src": "23089:44:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 3290,
+                          "id": 4732,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -78212,14 +78212,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23089:74:5",
+                          "src": "23089:74:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "23068:95:5"
+                        "src": "23068:95:7"
                       },
                       {
                         "condition": {
@@ -78228,7 +78228,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 3298,
+                          "id": 4740,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -78240,26 +78240,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3294,
+                                  "id": 4736,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3211,
-                                  "src": "23198:4:5",
+                                  "referencedDeclaration": 4653,
+                                  "src": "23198:4:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 3295,
+                                "id": 4737,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "23198:15:5",
+                                "referencedDeclaration": 2189,
+                                "src": "23198:15:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -78275,32 +78275,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3292,
+                                "id": 4734,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 873,
-                                "src": "23182:5:5",
+                                "referencedDeclaration": 2315,
+                                "src": "23182:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$5514",
+                                  "typeIdentifier": "t_contract$_SNM_$10080",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 3293,
+                              "id": 4735,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "23182:15:5",
+                              "referencedDeclaration": 10977,
+                              "src": "23182:15:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 3296,
+                            "id": 4738,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -78308,7 +78308,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "23182:32:5",
+                            "src": "23182:32:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -78318,27 +78318,27 @@
                           "operator": ">=",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 3297,
+                            "id": 4739,
                             "name": "nextPeriodSum",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3279,
-                            "src": "23218:13:5",
+                            "referencedDeclaration": 4721,
+                            "src": "23218:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "23182:49:5",
+                          "src": "23182:49:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3341,
+                          "id": 4783,
                           "nodeType": "Block",
-                          "src": "23433:200:5",
+                          "src": "23433:200:7",
                           "statements": [
                             {
                               "eventCall": {
@@ -78346,12 +78346,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3324,
+                                    "id": 4766,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23463:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23463:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78363,26 +78363,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3325,
+                                        "id": 4767,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 900,
-                                        "src": "23471:5:5",
+                                        "referencedDeclaration": 2342,
+                                        "src": "23471:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3327,
+                                      "id": 4769,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3326,
+                                        "id": 4768,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3202,
-                                        "src": "23477:6:5",
+                                        "referencedDeclaration": 4644,
+                                        "src": "23477:6:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -78393,21 +78393,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "23471:13:5",
+                                      "src": "23471:13:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3328,
+                                    "id": 4770,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 765,
-                                    "src": "23471:28:5",
+                                    "referencedDeclaration": 2207,
+                                    "src": "23471:28:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78425,18 +78425,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3323,
+                                  "id": 4765,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 832,
-                                  "src": "23456:6:5",
+                                  "referencedDeclaration": 2274,
+                                  "src": "23456:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 3329,
+                                "id": 4771,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78444,15 +78444,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23456:44:5",
+                                "src": "23456:44:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3330,
+                              "id": 4772,
                               "nodeType": "EmitStatement",
-                              "src": "23451:49:5"
+                              "src": "23451:49:7"
                             },
                             {
                               "expression": {
@@ -78460,12 +78460,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3332,
+                                    "id": 4774,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23536:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23536:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78479,18 +78479,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3331,
+                                  "id": 4773,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3562,
-                                  "src": "23518:17:5",
+                                  "referencedDeclaration": 5004,
+                                  "src": "23518:17:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3333,
+                                "id": 4775,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78498,15 +78498,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23518:25:5",
+                                "src": "23518:25:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3334,
+                              "id": 4776,
                               "nodeType": "ExpressionStatement",
-                              "src": "23518:25:5"
+                              "src": "23518:25:7"
                             },
                             {
                               "expression": {
@@ -78514,12 +78514,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3336,
+                                    "id": 4778,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3202,
-                                    "src": "23582:6:5",
+                                    "referencedDeclaration": 4644,
+                                    "src": "23582:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78533,18 +78533,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3335,
+                                  "id": 4777,
                                   "name": "RefundRemainingFunds",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3386,
-                                  "src": "23561:20:5",
+                                  "referencedDeclaration": 4828,
+                                  "src": "23561:20:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3337,
+                                "id": 4779,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78552,28 +78552,28 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23561:28:5",
+                                "src": "23561:28:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3338,
+                              "id": 4780,
                               "nodeType": "ExpressionStatement",
-                              "src": "23561:28:5"
+                              "src": "23561:28:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 3339,
+                                "id": 4781,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "23614:4:5",
+                                "src": "23614:4:7",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -78581,20 +78581,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 3206,
-                              "id": 3340,
+                              "functionReturnParameters": 4648,
+                              "id": 4782,
                               "nodeType": "Return",
-                              "src": "23607:11:5"
+                              "src": "23607:11:7"
                             }
                           ]
                         },
-                        "id": 3342,
+                        "id": 4784,
                         "nodeType": "IfStatement",
-                        "src": "23178:455:5",
+                        "src": "23178:455:7",
                         "trueBody": {
-                          "id": 3322,
+                          "id": 4764,
                           "nodeType": "Block",
-                          "src": "23233:194:5",
+                          "src": "23233:194:7",
                           "statements": [
                             {
                               "expression": {
@@ -78607,26 +78607,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 3302,
+                                          "id": 4744,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3211,
-                                          "src": "23278:4:5",
+                                          "referencedDeclaration": 4653,
+                                          "src": "23278:4:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$770_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 3303,
+                                        "id": 4745,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 747,
-                                        "src": "23278:15:5",
+                                        "referencedDeclaration": 2189,
+                                        "src": "23278:15:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -78634,25 +78634,25 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3304,
+                                        "id": 4746,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7814,
-                                        "src": "23295:4:5",
+                                        "referencedDeclaration": 11366,
+                                        "src": "23295:4:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         }
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 3305,
+                                        "id": 4747,
                                         "name": "nextPeriodSum",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3279,
-                                        "src": "23301:13:5",
+                                        "referencedDeclaration": 4721,
+                                        "src": "23301:13:7",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -78666,7 +78666,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$3787",
+                                          "typeIdentifier": "t_contract$_Market_$5229",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -78676,32 +78676,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 3300,
+                                        "id": 4742,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 873,
-                                        "src": "23259:5:5",
+                                        "referencedDeclaration": 2315,
+                                        "src": "23259:5:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$5514",
+                                          "typeIdentifier": "t_contract$_SNM_$10080",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 3301,
+                                      "id": 4743,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 7607,
-                                      "src": "23259:18:5",
+                                      "referencedDeclaration": 11153,
+                                      "src": "23259:18:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 3306,
+                                    "id": 4748,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -78709,7 +78709,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "23259:56:5",
+                                    "src": "23259:56:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -78723,21 +78723,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 3299,
+                                  "id": 4741,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "23251:7:5",
+                                  "referencedDeclaration": 11318,
+                                  "src": "23251:7:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 3307,
+                                "id": 4749,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78745,20 +78745,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23251:65:5",
+                                "src": "23251:65:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3308,
+                              "id": 4750,
                               "nodeType": "ExpressionStatement",
-                              "src": "23251:65:5"
+                              "src": "23251:65:7"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3320,
+                                "id": 4762,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78769,26 +78769,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3309,
+                                      "id": 4751,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 900,
-                                      "src": "23334:5:5",
+                                      "referencedDeclaration": 2342,
+                                      "src": "23334:5:7",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3311,
+                                    "id": 4753,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3310,
+                                      "id": 4752,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3202,
-                                      "src": "23340:6:5",
+                                      "referencedDeclaration": 4644,
+                                      "src": "23340:6:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -78799,21 +78799,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "23334:13:5",
+                                    "src": "23334:13:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3312,
+                                  "id": 4754,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 765,
-                                  "src": "23334:28:5",
+                                  "referencedDeclaration": 2207,
+                                  "src": "23334:28:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78826,12 +78826,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3318,
+                                      "id": 4760,
                                       "name": "nextPeriodSum",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3279,
-                                      "src": "23398:13:5",
+                                      "referencedDeclaration": 4721,
+                                      "src": "23398:13:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -78851,26 +78851,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3313,
+                                          "id": 4755,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 900,
-                                          "src": "23365:5:5",
+                                          "referencedDeclaration": 2342,
+                                          "src": "23365:5:7",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 3315,
+                                        "id": 4757,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3314,
+                                          "id": 4756,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3202,
-                                          "src": "23371:6:5",
+                                          "referencedDeclaration": 4644,
+                                          "src": "23371:6:7",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -78881,41 +78881,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "23365:13:5",
+                                        "src": "23365:13:7",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 3316,
+                                      "id": 4758,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 765,
-                                      "src": "23365:28:5",
+                                      "referencedDeclaration": 2207,
+                                      "src": "23365:28:7",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 3317,
+                                    "id": 4759,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 7249,
-                                    "src": "23365:32:5",
+                                    "referencedDeclaration": 10795,
+                                    "src": "23365:32:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 3319,
+                                  "id": 4761,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -78923,21 +78923,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "23365:47:5",
+                                  "src": "23365:47:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "23334:78:5",
+                                "src": "23334:78:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3321,
+                              "id": 4763,
                               "nodeType": "ExpressionStatement",
-                              "src": "23334:78:5"
+                              "src": "23334:78:7"
                             }
                           ]
                         }
@@ -78949,14 +78949,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3345,
+                    "id": 4787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23659:4:5",
+                    "src": "23659:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -78964,15 +78964,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3206,
-                  "id": 3346,
+                  "functionReturnParameters": 4648,
+                  "id": 4788,
                   "nodeType": "Return",
-                  "src": "23652:11:5"
+                  "src": "23652:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3348,
+            "id": 4790,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -78980,16 +78980,16 @@
             "name": "ReserveNextPeriodFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3203,
+              "id": 4645,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3202,
+                  "id": 4644,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3348,
-                  "src": "22319:11:5",
+                  "scope": 4790,
+                  "src": "22319:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -78997,10 +78997,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3201,
+                    "id": 4643,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22319:4:5",
+                    "src": "22319:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79010,20 +79010,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22318:13:5"
+              "src": "22318:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3206,
+              "id": 4648,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3205,
+                  "id": 4647,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3348,
-                  "src": "22350:4:5",
+                  "scope": 4790,
+                  "src": "22350:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79031,10 +79031,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3204,
+                    "id": 4646,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22350:4:5",
+                    "src": "22350:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79044,19 +79044,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22349:6:5"
+              "src": "22349:6:7"
             },
-            "scope": 3787,
-            "src": "22287:1383:5",
+            "scope": 5229,
+            "src": "22287:1383:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3385,
+              "id": 4827,
               "nodeType": "Block",
-              "src": "23742:217:5",
+              "src": "23742:217:7",
               "statements": [
                 {
                   "condition": {
@@ -79065,7 +79065,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3360,
+                    "id": 4802,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79076,26 +79076,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3355,
+                          "id": 4797,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "23756:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "23756:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3357,
+                        "id": 4799,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3356,
+                          "id": 4798,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3350,
-                          "src": "23762:6:5",
+                          "referencedDeclaration": 4792,
+                          "src": "23762:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -79106,21 +79106,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23756:13:5",
+                        "src": "23756:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3358,
+                      "id": 4800,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 765,
-                      "src": "23756:28:5",
+                      "referencedDeclaration": 2207,
+                      "src": "23756:28:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -79131,14 +79131,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3359,
+                      "id": 4801,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "23788:1:5",
+                      "src": "23788:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -79146,20 +79146,20 @@
                       },
                       "value": "0"
                     },
-                    "src": "23756:33:5",
+                    "src": "23756:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3382,
+                  "id": 4824,
                   "nodeType": "IfStatement",
-                  "src": "23752:180:5",
+                  "src": "23752:180:7",
                   "trueBody": {
-                    "id": 3381,
+                    "id": 4823,
                     "nodeType": "Block",
-                    "src": "23791:141:5",
+                    "src": "23791:141:7",
                     "statements": [
                       {
                         "expression": {
@@ -79171,26 +79171,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3364,
+                                  "id": 4806,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23820:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23820:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3366,
+                                "id": 4808,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3365,
+                                  "id": 4807,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3350,
-                                  "src": "23826:6:5",
+                                  "referencedDeclaration": 4792,
+                                  "src": "23826:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -79201,21 +79201,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23820:13:5",
+                                "src": "23820:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3367,
+                              "id": 4809,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "23820:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "23820:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -79227,26 +79227,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3368,
+                                  "id": 4810,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "23846:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "23846:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3370,
+                                "id": 4812,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3369,
+                                  "id": 4811,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3350,
-                                  "src": "23852:6:5",
+                                  "referencedDeclaration": 4792,
+                                  "src": "23852:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -79257,21 +79257,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23846:13:5",
+                                "src": "23846:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3371,
+                              "id": 4813,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 765,
-                              "src": "23846:28:5",
+                              "referencedDeclaration": 2207,
+                              "src": "23846:28:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -79291,32 +79291,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3361,
+                              "id": 4803,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 873,
-                              "src": "23805:5:5",
+                              "referencedDeclaration": 2315,
+                              "src": "23805:5:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_SNM_$5514",
+                                "typeIdentifier": "t_contract$_SNM_$10080",
                                 "typeString": "contract SNM"
                               }
                             },
-                            "id": 3363,
+                            "id": 4805,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "transfer",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7419,
-                            "src": "23805:14:5",
+                            "referencedDeclaration": 10965,
+                            "src": "23805:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                               "typeString": "function (address,uint256) external returns (bool)"
                             }
                           },
-                          "id": 3372,
+                          "id": 4814,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -79324,20 +79324,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23805:70:5",
+                          "src": "23805:70:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3373,
+                        "id": 4815,
                         "nodeType": "ExpressionStatement",
-                        "src": "23805:70:5"
+                        "src": "23805:70:7"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3379,
+                          "id": 4821,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -79348,26 +79348,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3374,
+                                "id": 4816,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "23889:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "23889:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3376,
+                              "id": 4818,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3375,
+                                "id": 4817,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3350,
-                                "src": "23895:6:5",
+                                "referencedDeclaration": 4792,
+                                "src": "23895:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -79378,21 +79378,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "23889:13:5",
+                              "src": "23889:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3377,
+                            "id": 4819,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "blockedBalance",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 765,
-                            "src": "23889:28:5",
+                            "referencedDeclaration": 2207,
+                            "src": "23889:28:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -79403,14 +79403,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3378,
+                            "id": 4820,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "23920:1:5",
+                            "src": "23920:1:7",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -79418,15 +79418,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "23889:32:5",
+                          "src": "23889:32:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3380,
+                        "id": 4822,
                         "nodeType": "ExpressionStatement",
-                        "src": "23889:32:5"
+                        "src": "23889:32:7"
                       }
                     ]
                   }
@@ -79435,14 +79435,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3383,
+                    "id": 4825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23948:4:5",
+                    "src": "23948:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -79450,15 +79450,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3354,
-                  "id": 3384,
+                  "functionReturnParameters": 4796,
+                  "id": 4826,
                   "nodeType": "Return",
-                  "src": "23941:11:5"
+                  "src": "23941:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3386,
+            "id": 4828,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -79466,16 +79466,16 @@
             "name": "RefundRemainingFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3351,
+              "id": 4793,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3350,
+                  "id": 4792,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3386,
-                  "src": "23706:11:5",
+                  "scope": 4828,
+                  "src": "23706:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79483,10 +79483,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3349,
+                    "id": 4791,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23706:4:5",
+                    "src": "23706:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79496,20 +79496,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23705:13:5"
+              "src": "23705:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3354,
+              "id": 4796,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3353,
+                  "id": 4795,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3386,
-                  "src": "23737:4:5",
+                  "scope": 4828,
+                  "src": "23737:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79517,10 +79517,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3352,
+                    "id": 4794,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23737:4:5",
+                    "src": "23737:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79530,19 +79530,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23736:6:5"
+              "src": "23736:6:7"
             },
-            "scope": 3787,
-            "src": "23676:283:5",
+            "scope": 5229,
+            "src": "23676:283:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3400,
+              "id": 4842,
               "nodeType": "Block",
-              "src": "24022:51:5",
+              "src": "24022:51:7",
               "statements": [
                 {
                   "expression": {
@@ -79551,7 +79551,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3398,
+                    "id": 4840,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79562,26 +79562,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3393,
+                          "id": 4835,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "24039:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "24039:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3395,
+                        "id": 4837,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3394,
+                          "id": 4836,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3388,
-                          "src": "24045:6:5",
+                          "referencedDeclaration": 4830,
+                          "src": "24045:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -79592,21 +79592,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24039:13:5",
+                        "src": "24039:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3396,
+                      "id": 4838,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 755,
-                      "src": "24039:22:5",
+                      "referencedDeclaration": 2197,
+                      "src": "24039:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -79617,14 +79617,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3397,
+                      "id": 4839,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "24065:1:5",
+                      "src": "24065:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -79632,21 +79632,21 @@
                       },
                       "value": "0"
                     },
-                    "src": "24039:27:5",
+                    "src": "24039:27:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 3392,
-                  "id": 3399,
+                  "functionReturnParameters": 4834,
+                  "id": 4841,
                   "nodeType": "Return",
-                  "src": "24032:34:5"
+                  "src": "24032:34:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3401,
+            "id": 4843,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -79654,16 +79654,16 @@
             "name": "IsSpot",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3389,
+              "id": 4831,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3388,
+                  "id": 4830,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3401,
-                  "src": "23981:11:5",
+                  "scope": 4843,
+                  "src": "23981:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79671,10 +79671,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3387,
+                    "id": 4829,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23981:4:5",
+                    "src": "23981:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79684,20 +79684,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23980:13:5"
+              "src": "23980:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3392,
+              "id": 4834,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3391,
+                  "id": 4833,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3401,
-                  "src": "24017:4:5",
+                  "scope": 4843,
+                  "src": "24017:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79705,10 +79705,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3390,
+                    "id": 4832,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24017:4:5",
+                    "src": "24017:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79718,32 +79718,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24016:6:5"
+              "src": "24016:6:7"
             },
-            "scope": 3787,
-            "src": "23965:108:5",
+            "scope": 5229,
+            "src": "23965:108:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3427,
+              "id": 4869,
               "nodeType": "Block",
-              "src": "24161:109:5",
+              "src": "24161:109:7",
               "statements": [
                 {
                   "assignments": [
-                    3411
+                    4853
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3411,
+                      "id": 4853,
                       "name": "rate",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3428,
-                      "src": "24171:9:5",
+                      "scope": 4870,
+                      "src": "24171:9:7",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -79751,10 +79751,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3410,
+                        "id": 4852,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "24171:4:5",
+                        "src": "24171:4:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -79764,7 +79764,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3415,
+                  "id": 4857,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [],
@@ -79772,32 +79772,32 @@
                       "argumentTypes": [],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3412,
+                        "id": 4854,
                         "name": "oracle",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 877,
-                        "src": "24183:6:5",
+                        "referencedDeclaration": 2319,
+                        "src": "24183:6:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                          "typeIdentifier": "t_contract$_OracleUSD_$8677",
                           "typeString": "contract OracleUSD"
                         }
                       },
-                      "id": 3413,
+                      "id": 4855,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "getCurrentPrice",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 4902,
-                      "src": "24183:22:5",
+                      "referencedDeclaration": 8676,
+                      "src": "24183:22:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                         "typeString": "function () view external returns (uint256)"
                       }
                     },
-                    "id": 3414,
+                    "id": 4856,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79805,14 +79805,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24183:24:5",
+                    "src": "24183:24:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "24171:36:5"
+                  "src": "24171:36:7"
                 },
                 {
                   "expression": {
@@ -79821,14 +79821,14 @@
                       {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 3424,
+                        "id": 4866,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "24258:4:5",
+                        "src": "24258:4:7",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -79849,12 +79849,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 3421,
+                            "id": 4863,
                             "name": "_period",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3405,
-                            "src": "24245:7:5",
+                            "referencedDeclaration": 4847,
+                            "src": "24245:7:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -79873,12 +79873,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3418,
+                                "id": 4860,
                                 "name": "_price",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3403,
-                                "src": "24233:6:5",
+                                "referencedDeclaration": 4845,
+                                "src": "24233:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -79894,32 +79894,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3416,
+                                "id": 4858,
                                 "name": "rate",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3411,
-                                "src": "24224:4:5",
+                                "referencedDeclaration": 4853,
+                                "src": "24224:4:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3417,
+                              "id": 4859,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "mul",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7191,
-                              "src": "24224:8:5",
+                              "referencedDeclaration": 10737,
+                              "src": "24224:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3419,
+                            "id": 4861,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -79927,27 +79927,27 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24224:16:5",
+                            "src": "24224:16:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 3420,
+                          "id": 4862,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "mul",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7191,
-                          "src": "24224:20:5",
+                          "referencedDeclaration": 10737,
+                          "src": "24224:20:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 3422,
+                        "id": 4864,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -79955,27 +79955,27 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "24224:29:5",
+                        "src": "24224:29:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "id": 3423,
+                      "id": 4865,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "div",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7205,
-                      "src": "24224:33:5",
+                      "referencedDeclaration": 10751,
+                      "src": "24224:33:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                         "typeString": "function (uint256,uint256) pure returns (uint256)"
                       }
                     },
-                    "id": 3425,
+                    "id": 4867,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79983,21 +79983,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24224:39:5",
+                    "src": "24224:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 3409,
-                  "id": 3426,
+                  "functionReturnParameters": 4851,
+                  "id": 4868,
                   "nodeType": "Return",
-                  "src": "24217:46:5"
+                  "src": "24217:46:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3428,
+            "id": 4870,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -80005,16 +80005,16 @@
             "name": "CalculatePayment",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3406,
+              "id": 4848,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3403,
+                  "id": 4845,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24105:11:5",
+                  "scope": 4870,
+                  "src": "24105:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80022,10 +80022,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3402,
+                    "id": 4844,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24105:4:5",
+                    "src": "24105:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80036,11 +80036,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3405,
+                  "id": 4847,
                   "name": "_period",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24118:12:5",
+                  "scope": 4870,
+                  "src": "24118:12:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80048,10 +80048,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3404,
+                    "id": 4846,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24118:4:5",
+                    "src": "24118:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80061,20 +80061,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24104:27:5"
+              "src": "24104:27:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3409,
+              "id": 4851,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3408,
+                  "id": 4850,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3428,
-                  "src": "24155:4:5",
+                  "scope": 4870,
+                  "src": "24155:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80082,10 +80082,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3407,
+                    "id": 4849,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24155:4:5",
+                    "src": "24155:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80095,19 +80095,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24154:6:5"
+              "src": "24154:6:7"
             },
-            "scope": 3787,
-            "src": "24079:191:5",
+            "scope": 5229,
+            "src": "24079:191:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3488,
+              "id": 4930,
               "nodeType": "Block",
-              "src": "24344:418:5",
+              "src": "24344:418:7",
               "statements": [
                 {
                   "expression": {
@@ -80119,7 +80119,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3447,
+                        "id": 4889,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -80130,7 +80130,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3442,
+                          "id": 4884,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -80139,18 +80139,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3436,
+                              "id": 4878,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "24401:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "24401:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3437,
+                            "id": 4879,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -80158,7 +80158,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24401:10:5",
+                            "src": "24401:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -80172,26 +80172,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3438,
+                                "id": 4880,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "24415:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "24415:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3440,
+                              "id": 4882,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3439,
+                                "id": 4881,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3430,
-                                "src": "24421:6:5",
+                                "referencedDeclaration": 4872,
+                                "src": "24421:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -80202,27 +80202,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "24415:13:5",
+                              "src": "24415:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3441,
+                            "id": 4883,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 747,
-                            "src": "24415:24:5",
+                            "referencedDeclaration": 2189,
+                            "src": "24415:24:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "24401:38:5",
+                          "src": "24401:38:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -80233,24 +80233,24 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                            "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                             "typeString": "enum Market.BlacklistPerson"
                           },
-                          "id": 3446,
+                          "id": 4888,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 3443,
+                            "id": 4885,
                             "name": "role",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3432,
-                            "src": "24443:4:5",
+                            "referencedDeclaration": 4874,
+                            "src": "24443:4:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
@@ -80260,18 +80260,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3444,
+                              "id": 4886,
                               "name": "BlacklistPerson",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 740,
-                              "src": "24451:15:5",
+                              "referencedDeclaration": 2182,
+                              "src": "24451:15:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                                 "typeString": "type(enum Market.BlacklistPerson)"
                               }
                             },
-                            "id": 3445,
+                            "id": 4887,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -80279,19 +80279,19 @@
                             "memberName": "BLACKLIST_NOBODY",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24451:32:5",
+                            "src": "24451:32:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
-                          "src": "24443:40:5",
+                          "src": "24443:40:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "24401:82:5",
+                        "src": "24401:82:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -80305,21 +80305,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3435,
+                      "id": 4877,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24393:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24393:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3448,
+                    "id": 4890,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -80327,38 +80327,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24393:91:5",
+                    "src": "24393:91:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3449,
+                  "id": 4891,
                   "nodeType": "ExpressionStatement",
-                  "src": "24393:91:5"
+                  "src": "24393:91:7"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     },
-                    "id": 3453,
+                    "id": 4895,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3450,
+                      "id": 4892,
                       "name": "role",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3432,
-                      "src": "24498:4:5",
+                      "referencedDeclaration": 4874,
+                      "src": "24498:4:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
@@ -80368,18 +80368,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3451,
+                        "id": 4893,
                         "name": "BlacklistPerson",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 740,
-                        "src": "24506:15:5",
+                        "referencedDeclaration": 2182,
+                        "src": "24506:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                           "typeString": "type(enum Market.BlacklistPerson)"
                         }
                       },
-                      "id": 3452,
+                      "id": 4894,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -80387,13 +80387,13 @@
                       "memberName": "BLACKLIST_WORKER",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24506:32:5",
+                      "src": "24506:32:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
-                    "src": "24498:40:5",
+                    "src": "24498:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -80403,24 +80403,24 @@
                     "condition": {
                       "argumentTypes": null,
                       "commonType": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                         "typeString": "enum Market.BlacklistPerson"
                       },
-                      "id": 3471,
+                      "id": 4913,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 3468,
+                        "id": 4910,
                         "name": "role",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3432,
-                        "src": "24633:4:5",
+                        "referencedDeclaration": 4874,
+                        "src": "24633:4:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
@@ -80430,18 +80430,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3469,
+                          "id": 4911,
                           "name": "BlacklistPerson",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 740,
-                          "src": "24641:15:5",
+                          "referencedDeclaration": 2182,
+                          "src": "24641:15:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$740_$",
+                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
                             "typeString": "type(enum Market.BlacklistPerson)"
                           }
                         },
-                        "id": 3470,
+                        "id": 4912,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -80449,26 +80449,26 @@
                         "memberName": "BLACKLIST_MASTER",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "24641:32:5",
+                        "src": "24641:32:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
-                      "src": "24633:40:5",
+                      "src": "24633:40:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 3486,
+                    "id": 4928,
                     "nodeType": "IfStatement",
-                    "src": "24629:127:5",
+                    "src": "24629:127:7",
                     "trueBody": {
-                      "id": 3485,
+                      "id": 4927,
                       "nodeType": "Block",
-                      "src": "24675:81:5",
+                      "src": "24675:81:7",
                       "statements": [
                         {
                           "expression": {
@@ -80480,26 +80480,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3475,
+                                    "id": 4917,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "24696:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "24696:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3477,
+                                  "id": 4919,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3476,
+                                    "id": 4918,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3430,
-                                    "src": "24702:6:5",
+                                    "referencedDeclaration": 4872,
+                                    "src": "24702:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -80510,21 +80510,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24696:13:5",
+                                  "src": "24696:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3478,
+                                "id": 4920,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 747,
-                                "src": "24696:24:5",
+                                "referencedDeclaration": 2189,
+                                "src": "24696:24:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -80536,26 +80536,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3479,
+                                    "id": 4921,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 900,
-                                    "src": "24722:5:5",
+                                    "referencedDeclaration": 2342,
+                                    "src": "24722:5:7",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3481,
+                                  "id": 4923,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3480,
+                                    "id": 4922,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3430,
-                                    "src": "24728:6:5",
+                                    "referencedDeclaration": 4872,
+                                    "src": "24728:6:7",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -80566,21 +80566,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24722:13:5",
+                                  "src": "24722:13:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3482,
+                                "id": 4924,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "masterID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 749,
-                                "src": "24722:22:5",
+                                "referencedDeclaration": 2191,
+                                "src": "24722:22:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -80600,32 +80600,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3472,
+                                "id": 4914,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 875,
-                                "src": "24689:2:5",
+                                "referencedDeclaration": 2317,
+                                "src": "24689:2:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$592",
+                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 3474,
+                              "id": 4916,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 487,
-                              "src": "24689:6:5",
+                              "referencedDeclaration": 1056,
+                              "src": "24689:6:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) external returns (bool)"
                               }
                             },
-                            "id": 3483,
+                            "id": 4925,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -80633,26 +80633,26 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24689:56:5",
+                            "src": "24689:56:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "id": 3484,
+                          "id": 4926,
                           "nodeType": "ExpressionStatement",
-                          "src": "24689:56:5"
+                          "src": "24689:56:7"
                         }
                       ]
                     }
                   },
-                  "id": 3487,
+                  "id": 4929,
                   "nodeType": "IfStatement",
-                  "src": "24494:262:5",
+                  "src": "24494:262:7",
                   "trueBody": {
-                    "id": 3467,
+                    "id": 4909,
                     "nodeType": "Block",
-                    "src": "24540:83:5",
+                    "src": "24540:83:7",
                     "statements": [
                       {
                         "expression": {
@@ -80664,26 +80664,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3457,
+                                  "id": 4899,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24561:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24561:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3459,
+                                "id": 4901,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3458,
+                                  "id": 4900,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3430,
-                                  "src": "24567:6:5",
+                                  "referencedDeclaration": 4872,
+                                  "src": "24567:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -80694,21 +80694,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24561:13:5",
+                                "src": "24561:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3460,
+                              "id": 4902,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "24561:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "24561:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -80720,26 +80720,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3461,
+                                  "id": 4903,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24587:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24587:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3463,
+                                "id": 4905,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3462,
+                                  "id": 4904,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3430,
-                                  "src": "24593:6:5",
+                                  "referencedDeclaration": 4872,
+                                  "src": "24593:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -80750,21 +80750,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24587:13:5",
+                                "src": "24587:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3464,
+                              "id": 4906,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "24587:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "24587:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -80784,32 +80784,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3454,
+                              "id": 4896,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 875,
-                              "src": "24554:2:5",
+                              "referencedDeclaration": 2317,
+                              "src": "24554:2:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$592",
+                                "typeIdentifier": "t_contract$_Blacklist_$1161",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 3456,
+                            "id": 4898,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 487,
-                            "src": "24554:6:5",
+                            "referencedDeclaration": 1056,
+                            "src": "24554:6:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) external returns (bool)"
                             }
                           },
-                          "id": 3465,
+                          "id": 4907,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -80817,15 +80817,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "24554:58:5",
+                          "src": "24554:58:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3466,
+                        "id": 4908,
                         "nodeType": "ExpressionStatement",
-                        "src": "24554:58:5"
+                        "src": "24554:58:7"
                       }
                     ]
                   }
@@ -80833,7 +80833,7 @@
               ]
             },
             "documentation": null,
-            "id": 3489,
+            "id": 4931,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -80841,16 +80841,16 @@
             "name": "AddToBlacklist",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3433,
+              "id": 4875,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3430,
+                  "id": 4872,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3489,
-                  "src": "24300:11:5",
+                  "scope": 4931,
+                  "src": "24300:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80858,10 +80858,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3429,
+                    "id": 4871,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24300:4:5",
+                    "src": "24300:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80872,26 +80872,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 3432,
+                  "id": 4874,
                   "name": "role",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3489,
-                  "src": "24313:20:5",
+                  "scope": 4931,
+                  "src": "24313:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 3431,
+                    "id": 4873,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 740,
-                    "src": "24313:15:5",
+                    "referencedDeclaration": 2182,
+                    "src": "24313:15:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$740",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -80899,35 +80899,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24299:35:5"
+              "src": "24299:35:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3434,
+              "id": 4876,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24344:0:5"
+              "src": "24344:0:7"
             },
-            "scope": 3787,
-            "src": "24276:486:5",
+            "scope": 5229,
+            "src": "24276:486:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3561,
+              "id": 5003,
               "nodeType": "Block",
-              "src": "24817:451:5",
+              "src": "24817:451:7",
               "statements": [
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     },
-                    "id": 3500,
+                    "id": 4942,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -80938,26 +80938,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3494,
+                          "id": 4936,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "24831:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "24831:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3496,
+                        "id": 4938,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3495,
+                          "id": 4937,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "24837:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "24837:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -80968,23 +80968,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24831:13:5",
+                        "src": "24831:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3497,
+                      "id": 4939,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 763,
-                      "src": "24831:20:5",
+                      "referencedDeclaration": 2205,
+                      "src": "24831:20:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -80994,18 +80994,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3498,
+                        "id": 4940,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 722,
-                        "src": "24855:10:5",
+                        "referencedDeclaration": 2164,
+                        "src": "24855:10:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 3499,
+                      "id": 4941,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -81013,33 +81013,33 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24855:24:5",
+                      "src": "24855:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "24831:48:5",
+                    "src": "24831:48:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3503,
+                  "id": 4945,
                   "nodeType": "IfStatement",
-                  "src": "24827:85:5",
+                  "src": "24827:85:7",
                   "trueBody": {
-                    "id": 3502,
+                    "id": 4944,
                     "nodeType": "Block",
-                    "src": "24881:31:5",
+                    "src": "24881:31:7",
                     "statements": [
                       {
                         "expression": null,
-                        "functionReturnParameters": 3493,
-                        "id": 3501,
+                        "functionReturnParameters": 4935,
+                        "id": 4943,
                         "nodeType": "Return",
-                        "src": "24895:7:5"
+                        "src": "24895:7:7"
                       }
                     ]
                   }
@@ -81054,10 +81054,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$722",
+                              "typeIdentifier": "t_enum$_DealStatus_$2164",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 3511,
+                            "id": 4953,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81068,26 +81068,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3505,
+                                  "id": 4947,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "24930:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "24930:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3507,
+                                "id": 4949,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3506,
+                                  "id": 4948,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "24936:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "24936:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81098,23 +81098,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24930:13:5",
+                                "src": "24930:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3508,
+                              "id": 4950,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 763,
-                              "src": "24930:20:5",
+                              "referencedDeclaration": 2205,
+                              "src": "24930:20:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -81124,18 +81124,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3509,
+                                "id": 4951,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 722,
-                                "src": "24954:10:5",
+                                "referencedDeclaration": 2164,
+                                "src": "24954:10:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 3510,
+                              "id": 4952,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -81143,27 +81143,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "24954:26:5",
+                              "src": "24954:26:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$722",
+                                "typeIdentifier": "t_enum$_DealStatus_$2164",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "24930:50:5",
+                            "src": "24930:50:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 3512,
+                        "id": 4954,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "24929:52:5",
+                        "src": "24929:52:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -81177,21 +81177,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3504,
+                      "id": 4946,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24921:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24921:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3513,
+                    "id": 4955,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81199,15 +81199,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24921:61:5",
+                    "src": "24921:61:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3514,
+                  "id": 4956,
                   "nodeType": "ExpressionStatement",
-                  "src": "24921:61:5"
+                  "src": "24921:61:7"
                 },
                 {
                   "expression": {
@@ -81219,7 +81219,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3538,
+                        "id": 4980,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -81230,7 +81230,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3530,
+                          "id": 4972,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -81241,7 +81241,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3522,
+                            "id": 4964,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81250,18 +81250,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3516,
+                                "id": 4958,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "25000:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "25000:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3517,
+                              "id": 4959,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -81269,7 +81269,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25000:10:5",
+                              "src": "25000:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -81283,26 +81283,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3518,
+                                  "id": 4960,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "25014:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "25014:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3520,
+                                "id": 4962,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3519,
+                                  "id": 4961,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "25020:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "25020:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81313,27 +81313,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25014:13:5",
+                                "src": "25014:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3521,
+                              "id": 4963,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 747,
-                              "src": "25014:24:5",
+                              "referencedDeclaration": 2189,
+                              "src": "25014:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25000:38:5",
+                            "src": "25000:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -81347,7 +81347,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3529,
+                            "id": 4971,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81356,18 +81356,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3523,
+                                "id": 4965,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "25042:3:5",
+                                "referencedDeclaration": 11315,
+                                "src": "25042:3:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3524,
+                              "id": 4966,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -81375,7 +81375,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25042:10:5",
+                              "src": "25042:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -81389,26 +81389,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3525,
+                                  "id": 4967,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 900,
-                                  "src": "25056:5:5",
+                                  "referencedDeclaration": 2342,
+                                  "src": "25056:5:7",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3527,
+                                "id": 4969,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3526,
+                                  "id": 4968,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3491,
-                                  "src": "25062:6:5",
+                                  "referencedDeclaration": 4933,
+                                  "src": "25062:6:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81419,33 +81419,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25056:13:5",
+                                "src": "25056:13:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3528,
+                              "id": 4970,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 745,
-                              "src": "25056:24:5",
+                              "referencedDeclaration": 2187,
+                              "src": "25056:24:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25042:38:5",
+                            "src": "25042:38:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25000:80:5",
+                          "src": "25000:80:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -81459,7 +81459,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3537,
+                          "id": 4979,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -81468,18 +81468,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3531,
+                              "id": 4973,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "25084:3:5",
+                              "referencedDeclaration": 11315,
+                              "src": "25084:3:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3532,
+                            "id": 4974,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81487,7 +81487,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "25084:10:5",
+                            "src": "25084:10:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -81501,26 +81501,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3533,
+                                "id": 4975,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 900,
-                                "src": "25098:5:5",
+                                "referencedDeclaration": 2342,
+                                "src": "25098:5:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3535,
+                              "id": 4977,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3534,
+                                "id": 4976,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3491,
-                                "src": "25104:6:5",
+                                "referencedDeclaration": 4933,
+                                "src": "25104:6:7",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -81531,33 +81531,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "25098:13:5",
+                              "src": "25098:13:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$770_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3536,
+                            "id": 4978,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 749,
-                            "src": "25098:22:5",
+                            "referencedDeclaration": 2191,
+                            "src": "25098:22:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "25084:36:5",
+                          "src": "25084:36:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "25000:120:5",
+                        "src": "25000:120:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -81571,21 +81571,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3515,
+                      "id": 4957,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "24992:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "24992:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3539,
+                    "id": 4981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81593,20 +81593,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24992:129:5",
+                    "src": "24992:129:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3540,
+                  "id": 4982,
                   "nodeType": "ExpressionStatement",
-                  "src": "24992:129:5"
+                  "src": "24992:129:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3547,
+                    "id": 4989,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81617,26 +81617,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3541,
+                          "id": 4983,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "25131:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "25131:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3543,
+                        "id": 4985,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3542,
+                          "id": 4984,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "25137:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "25137:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -81647,23 +81647,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25131:13:5",
+                        "src": "25131:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3544,
+                      "id": 4986,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 763,
-                      "src": "25131:20:5",
+                      "referencedDeclaration": 2205,
+                      "src": "25131:20:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -81673,18 +81673,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3545,
+                        "id": 4987,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 722,
-                        "src": "25154:10:5",
+                        "referencedDeclaration": 2164,
+                        "src": "25154:10:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$722_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 3546,
+                      "id": 4988,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -81692,26 +81692,26 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25154:24:5",
+                      "src": "25154:24:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$722",
+                        "typeIdentifier": "t_enum$_DealStatus_$2164",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "25131:47:5",
+                    "src": "25131:47:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$722",
+                      "typeIdentifier": "t_enum$_DealStatus_$2164",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
-                  "id": 3548,
+                  "id": 4990,
                   "nodeType": "ExpressionStatement",
-                  "src": "25131:47:5"
+                  "src": "25131:47:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3555,
+                    "id": 4997,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81722,26 +81722,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3549,
+                          "id": 4991,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 900,
-                          "src": "25188:5:5",
+                          "referencedDeclaration": 2342,
+                          "src": "25188:5:7",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$770_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3551,
+                        "id": 4993,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3550,
+                          "id": 4992,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3491,
-                          "src": "25194:6:5",
+                          "referencedDeclaration": 4933,
+                          "src": "25194:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -81752,21 +81752,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25188:13:5",
+                        "src": "25188:13:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$770_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3552,
+                      "id": 4994,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 761,
-                      "src": "25188:21:5",
+                      "referencedDeclaration": 2203,
+                      "src": "25188:21:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -81778,18 +81778,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3553,
+                        "id": 4995,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "25212:5:5",
+                        "referencedDeclaration": 11305,
+                        "src": "25212:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3554,
+                      "id": 4996,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -81797,21 +81797,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25212:15:5",
+                      "src": "25212:15:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25188:39:5",
+                    "src": "25188:39:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3556,
+                  "id": 4998,
                   "nodeType": "ExpressionStatement",
-                  "src": "25188:39:5"
+                  "src": "25188:39:7"
                 },
                 {
                   "eventCall": {
@@ -81819,12 +81819,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3558,
+                        "id": 5000,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3491,
-                        "src": "25254:6:5",
+                        "referencedDeclaration": 4933,
+                        "src": "25254:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -81838,18 +81838,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3557,
+                      "id": 4999,
                       "name": "DealUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 826,
-                      "src": "25242:11:5",
+                      "referencedDeclaration": 2268,
+                      "src": "25242:11:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3559,
+                    "id": 5001,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81857,20 +81857,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25242:19:5",
+                    "src": "25242:19:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3560,
+                  "id": 5002,
                   "nodeType": "EmitStatement",
-                  "src": "25237:24:5"
+                  "src": "25237:24:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3562,
+            "id": 5004,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -81878,16 +81878,16 @@
             "name": "InternalCloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3492,
+              "id": 4934,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3491,
+                  "id": 4933,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3562,
-                  "src": "24795:11:5",
+                  "scope": 5004,
+                  "src": "24795:11:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -81895,10 +81895,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3490,
+                    "id": 4932,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24795:4:5",
+                    "src": "24795:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -81908,39 +81908,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24794:13:5"
+              "src": "24794:13:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3493,
+              "id": 4935,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24817:0:5"
+              "src": "24817:0:7"
             },
-            "scope": 3787,
-            "src": "24768:500:5",
+            "scope": 5229,
+            "src": "24768:500:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3604,
+              "id": 5046,
               "nodeType": "Block",
-              "src": "25355:215:5",
+              "src": "25355:215:7",
               "statements": [
                 {
                   "assignments": [
-                    3574
+                    5016
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3574,
+                      "id": 5016,
                       "name": "benchmarks",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3605,
-                      "src": "25365:26:5",
+                      "scope": 5047,
+                      "src": "25365:26:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -81949,19 +81949,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3572,
+                          "id": 5014,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25365:6:5",
+                          "src": "25365:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3573,
+                        "id": 5015,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25365:8:5",
+                        "src": "25365:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
@@ -81971,18 +81971,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3580,
+                  "id": 5022,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3578,
+                        "id": 5020,
                         "name": "benchmarksQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 890,
-                        "src": "25407:18:5",
+                        "referencedDeclaration": 2332,
+                        "src": "25407:18:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -81996,39 +81996,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3577,
+                      "id": 5019,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25394:12:5",
+                      "src": "25394:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint64_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint64[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3575,
+                          "id": 5017,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25398:6:5",
+                          "src": "25398:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3576,
+                        "id": 5018,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25398:8:5",
+                        "src": "25398:8:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
                         }
                       }
                     },
-                    "id": 3579,
+                    "id": 5021,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -82036,25 +82036,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25394:32:5",
+                    "src": "25394:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                       "typeString": "uint64[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25365:61:5"
+                  "src": "25365:61:7"
                 },
                 {
                   "body": {
-                    "id": 3600,
+                    "id": 5042,
                     "nodeType": "Block",
-                    "src": "25482:55:5",
+                    "src": "25482:55:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3598,
+                          "id": 5040,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -82063,26 +82063,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3592,
+                              "id": 5034,
                               "name": "benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3574,
-                              "src": "25496:10:5",
+                              "referencedDeclaration": 5016,
+                              "src": "25496:10:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 3594,
+                            "id": 5036,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3593,
+                              "id": 5035,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3582,
-                              "src": "25507:1:5",
+                              "referencedDeclaration": 5024,
+                              "src": "25507:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82093,7 +82093,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25496:13:5",
+                            "src": "25496:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
@@ -82105,26 +82105,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3595,
+                              "id": 5037,
                               "name": "_benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3565,
-                              "src": "25512:11:5",
+                              "referencedDeclaration": 5007,
+                              "src": "25512:11:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 3597,
+                            "id": 5039,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3596,
+                              "id": 5038,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3582,
-                              "src": "25524:1:5",
+                              "referencedDeclaration": 5024,
+                              "src": "25524:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82135,21 +82135,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25512:14:5",
+                            "src": "25512:14:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
                             }
                           },
-                          "src": "25496:30:5",
+                          "src": "25496:30:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 3599,
+                        "id": 5041,
                         "nodeType": "ExpressionStatement",
-                        "src": "25496:30:5"
+                        "src": "25496:30:7"
                       }
                     ]
                   },
@@ -82159,19 +82159,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3588,
+                    "id": 5030,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3585,
+                      "id": 5027,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3582,
-                      "src": "25453:1:5",
+                      "referencedDeclaration": 5024,
+                      "src": "25453:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -82183,18 +82183,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3586,
+                        "id": 5028,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3565,
-                        "src": "25457:11:5",
+                        "referencedDeclaration": 5007,
+                        "src": "25457:11:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3587,
+                      "id": 5029,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82202,31 +82202,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25457:18:5",
+                      "src": "25457:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25453:22:5",
+                    "src": "25453:22:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3601,
+                  "id": 5043,
                   "initializationExpression": {
                     "assignments": [
-                      3582
+                      5024
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 3582,
+                        "id": 5024,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 3605,
-                        "src": "25441:6:5",
+                        "scope": 5047,
+                        "src": "25441:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -82234,10 +82234,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 3581,
+                          "id": 5023,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25441:4:5",
+                          "src": "25441:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -82247,18 +82247,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 3584,
+                    "id": 5026,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3583,
+                      "id": 5025,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25450:1:5",
+                      "src": "25450:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -82267,12 +82267,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25441:10:5"
+                    "src": "25441:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3590,
+                      "id": 5032,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82280,15 +82280,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25477:3:5",
+                      "src": "25477:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3589,
+                        "id": 5031,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3582,
-                        "src": "25477:1:5",
+                        "referencedDeclaration": 5024,
+                        "src": "25477:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82299,36 +82299,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3591,
+                    "id": 5033,
                     "nodeType": "ExpressionStatement",
-                    "src": "25477:3:5"
+                    "src": "25477:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25436:101:5"
+                  "src": "25436:101:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3602,
+                    "id": 5044,
                     "name": "benchmarks",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3574,
-                    "src": "25553:10:5",
+                    "referencedDeclaration": 5016,
+                    "src": "25553:10:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                       "typeString": "uint64[] memory"
                     }
                   },
-                  "functionReturnParameters": 3570,
-                  "id": 3603,
+                  "functionReturnParameters": 5012,
+                  "id": 5045,
                   "nodeType": "Return",
-                  "src": "25546:17:5"
+                  "src": "25546:17:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3605,
+            "id": 5047,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -82336,16 +82336,16 @@
             "name": "ResizeBenchmarks",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3566,
+              "id": 5008,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3565,
+                  "id": 5007,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3605,
-                  "src": "25300:20:5",
+                  "scope": 5047,
+                  "src": "25300:20:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82354,19 +82354,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3563,
+                      "id": 5005,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25300:6:5",
+                      "src": "25300:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 3564,
+                    "id": 5006,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25300:8:5",
+                    "src": "25300:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -82376,20 +82376,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25299:22:5"
+              "src": "25299:22:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3570,
+              "id": 5012,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3569,
+                  "id": 5011,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3605,
-                  "src": "25345:8:5",
+                  "scope": 5047,
+                  "src": "25345:8:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82398,19 +82398,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3567,
+                      "id": 5009,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25345:6:5",
+                      "src": "25345:6:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 3568,
+                    "id": 5010,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25345:8:5",
+                    "src": "25345:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -82420,32 +82420,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25344:10:5"
+              "src": "25344:10:7"
             },
-            "scope": 3787,
-            "src": "25274:296:5",
+            "scope": 5229,
+            "src": "25274:296:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3647,
+              "id": 5089,
               "nodeType": "Block",
-              "src": "25649:199:5",
+              "src": "25649:199:7",
               "statements": [
                 {
                   "assignments": [
-                    3617
+                    5059
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3617,
+                      "id": 5059,
                       "name": "netflags",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3648,
-                      "src": "25659:22:5",
+                      "scope": 5090,
+                      "src": "25659:22:7",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -82454,19 +82454,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3615,
+                          "id": 5057,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25659:4:5",
+                          "src": "25659:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3616,
+                        "id": 5058,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25659:6:5",
+                        "src": "25659:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
@@ -82476,18 +82476,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3623,
+                  "id": 5065,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3621,
+                        "id": 5063,
                         "name": "netflagsQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 892,
-                        "src": "25695:16:5",
+                        "referencedDeclaration": 2334,
+                        "src": "25695:16:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82501,39 +82501,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3620,
+                      "id": 5062,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25684:10:5",
+                      "src": "25684:10:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (bool[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 3618,
+                          "id": 5060,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25688:4:5",
+                          "src": "25688:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3619,
+                        "id": 5061,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25688:6:5",
+                        "src": "25688:6:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
                         }
                       }
                     },
-                    "id": 3622,
+                    "id": 5064,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -82541,25 +82541,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25684:28:5",
+                    "src": "25684:28:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                       "typeString": "bool[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25659:53:5"
+                  "src": "25659:53:7"
                 },
                 {
                   "body": {
-                    "id": 3643,
+                    "id": 5085,
                     "nodeType": "Block",
-                    "src": "25766:51:5",
+                    "src": "25766:51:7",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3641,
+                          "id": 5083,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -82568,26 +82568,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3635,
+                              "id": 5077,
                               "name": "netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3617,
-                              "src": "25780:8:5",
+                              "referencedDeclaration": 5059,
+                              "src": "25780:8:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 3637,
+                            "id": 5079,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3636,
+                              "id": 5078,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3625,
-                              "src": "25789:1:5",
+                              "referencedDeclaration": 5067,
+                              "src": "25789:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82598,7 +82598,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25780:11:5",
+                            "src": "25780:11:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -82610,26 +82610,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3638,
+                              "id": 5080,
                               "name": "_netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3608,
-                              "src": "25794:9:5",
+                              "referencedDeclaration": 5050,
+                              "src": "25794:9:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 3640,
+                            "id": 5082,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3639,
+                              "id": 5081,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3625,
-                              "src": "25804:1:5",
+                              "referencedDeclaration": 5067,
+                              "src": "25804:1:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82640,21 +82640,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25794:12:5",
+                            "src": "25794:12:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25780:26:5",
+                          "src": "25780:26:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 3642,
+                        "id": 5084,
                         "nodeType": "ExpressionStatement",
-                        "src": "25780:26:5"
+                        "src": "25780:26:7"
                       }
                     ]
                   },
@@ -82664,19 +82664,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3631,
+                    "id": 5073,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3628,
+                      "id": 5070,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3625,
-                      "src": "25739:1:5",
+                      "referencedDeclaration": 5067,
+                      "src": "25739:1:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -82688,18 +82688,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3629,
+                        "id": 5071,
                         "name": "_netflags",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3608,
-                        "src": "25743:9:5",
+                        "referencedDeclaration": 5050,
+                        "src": "25743:9:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 3630,
+                      "id": 5072,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82707,31 +82707,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25743:16:5",
+                      "src": "25743:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25739:20:5",
+                    "src": "25739:20:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3644,
+                  "id": 5086,
                   "initializationExpression": {
                     "assignments": [
-                      3625
+                      5067
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 3625,
+                        "id": 5067,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 3648,
-                        "src": "25727:6:5",
+                        "scope": 5090,
+                        "src": "25727:6:7",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -82739,10 +82739,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 3624,
+                          "id": 5066,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25727:4:5",
+                          "src": "25727:4:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -82752,18 +82752,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 3627,
+                    "id": 5069,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3626,
+                      "id": 5068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25736:1:5",
+                      "src": "25736:1:7",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -82772,12 +82772,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25727:10:5"
+                    "src": "25727:10:7"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3633,
+                      "id": 5075,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82785,15 +82785,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25761:3:5",
+                      "src": "25761:3:7",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3632,
+                        "id": 5074,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3625,
-                        "src": "25761:1:5",
+                        "referencedDeclaration": 5067,
+                        "src": "25761:1:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82804,36 +82804,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3634,
+                    "id": 5076,
                     "nodeType": "ExpressionStatement",
-                    "src": "25761:3:5"
+                    "src": "25761:3:7"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25722:95:5"
+                  "src": "25722:95:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3645,
+                    "id": 5087,
                     "name": "netflags",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3617,
-                    "src": "25833:8:5",
+                    "referencedDeclaration": 5059,
+                    "src": "25833:8:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                       "typeString": "bool[] memory"
                     }
                   },
-                  "functionReturnParameters": 3613,
-                  "id": 3646,
+                  "functionReturnParameters": 5055,
+                  "id": 5088,
                   "nodeType": "Return",
-                  "src": "25826:15:5"
+                  "src": "25826:15:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3648,
+            "id": 5090,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -82841,16 +82841,16 @@
             "name": "ResizeNetflags",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3609,
+              "id": 5051,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3608,
+                  "id": 5050,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3648,
-                  "src": "25600:16:5",
+                  "scope": 5090,
+                  "src": "25600:16:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82859,19 +82859,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3606,
+                      "id": 5048,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25600:4:5",
+                      "src": "25600:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 3607,
+                    "id": 5049,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25600:6:5",
+                    "src": "25600:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -82881,20 +82881,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25599:18:5"
+              "src": "25599:18:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3613,
+              "id": 5055,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3612,
+                  "id": 5054,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3648,
-                  "src": "25641:6:5",
+                  "scope": 5090,
+                  "src": "25641:6:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82903,19 +82903,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 3610,
+                      "id": 5052,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25641:4:5",
+                      "src": "25641:4:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 3611,
+                    "id": 5053,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25641:6:5",
+                    "src": "25641:6:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -82925,38 +82925,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25640:8:5"
+              "src": "25640:8:7"
             },
-            "scope": 3787,
-            "src": "25576:272:5",
+            "scope": 5229,
+            "src": "25576:272:7",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3665,
+              "id": 5107,
               "nodeType": "Block",
-              "src": "25953:66:5",
+              "src": "25953:66:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3661,
+                    "id": 5103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3657,
+                      "id": 5099,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 879,
-                      "src": "25963:2:5",
+                      "referencedDeclaration": 2321,
+                      "src": "25963:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -82967,12 +82967,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3659,
+                          "id": 5101,
                           "name": "_newPR",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3650,
-                          "src": "25984:6:5",
+                          "referencedDeclaration": 5092,
+                          "src": "25984:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -82986,18 +82986,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3658,
+                        "id": 5100,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5469,
-                        "src": "25968:15:5",
+                        "referencedDeclaration": 10035,
+                        "src": "25968:15:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$5469_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 3660,
+                      "id": 5102,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83005,34 +83005,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "25968:23:5",
+                      "src": "25968:23:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "25963:28:5",
+                    "src": "25963:28:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$5469",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 3662,
+                  "id": 5104,
                   "nodeType": "ExpressionStatement",
-                  "src": "25963:28:5"
+                  "src": "25963:28:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3663,
+                    "id": 5105,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26008:4:5",
+                    "src": "26008:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83040,52 +83040,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3656,
-                  "id": 3664,
+                  "functionReturnParameters": 5098,
+                  "id": 5106,
                   "nodeType": "Return",
-                  "src": "26001:11:5"
+                  "src": "26001:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3666,
+            "id": 5108,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3653,
+                "id": 5095,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3652,
+                  "id": 5094,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "25921:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "25921:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "25921:9:5"
+                "src": "25921:9:7"
               }
             ],
             "name": "SetProfileRegistryAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3651,
+              "id": 5093,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3650,
+                  "id": 5092,
                   "name": "_newPR",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3666,
-                  "src": "25905:14:5",
+                  "scope": 5108,
+                  "src": "25905:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83093,10 +83093,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3649,
+                    "id": 5091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25905:7:5",
+                    "src": "25905:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83106,20 +83106,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25904:16:5"
+              "src": "25904:16:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3656,
+              "id": 5098,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3655,
+                  "id": 5097,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3666,
-                  "src": "25947:4:5",
+                  "scope": 5108,
+                  "src": "25947:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83127,10 +83127,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3654,
+                    "id": 5096,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25947:4:5",
+                    "src": "25947:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83140,38 +83140,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25946:6:5"
+              "src": "25946:6:7"
             },
-            "scope": 3787,
-            "src": "25870:149:5",
+            "scope": 5229,
+            "src": "25870:149:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3683,
+              "id": 5125,
               "nodeType": "Block",
-              "src": "26102:60:5",
+              "src": "26102:60:7",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3679,
+                    "id": 5121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3675,
+                      "id": 5117,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 875,
-                      "src": "26112:2:5",
+                      "referencedDeclaration": 2317,
+                      "src": "26112:2:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -83182,12 +83182,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3677,
+                          "id": 5119,
                           "name": "_newBL",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3668,
-                          "src": "26127:6:5",
+                          "referencedDeclaration": 5110,
+                          "src": "26127:6:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -83201,18 +83201,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3676,
+                        "id": 5118,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 592,
-                        "src": "26117:9:5",
+                        "referencedDeclaration": 1161,
+                        "src": "26117:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$592_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 3678,
+                      "id": 5120,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83220,34 +83220,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26117:17:5",
+                      "src": "26117:17:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$592",
+                        "typeIdentifier": "t_contract$_Blacklist_$1161",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "26112:22:5",
+                    "src": "26112:22:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$592",
+                      "typeIdentifier": "t_contract$_Blacklist_$1161",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 3680,
+                  "id": 5122,
                   "nodeType": "ExpressionStatement",
-                  "src": "26112:22:5"
+                  "src": "26112:22:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3681,
+                    "id": 5123,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26151:4:5",
+                    "src": "26151:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83255,52 +83255,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3674,
-                  "id": 3682,
+                  "functionReturnParameters": 5116,
+                  "id": 5124,
                   "nodeType": "Return",
-                  "src": "26144:11:5"
+                  "src": "26144:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3684,
+            "id": 5126,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3671,
+                "id": 5113,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3670,
+                  "id": 5112,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26070:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26070:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26070:9:5"
+                "src": "26070:9:7"
               }
             ],
             "name": "SetBlacklistAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3669,
+              "id": 5111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3668,
+                  "id": 5110,
                   "name": "_newBL",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3684,
-                  "src": "26054:14:5",
+                  "scope": 5126,
+                  "src": "26054:14:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83308,10 +83308,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3667,
+                    "id": 5109,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26054:7:5",
+                    "src": "26054:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83321,20 +83321,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26053:16:5"
+              "src": "26053:16:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3674,
+              "id": 5116,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3673,
+                  "id": 5115,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3684,
-                  "src": "26096:4:5",
+                  "scope": 5126,
+                  "src": "26096:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83342,10 +83342,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3672,
+                    "id": 5114,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26096:4:5",
+                    "src": "26096:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83355,19 +83355,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26095:6:5"
+              "src": "26095:6:7"
             },
-            "scope": 3787,
-            "src": "26025:137:5",
+            "scope": 5229,
+            "src": "26025:137:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3711,
+              "id": 5153,
               "nodeType": "Block",
-              "src": "26246:131:5",
+              "src": "26246:131:7",
               "statements": [
                 {
                   "expression": {
@@ -83379,7 +83379,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3700,
+                        "id": 5142,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -83394,12 +83394,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 3695,
+                                  "id": 5137,
                                   "name": "_newOracle",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3686,
-                                  "src": "26274:10:5",
+                                  "referencedDeclaration": 5128,
+                                  "src": "26274:10:7",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -83413,18 +83413,18 @@
                                     "typeString": "address"
                                   }
                                 ],
-                                "id": 3694,
+                                "id": 5136,
                                 "name": "OracleUSD",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4903,
-                                "src": "26264:9:5",
+                                "referencedDeclaration": 8677,
+                                "src": "26264:9:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                                   "typeString": "type(contract OracleUSD)"
                                 }
                               },
-                              "id": 3696,
+                              "id": 5138,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -83432,27 +83432,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "26264:21:5",
+                              "src": "26264:21:7",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                                "typeIdentifier": "t_contract$_OracleUSD_$8677",
                                 "typeString": "contract OracleUSD"
                               }
                             },
-                            "id": 3697,
+                            "id": 5139,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getCurrentPrice",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4902,
-                            "src": "26264:37:5",
+                            "referencedDeclaration": 8676,
+                            "src": "26264:37:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                               "typeString": "function () view external returns (uint256)"
                             }
                           },
-                          "id": 3698,
+                          "id": 5140,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -83460,7 +83460,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "26264:39:5",
+                          "src": "26264:39:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -83471,14 +83471,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3699,
+                          "id": 5141,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "26307:1:5",
+                          "src": "26307:1:7",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -83486,7 +83486,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "26264:44:5",
+                        "src": "26264:44:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -83500,21 +83500,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3693,
+                      "id": 5135,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26256:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26256:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3701,
+                    "id": 5143,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83522,34 +83522,34 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26256:53:5",
+                    "src": "26256:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3702,
+                  "id": 5144,
                   "nodeType": "ExpressionStatement",
-                  "src": "26256:53:5"
+                  "src": "26256:53:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3707,
+                    "id": 5149,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3703,
+                      "id": 5145,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 877,
-                      "src": "26319:6:5",
+                      "referencedDeclaration": 2319,
+                      "src": "26319:6:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -83560,12 +83560,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3705,
+                          "id": 5147,
                           "name": "_newOracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3686,
-                          "src": "26338:10:5",
+                          "referencedDeclaration": 5128,
+                          "src": "26338:10:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -83579,18 +83579,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 3704,
+                        "id": 5146,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4903,
-                        "src": "26328:9:5",
+                        "referencedDeclaration": 8677,
+                        "src": "26328:9:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$4903_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 3706,
+                      "id": 5148,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83598,34 +83598,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26328:21:5",
+                      "src": "26328:21:7",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "26319:30:5",
+                    "src": "26319:30:7",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$4903",
+                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 3708,
+                  "id": 5150,
                   "nodeType": "ExpressionStatement",
-                  "src": "26319:30:5"
+                  "src": "26319:30:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3709,
+                    "id": 5151,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26366:4:5",
+                    "src": "26366:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83633,52 +83633,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3692,
-                  "id": 3710,
+                  "functionReturnParameters": 5134,
+                  "id": 5152,
                   "nodeType": "Return",
-                  "src": "26359:11:5"
+                  "src": "26359:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3712,
+            "id": 5154,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3689,
+                "id": 5131,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3688,
+                  "id": 5130,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26214:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26214:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26214:9:5"
+                "src": "26214:9:7"
               }
             ],
             "name": "SetOracleAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3687,
+              "id": 5129,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3686,
+                  "id": 5128,
                   "name": "_newOracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3712,
-                  "src": "26194:18:5",
+                  "scope": 5154,
+                  "src": "26194:18:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83686,10 +83686,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3685,
+                    "id": 5127,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26194:7:5",
+                    "src": "26194:7:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83699,20 +83699,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26193:20:5"
+              "src": "26193:20:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3692,
+              "id": 5134,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3691,
+                  "id": 5133,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3712,
-                  "src": "26240:4:5",
+                  "scope": 5154,
+                  "src": "26240:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83720,10 +83720,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3690,
+                    "id": 5132,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26240:4:5",
+                    "src": "26240:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83733,19 +83733,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26239:6:5"
+              "src": "26239:6:7"
             },
-            "scope": 3787,
-            "src": "26168:209:5",
+            "scope": 5229,
+            "src": "26168:209:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3737,
+              "id": 5179,
               "nodeType": "Block",
-              "src": "26465:172:5",
+              "src": "26465:172:7",
               "statements": [
                 {
                   "expression": {
@@ -83757,19 +83757,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3724,
+                        "id": 5166,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3722,
+                          "id": 5164,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3714,
-                          "src": "26483:12:5",
+                          "referencedDeclaration": 5156,
+                          "src": "26483:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -83779,18 +83779,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3723,
+                          "id": 5165,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 890,
-                          "src": "26498:18:5",
+                          "referencedDeclaration": 2332,
+                          "src": "26498:18:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26483:33:5",
+                        "src": "26483:33:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -83804,21 +83804,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3721,
+                      "id": 5163,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26475:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26475:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3725,
+                    "id": 5167,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83826,15 +83826,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26475:42:5",
+                    "src": "26475:42:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3726,
+                  "id": 5168,
                   "nodeType": "ExpressionStatement",
-                  "src": "26475:42:5"
+                  "src": "26475:42:7"
                 },
                 {
                   "eventCall": {
@@ -83842,12 +83842,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3728,
+                        "id": 5170,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3714,
-                        "src": "26553:12:5",
+                        "referencedDeclaration": 5156,
+                        "src": "26553:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -83861,18 +83861,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3727,
+                      "id": 5169,
                       "name": "NumBenchmarksUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 862,
-                      "src": "26532:20:5",
+                      "referencedDeclaration": 2304,
+                      "src": "26532:20:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3729,
+                    "id": 5171,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83880,32 +83880,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26532:34:5",
+                    "src": "26532:34:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3730,
+                  "id": 5172,
                   "nodeType": "EmitStatement",
-                  "src": "26527:39:5"
+                  "src": "26527:39:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3733,
+                    "id": 5175,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3731,
+                      "id": 5173,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 890,
-                      "src": "26576:18:5",
+                      "referencedDeclaration": 2332,
+                      "src": "26576:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -83915,39 +83915,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3732,
+                      "id": 5174,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3714,
-                      "src": "26597:12:5",
+                      "referencedDeclaration": 5156,
+                      "src": "26597:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26576:33:5",
+                    "src": "26576:33:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3734,
+                  "id": 5176,
                   "nodeType": "ExpressionStatement",
-                  "src": "26576:33:5"
+                  "src": "26576:33:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3735,
+                    "id": 5177,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26626:4:5",
+                    "src": "26626:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83955,52 +83955,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3720,
-                  "id": 3736,
+                  "functionReturnParameters": 5162,
+                  "id": 5178,
                   "nodeType": "Return",
-                  "src": "26619:11:5"
+                  "src": "26619:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3738,
+            "id": 5180,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3717,
+                "id": 5159,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3716,
+                  "id": 5158,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26433:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26433:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26433:9:5"
+                "src": "26433:9:7"
               }
             ],
             "name": "SetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3715,
+              "id": 5157,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3714,
+                  "id": 5156,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3738,
-                  "src": "26414:17:5",
+                  "scope": 5180,
+                  "src": "26414:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84008,10 +84008,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3713,
+                    "id": 5155,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26414:4:5",
+                    "src": "26414:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -84021,20 +84021,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26413:19:5"
+              "src": "26413:19:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3720,
+              "id": 5162,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3719,
+                  "id": 5161,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3738,
-                  "src": "26459:4:5",
+                  "scope": 5180,
+                  "src": "26459:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84042,10 +84042,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3718,
+                    "id": 5160,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26459:4:5",
+                    "src": "26459:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -84055,19 +84055,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26458:6:5"
+              "src": "26458:6:7"
             },
-            "scope": 3787,
-            "src": "26383:254:5",
+            "scope": 5229,
+            "src": "26383:254:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3763,
+              "id": 5205,
               "nodeType": "Block",
-              "src": "26723:166:5",
+              "src": "26723:166:7",
               "statements": [
                 {
                   "expression": {
@@ -84079,19 +84079,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 3750,
+                        "id": 5192,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3748,
+                          "id": 5190,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3740,
-                          "src": "26741:12:5",
+                          "referencedDeclaration": 5182,
+                          "src": "26741:12:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -84101,18 +84101,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3749,
+                          "id": 5191,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 892,
-                          "src": "26756:16:5",
+                          "referencedDeclaration": 2334,
+                          "src": "26756:16:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26741:31:5",
+                        "src": "26741:31:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -84126,21 +84126,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3747,
+                      "id": 5189,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "26733:7:5",
+                      "referencedDeclaration": 11318,
+                      "src": "26733:7:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3751,
+                    "id": 5193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84148,15 +84148,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26733:40:5",
+                    "src": "26733:40:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3752,
+                  "id": 5194,
                   "nodeType": "ExpressionStatement",
-                  "src": "26733:40:5"
+                  "src": "26733:40:7"
                 },
                 {
                   "eventCall": {
@@ -84164,12 +84164,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3754,
+                        "id": 5196,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3740,
-                        "src": "26807:12:5",
+                        "referencedDeclaration": 5182,
+                        "src": "26807:12:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -84183,18 +84183,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3753,
+                      "id": 5195,
                       "name": "NumNetflagsUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 866,
-                      "src": "26788:18:5",
+                      "referencedDeclaration": 2308,
+                      "src": "26788:18:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3755,
+                    "id": 5197,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84202,32 +84202,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26788:32:5",
+                    "src": "26788:32:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3756,
+                  "id": 5198,
                   "nodeType": "EmitStatement",
-                  "src": "26783:37:5"
+                  "src": "26783:37:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3759,
+                    "id": 5201,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3757,
+                      "id": 5199,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 892,
-                      "src": "26830:16:5",
+                      "referencedDeclaration": 2334,
+                      "src": "26830:16:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -84237,39 +84237,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3758,
+                      "id": 5200,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3740,
-                      "src": "26849:12:5",
+                      "referencedDeclaration": 5182,
+                      "src": "26849:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26830:31:5",
+                    "src": "26830:31:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3760,
+                  "id": 5202,
                   "nodeType": "ExpressionStatement",
-                  "src": "26830:31:5"
+                  "src": "26830:31:7"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3761,
+                    "id": 5203,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26878:4:5",
+                    "src": "26878:4:7",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -84277,52 +84277,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3746,
-                  "id": 3762,
+                  "functionReturnParameters": 5188,
+                  "id": 5204,
                   "nodeType": "Return",
-                  "src": "26871:11:5"
+                  "src": "26871:11:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3764,
+            "id": 5206,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3743,
+                "id": 5185,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3742,
+                  "id": 5184,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26691:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26691:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26691:9:5"
+                "src": "26691:9:7"
               }
             ],
             "name": "SetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3741,
+              "id": 5183,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3740,
+                  "id": 5182,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3764,
-                  "src": "26672:17:5",
+                  "scope": 5206,
+                  "src": "26672:17:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84330,10 +84330,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3739,
+                    "id": 5181,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26672:4:5",
+                    "src": "26672:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -84343,20 +84343,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26671:19:5"
+              "src": "26671:19:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3746,
+              "id": 5188,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3745,
+                  "id": 5187,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3764,
-                  "src": "26717:4:5",
+                  "scope": 5206,
+                  "src": "26717:4:7",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84364,10 +84364,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3744,
+                    "id": 5186,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26717:4:5",
+                    "src": "26717:4:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -84377,19 +84377,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26716:6:5"
+              "src": "26716:6:7"
             },
-            "scope": 3787,
-            "src": "26643:246:5",
+            "scope": 5229,
+            "src": "26643:246:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3785,
+              "id": 5227,
               "nodeType": "Block",
-              "src": "26934:99:5",
+              "src": "26934:99:7",
               "statements": [
                 {
                   "expression": {
@@ -84397,12 +84397,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3772,
+                        "id": 5214,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "26959:5:5",
+                        "referencedDeclaration": 10800,
+                        "src": "26959:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -84416,14 +84416,14 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 3776,
+                                "id": 5218,
                                 "name": "this",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7814,
-                                "src": "26990:4:5",
+                                "referencedDeclaration": 11366,
+                                "src": "26990:4:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Market_$3787",
+                                  "typeIdentifier": "t_contract$_Market_$5229",
                                   "typeString": "contract Market"
                                 }
                               }
@@ -84431,24 +84431,24 @@
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_contract$_Market_$3787",
+                                  "typeIdentifier": "t_contract$_Market_$5229",
                                   "typeString": "contract Market"
                                 }
                               ],
-                              "id": 3775,
+                              "id": 5217,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "lValueRequested": false,
                               "nodeType": "ElementaryTypeNameExpression",
-                              "src": "26982:7:5",
+                              "src": "26982:7:7",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_type$_t_address_$",
                                 "typeString": "type(address)"
                               },
                               "typeName": "address"
                             },
-                            "id": 3777,
+                            "id": 5219,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -84456,7 +84456,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "26982:13:5",
+                            "src": "26982:13:7",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -84472,32 +84472,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3773,
+                            "id": 5215,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 873,
-                            "src": "26966:5:5",
+                            "referencedDeclaration": 2315,
+                            "src": "26966:5:7",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$5514",
+                              "typeIdentifier": "t_contract$_SNM_$10080",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 3774,
+                          "id": 5216,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "balanceOf",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7431,
-                          "src": "26966:15:5",
+                          "referencedDeclaration": 10977,
+                          "src": "26966:15:7",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                             "typeString": "function (address) view external returns (uint256)"
                           }
                         },
-                        "id": 3778,
+                        "id": 5220,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -84505,7 +84505,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "26966:30:5",
+                        "src": "26966:30:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -84525,32 +84525,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3769,
+                        "id": 5211,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 873,
-                        "src": "26944:5:5",
+                        "referencedDeclaration": 2315,
+                        "src": "26944:5:7",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$5514",
+                          "typeIdentifier": "t_contract$_SNM_$10080",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 3771,
+                      "id": 5213,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transfer",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 7419,
-                      "src": "26944:14:5",
+                      "referencedDeclaration": 10965,
+                      "src": "26944:14:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 3779,
+                    "id": 5221,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84558,15 +84558,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26944:53:5",
+                    "src": "26944:53:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3780,
+                  "id": 5222,
                   "nodeType": "ExpressionStatement",
-                  "src": "26944:53:5"
+                  "src": "26944:53:7"
                 },
                 {
                   "expression": {
@@ -84574,12 +84574,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3782,
+                        "id": 5224,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "27020:5:5",
+                        "referencedDeclaration": 10800,
+                        "src": "27020:5:7",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -84593,18 +84593,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 3781,
+                      "id": 5223,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "27007:12:5",
+                      "referencedDeclaration": 11323,
+                      "src": "27007:12:7",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 3783,
+                    "id": 5225,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84612,71 +84612,71 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "27007:19:5",
+                    "src": "27007:19:7",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3784,
+                  "id": 5226,
                   "nodeType": "ExpressionStatement",
-                  "src": "27007:19:5"
+                  "src": "27007:19:7"
                 }
               ]
             },
             "documentation": null,
-            "id": 3786,
+            "id": 5228,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3767,
+                "id": 5209,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3766,
+                  "id": 5208,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "26917:9:5",
+                  "referencedDeclaration": 10830,
+                  "src": "26917:9:7",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26917:9:5"
+                "src": "26917:9:7"
               }
             ],
             "name": "KillMarket",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3765,
+              "id": 5207,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26914:2:5"
+              "src": "26914:2:7"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3768,
+              "id": 5210,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26934:0:5"
+              "src": "26934:0:7"
             },
-            "scope": 3787,
-            "src": "26895:138:5",
+            "scope": 5229,
+            "src": "26895:138:7",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 3788,
-        "src": "254:26781:5"
+        "scope": 5230,
+        "src": "254:26781:7"
       }
     ],
-    "src": "0:27036:5"
+    "src": "0:27036:7"
   },
   "compiler": {
     "name": "solc",
@@ -84897,5 +84897,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.415Z"
-}
+  "updatedAt": "2019-01-10T13:57:40.027Z"
+}
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Migrations.json b/blockchain/source/migration_artifacts/contracts/Migrations.json
index 50a8861dc..3fd184654 100644
--- a/blockchain/source/migration_artifacts/contracts/Migrations.json
+++ b/blockchain/source/migration_artifacts/contracts/Migrations.json
@@ -1281,5 +1281,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-24T11:55:10.284Z"
+  "updatedAt": "2019-01-10T14:00:11.056Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
index b102c6931..b9cba3ea3 100644
--- a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
+++ b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
@@ -25734,5 +25734,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-24T11:55:10.302Z"
+  "updatedAt": "2019-01-10T14:00:11.125Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/OracleUSD.json b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
index 0ad9633ee..b75fcf386 100644
--- a/blockchain/source/migration_artifacts/contracts/OracleUSD.json
+++ b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
@@ -114,24 +114,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040526001805534801561001457600080fd5b5060008054600160a060020a0319908116339081179091161790556102c58061003e6000396000f30060806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820be6f69c6a3f6722d576a1b501aff2cf9b9de7b8c862ddb317bd0d7808c5a41ad0029",
-  "deployedBytecode": "0x60806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820be6f69c6a3f6722d576a1b501aff2cf9b9de7b8c862ddb317bd0d7808c5a41ad0029",
-  "sourceMap": "89:416:8:-;;;146:1;126:21;;191:55;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:18;:18;;-1:-1:-1;;;;;;567:18:18;;;575:10;567:18;;;221::8;;;;;;89:416;;;;;;",
-  "deployedSourceMap": "89:416:8:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;252:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;252:156:8;;;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;;;;;-1:-1:-1;;;;;238:20:18;;;;;;;;;;;;;;414:89:8;;8:9:-1;5:2;;;30:1;27;20:12;5:2;414:89:8;;;;;;;;;;;;;;;;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;252:156:8;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;333:1:8;324:10;;316:19;;;;;;345:12;:21;;;381:20;;;;;;;;;;;;;;;;;252:156;:::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:18;;:::o;414:89:8:-;484:12;;414:89;:::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o",
-  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract OracleUSD is Ownable {\n\n    uint currentPrice = 1;\n\n    event PriceChanged(uint price);\n\n    constructor() public{\n        owner = msg.sender;\n    }\n\n    function setCurrentPrice(uint _price) public onlyOwner{\n        require(_price > 0);\n        currentPrice = _price;\n        emit PriceChanged(_price);\n    }\n\n    function getCurrentPrice() public view returns (uint){\n        return currentPrice;\n    }\n}\n",
+  "bytecode": "0x60806040526001805534801561001457600080fd5b5060008054600160a060020a0319908116339081179091161790556102c58061003e6000396000f30060806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582017c8960aec5d89e3899911aa2faa4f94936492fa882d20c6373fefeae5bd80450029",
+  "deployedBytecode": "0x60806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582017c8960aec5d89e3899911aa2faa4f94936492fa882d20c6373fefeae5bd80450029",
+  "sourceMap": "89:417:9:-;;;146:1;126:21;;191:55;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;221::9;;;;;;89:417;;;;;;",
+  "deployedSourceMap": "89:417:9:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;252:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;252:156:9;;;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;414:90:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;414:90:9;;;;;;;;;;;;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;252:156:9;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;333:1:9;324:10;;316:19;;;;;;345:12;:21;;;381:20;;;;;;;;;;;;;;;;;252:156;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;414:90:9:-;485:12;;414:90;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract OracleUSD is Ownable {\n\n    uint currentPrice = 1;\n\n    event PriceChanged(uint price);\n\n    constructor() public{\n        owner = msg.sender;\n    }\n\n    function setCurrentPrice(uint _price) public onlyOwner{\n        require(_price > 0);\n        currentPrice = _price;\n        emit PriceChanged(_price);\n    }\n\n    function getCurrentPrice() public view returns (uint) {\n        return currentPrice;\n    }\n}\n",
   "sourcePath": "contracts/OracleUSD.sol",
   "ast": {
     "absolutePath": "contracts/OracleUSD.sol",
     "exportedSymbols": {
       "OracleUSD": [
-        4903
+        8677
       ]
     },
-    "id": 4904,
+    "id": 8678,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 4853,
+        "id": 8627,
         "literals": [
           "solidity",
           "^",
@@ -139,16 +139,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:8"
+        "src": "0:24:9"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 4854,
+        "id": 8628,
         "nodeType": "ImportDirective",
-        "scope": 4904,
-        "sourceUnit": 7337,
-        "src": "27:59:8",
+        "scope": 8678,
+        "sourceUnit": 10883,
+        "src": "27:59:9",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -158,42 +158,42 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4855,
+              "id": 8629,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "111:7:8",
+              "referencedDeclaration": 10882,
+              "src": "111:7:9",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 4856,
+            "id": 8630,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:8"
+            "src": "111:7:9"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 4903,
+        "id": 8677,
         "linearizedBaseContracts": [
-          4903,
-          7336
+          8677,
+          10882
         ],
         "name": "OracleUSD",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 4859,
+            "id": 8633,
             "name": "currentPrice",
             "nodeType": "VariableDeclaration",
-            "scope": 4903,
-            "src": "126:21:8",
+            "scope": 8677,
+            "src": "126:21:9",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -201,10 +201,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 4857,
+              "id": 8631,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "126:4:8",
+              "src": "126:4:9",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -213,14 +213,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "31",
-              "id": 4858,
+              "id": 8632,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "146:1:8",
+              "src": "146:1:9",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_1_by_1",
@@ -233,21 +233,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4863,
+            "id": 8637,
             "name": "PriceChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4862,
+              "id": 8636,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4861,
+                  "id": 8635,
                   "indexed": false,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4863,
-                  "src": "173:10:8",
+                  "scope": 8637,
+                  "src": "173:10:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -255,10 +255,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4860,
+                    "id": 8634,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "173:4:8",
+                    "src": "173:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -268,32 +268,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "172:12:8"
+              "src": "172:12:9"
             },
-            "src": "154:31:8"
+            "src": "154:31:9"
           },
           {
             "body": {
-              "id": 4871,
+              "id": 8645,
               "nodeType": "Block",
-              "src": "211:35:8",
+              "src": "211:35:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4869,
+                    "id": 8643,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4866,
+                      "id": 8640,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "221:5:8",
+                      "referencedDeclaration": 10800,
+                      "src": "221:5:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -305,18 +305,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4867,
+                        "id": 8641,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "229:3:8",
+                        "referencedDeclaration": 11315,
+                        "src": "229:3:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4868,
+                      "id": 8642,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -324,26 +324,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "229:10:8",
+                      "src": "229:10:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "221:18:8",
+                    "src": "221:18:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4870,
+                  "id": 8644,
                   "nodeType": "ExpressionStatement",
-                  "src": "221:18:8"
+                  "src": "221:18:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4872,
+            "id": 8646,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -351,29 +351,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4864,
+              "id": 8638,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "202:2:8"
+              "src": "202:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4865,
+              "id": 8639,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "211:0:8"
+              "src": "211:0:9"
             },
-            "scope": 4903,
-            "src": "191:55:8",
+            "scope": 8677,
+            "src": "191:55:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4893,
+              "id": 8667,
               "nodeType": "Block",
-              "src": "306:102:8",
+              "src": "306:102:9",
               "statements": [
                 {
                   "expression": {
@@ -385,19 +385,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 4882,
+                        "id": 8656,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4880,
+                          "id": 8654,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4874,
-                          "src": "324:6:8",
+                          "referencedDeclaration": 8648,
+                          "src": "324:6:9",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -408,14 +408,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 4881,
+                          "id": 8655,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "333:1:8",
+                          "src": "333:1:9",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -423,7 +423,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "324:10:8",
+                        "src": "324:10:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -437,21 +437,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4879,
+                      "id": 8653,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "316:7:8",
+                      "referencedDeclaration": 11318,
+                      "src": "316:7:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4883,
+                    "id": 8657,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -459,32 +459,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "316:19:8",
+                    "src": "316:19:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4884,
+                  "id": 8658,
                   "nodeType": "ExpressionStatement",
-                  "src": "316:19:8"
+                  "src": "316:19:9"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4887,
+                    "id": 8661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4885,
+                      "id": 8659,
                       "name": "currentPrice",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4859,
-                      "src": "345:12:8",
+                      "referencedDeclaration": 8633,
+                      "src": "345:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -494,26 +494,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4886,
+                      "id": 8660,
                       "name": "_price",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4874,
-                      "src": "360:6:8",
+                      "referencedDeclaration": 8648,
+                      "src": "360:6:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "345:21:8",
+                    "src": "345:21:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4888,
+                  "id": 8662,
                   "nodeType": "ExpressionStatement",
-                  "src": "345:21:8"
+                  "src": "345:21:9"
                 },
                 {
                   "eventCall": {
@@ -521,12 +521,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4890,
+                        "id": 8664,
                         "name": "_price",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4874,
-                        "src": "394:6:8",
+                        "referencedDeclaration": 8648,
+                        "src": "394:6:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -540,18 +540,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4889,
+                      "id": 8663,
                       "name": "PriceChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4863,
-                      "src": "381:12:8",
+                      "referencedDeclaration": 8637,
+                      "src": "381:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4891,
+                    "id": 8665,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -559,57 +559,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "381:20:8",
+                    "src": "381:20:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4892,
+                  "id": 8666,
                   "nodeType": "EmitStatement",
-                  "src": "376:25:8"
+                  "src": "376:25:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4894,
+            "id": 8668,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4877,
+                "id": 8651,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4876,
+                  "id": 8650,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "297:9:8",
+                  "referencedDeclaration": 10830,
+                  "src": "297:9:9",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "297:9:8"
+                "src": "297:9:9"
               }
             ],
             "name": "setCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4875,
+              "id": 8649,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4874,
+                  "id": 8648,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4894,
-                  "src": "277:11:8",
+                  "scope": 8668,
+                  "src": "277:11:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -617,10 +617,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4873,
+                    "id": 8647,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "277:4:8",
+                    "src": "277:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -630,50 +630,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "276:13:8"
+              "src": "276:13:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4878,
+              "id": 8652,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "306:0:8"
+              "src": "306:0:9"
             },
-            "scope": 4903,
-            "src": "252:156:8",
+            "scope": 8677,
+            "src": "252:156:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4901,
+              "id": 8675,
               "nodeType": "Block",
-              "src": "467:36:8",
+              "src": "468:36:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4899,
+                    "id": 8673,
                     "name": "currentPrice",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4859,
-                    "src": "484:12:8",
+                    "referencedDeclaration": 8633,
+                    "src": "485:12:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4898,
-                  "id": 4900,
+                  "functionReturnParameters": 8672,
+                  "id": 8674,
                   "nodeType": "Return",
-                  "src": "477:19:8"
+                  "src": "478:19:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4902,
+            "id": 8676,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -681,23 +681,23 @@
             "name": "getCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4895,
+              "id": 8669,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "438:2:8"
+              "src": "438:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4898,
+              "id": 8672,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4897,
+                  "id": 8671,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4902,
-                  "src": "462:4:8",
+                  "scope": 8676,
+                  "src": "462:4:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -705,10 +705,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4896,
+                    "id": 8670,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "462:4:8",
+                    "src": "462:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -718,33 +718,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "461:6:8"
+              "src": "461:6:9"
             },
-            "scope": 4903,
-            "src": "414:89:8",
+            "scope": 8677,
+            "src": "414:90:9",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 4904,
-        "src": "89:416:8"
+        "scope": 8678,
+        "src": "89:417:9"
       }
     ],
-    "src": "0:506:8"
+    "src": "0:507:9"
   },
   "legacyAST": {
     "absolutePath": "contracts/OracleUSD.sol",
     "exportedSymbols": {
       "OracleUSD": [
-        4903
+        8677
       ]
     },
-    "id": 4904,
+    "id": 8678,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 4853,
+        "id": 8627,
         "literals": [
           "solidity",
           "^",
@@ -752,16 +752,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:8"
+        "src": "0:24:9"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 4854,
+        "id": 8628,
         "nodeType": "ImportDirective",
-        "scope": 4904,
-        "sourceUnit": 7337,
-        "src": "27:59:8",
+        "scope": 8678,
+        "sourceUnit": 10883,
+        "src": "27:59:9",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -771,42 +771,42 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4855,
+              "id": 8629,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "111:7:8",
+              "referencedDeclaration": 10882,
+              "src": "111:7:9",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 4856,
+            "id": 8630,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:8"
+            "src": "111:7:9"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 4903,
+        "id": 8677,
         "linearizedBaseContracts": [
-          4903,
-          7336
+          8677,
+          10882
         ],
         "name": "OracleUSD",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 4859,
+            "id": 8633,
             "name": "currentPrice",
             "nodeType": "VariableDeclaration",
-            "scope": 4903,
-            "src": "126:21:8",
+            "scope": 8677,
+            "src": "126:21:9",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -814,10 +814,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 4857,
+              "id": 8631,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "126:4:8",
+              "src": "126:4:9",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -826,14 +826,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "31",
-              "id": 4858,
+              "id": 8632,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "146:1:8",
+              "src": "146:1:9",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_1_by_1",
@@ -846,21 +846,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4863,
+            "id": 8637,
             "name": "PriceChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4862,
+              "id": 8636,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4861,
+                  "id": 8635,
                   "indexed": false,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4863,
-                  "src": "173:10:8",
+                  "scope": 8637,
+                  "src": "173:10:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -868,10 +868,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4860,
+                    "id": 8634,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "173:4:8",
+                    "src": "173:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -881,32 +881,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "172:12:8"
+              "src": "172:12:9"
             },
-            "src": "154:31:8"
+            "src": "154:31:9"
           },
           {
             "body": {
-              "id": 4871,
+              "id": 8645,
               "nodeType": "Block",
-              "src": "211:35:8",
+              "src": "211:35:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4869,
+                    "id": 8643,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4866,
+                      "id": 8640,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "221:5:8",
+                      "referencedDeclaration": 10800,
+                      "src": "221:5:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -918,18 +918,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4867,
+                        "id": 8641,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "229:3:8",
+                        "referencedDeclaration": 11315,
+                        "src": "229:3:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4868,
+                      "id": 8642,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -937,26 +937,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "229:10:8",
+                      "src": "229:10:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "221:18:8",
+                    "src": "221:18:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4870,
+                  "id": 8644,
                   "nodeType": "ExpressionStatement",
-                  "src": "221:18:8"
+                  "src": "221:18:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4872,
+            "id": 8646,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -964,29 +964,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4864,
+              "id": 8638,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "202:2:8"
+              "src": "202:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4865,
+              "id": 8639,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "211:0:8"
+              "src": "211:0:9"
             },
-            "scope": 4903,
-            "src": "191:55:8",
+            "scope": 8677,
+            "src": "191:55:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4893,
+              "id": 8667,
               "nodeType": "Block",
-              "src": "306:102:8",
+              "src": "306:102:9",
               "statements": [
                 {
                   "expression": {
@@ -998,19 +998,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 4882,
+                        "id": 8656,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4880,
+                          "id": 8654,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4874,
-                          "src": "324:6:8",
+                          "referencedDeclaration": 8648,
+                          "src": "324:6:9",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1021,14 +1021,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 4881,
+                          "id": 8655,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "333:1:8",
+                          "src": "333:1:9",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1036,7 +1036,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "324:10:8",
+                        "src": "324:10:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1050,21 +1050,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4879,
+                      "id": 8653,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "316:7:8",
+                      "referencedDeclaration": 11318,
+                      "src": "316:7:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4883,
+                    "id": 8657,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1072,32 +1072,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "316:19:8",
+                    "src": "316:19:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4884,
+                  "id": 8658,
                   "nodeType": "ExpressionStatement",
-                  "src": "316:19:8"
+                  "src": "316:19:9"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4887,
+                    "id": 8661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4885,
+                      "id": 8659,
                       "name": "currentPrice",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4859,
-                      "src": "345:12:8",
+                      "referencedDeclaration": 8633,
+                      "src": "345:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1107,26 +1107,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4886,
+                      "id": 8660,
                       "name": "_price",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4874,
-                      "src": "360:6:8",
+                      "referencedDeclaration": 8648,
+                      "src": "360:6:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "345:21:8",
+                    "src": "345:21:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4888,
+                  "id": 8662,
                   "nodeType": "ExpressionStatement",
-                  "src": "345:21:8"
+                  "src": "345:21:9"
                 },
                 {
                   "eventCall": {
@@ -1134,12 +1134,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4890,
+                        "id": 8664,
                         "name": "_price",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4874,
-                        "src": "394:6:8",
+                        "referencedDeclaration": 8648,
+                        "src": "394:6:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1153,18 +1153,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4889,
+                      "id": 8663,
                       "name": "PriceChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4863,
-                      "src": "381:12:8",
+                      "referencedDeclaration": 8637,
+                      "src": "381:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4891,
+                    "id": 8665,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1172,57 +1172,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "381:20:8",
+                    "src": "381:20:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4892,
+                  "id": 8666,
                   "nodeType": "EmitStatement",
-                  "src": "376:25:8"
+                  "src": "376:25:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4894,
+            "id": 8668,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4877,
+                "id": 8651,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4876,
+                  "id": 8650,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "297:9:8",
+                  "referencedDeclaration": 10830,
+                  "src": "297:9:9",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "297:9:8"
+                "src": "297:9:9"
               }
             ],
             "name": "setCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4875,
+              "id": 8649,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4874,
+                  "id": 8648,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4894,
-                  "src": "277:11:8",
+                  "scope": 8668,
+                  "src": "277:11:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1230,10 +1230,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4873,
+                    "id": 8647,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "277:4:8",
+                    "src": "277:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1243,50 +1243,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "276:13:8"
+              "src": "276:13:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4878,
+              "id": 8652,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "306:0:8"
+              "src": "306:0:9"
             },
-            "scope": 4903,
-            "src": "252:156:8",
+            "scope": 8677,
+            "src": "252:156:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4901,
+              "id": 8675,
               "nodeType": "Block",
-              "src": "467:36:8",
+              "src": "468:36:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4899,
+                    "id": 8673,
                     "name": "currentPrice",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4859,
-                    "src": "484:12:8",
+                    "referencedDeclaration": 8633,
+                    "src": "485:12:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4898,
-                  "id": 4900,
+                  "functionReturnParameters": 8672,
+                  "id": 8674,
                   "nodeType": "Return",
-                  "src": "477:19:8"
+                  "src": "478:19:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 4902,
+            "id": 8676,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1294,23 +1294,23 @@
             "name": "getCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4895,
+              "id": 8669,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "438:2:8"
+              "src": "438:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4898,
+              "id": 8672,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4897,
+                  "id": 8671,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4902,
-                  "src": "462:4:8",
+                  "scope": 8676,
+                  "src": "462:4:9",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1318,10 +1318,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4896,
+                    "id": 8670,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "462:4:8",
+                    "src": "462:4:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1331,20 +1331,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "461:6:8"
+              "src": "461:6:9"
             },
-            "scope": 4903,
-            "src": "414:89:8",
+            "scope": 8677,
+            "src": "414:90:9",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 4904,
-        "src": "89:416:8"
+        "scope": 8678,
+        "src": "89:417:9"
       }
     ],
-    "src": "0:506:8"
+    "src": "0:507:9"
   },
   "compiler": {
     "name": "solc",
@@ -1401,5 +1401,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.328Z"
-}
+  "updatedAt": "2019-01-10T14:00:11.057Z"
+}
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Ownable.json b/blockchain/source/migration_artifacts/contracts/Ownable.json
index f571597d5..baebf9b78 100644
--- a/blockchain/source/migration_artifacts/contracts/Ownable.json
+++ b/blockchain/source/migration_artifacts/contracts/Ownable.json
@@ -76,22 +76,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b5060008054600160a060020a0319163317905561020b806100326000396000f3006080604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a6811461005b5780638da5cb5b14610072578063f2fde38b146100a3575b600080fd5b34801561006757600080fd5b506100706100c4565b005b34801561007e57600080fd5b50610087610130565b60408051600160a060020a039092168252519081900360200190f35b3480156100af57600080fd5b50610070600160a060020a036004351661013f565b600054600160a060020a031633146100db57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a0316331461015657600080fd5b61015f81610162565b50565b600160a060020a038116151561017757600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f1c58dca1f6c12ae4235b4425b0c7f7b887fccf38f35218945a4f1dff7ac6c1a0029",
   "deployedBytecode": "0x6080604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a6811461005b5780638da5cb5b14610072578063f2fde38b146100a3575b600080fd5b34801561006757600080fd5b506100706100c4565b005b34801561007e57600080fd5b50610087610130565b60408051600160a060020a039092168252519081900360200190f35b3480156100af57600080fd5b50610070600160a060020a036004351661013f565b600054600160a060020a031633146100db57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a0316331461015657600080fd5b61015f81610162565b50565b600160a060020a038116151561017757600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f1c58dca1f6c12ae4235b4425b0c7f7b887fccf38f35218945a4f1dff7ac6c1a0029",
-  "sourceMap": "217:1468:1:-;;;540:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:1;:18;;-1:-1:-1;;;;;;567:18:1;575:10;567:18;;;217:1468;;;;;;",
-  "deployedSourceMap": "217:1468:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1001:111;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:1;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:1;;;;;;;;-1:-1:-1;;;;;238:20:1;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:1;-1:-1:-1;;;;;1274:103:1;;;;;1001:111;719:5;;-1:-1:-1;;;;;719:5:1;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:1;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:1;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:1;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:1;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:1;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:1;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:1;-1:-1:-1;;;;;1661:17:1;;;;;;;;;;1512:171::o",
+  "sourceMap": "217:1468:16:-;;;540:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;575:10;567:18;;;217:1468;;;;;;",
+  "deployedSourceMap": "217:1468:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1001:111;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;1001:111;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.24;\n\n\n/**\n * @title Ownable\n * @dev The Ownable contract has an owner address, and provides basic authorization control\n * functions, this simplifies the implementation of \"user permissions\".\n */\ncontract Ownable {\n  address public owner;\n\n\n  event OwnershipRenounced(address indexed previousOwner);\n  event OwnershipTransferred(\n    address indexed previousOwner,\n    address indexed newOwner\n  );\n\n\n  /**\n   * @dev The Ownable constructor sets the original `owner` of the contract to the sender\n   * account.\n   */\n  constructor() public {\n    owner = msg.sender;\n  }\n\n  /**\n   * @dev Throws if called by any account other than the owner.\n   */\n  modifier onlyOwner() {\n    require(msg.sender == owner);\n    _;\n  }\n\n  /**\n   * @dev Allows the current owner to relinquish control of the contract.\n   * @notice Renouncing to ownership will leave the contract without an owner.\n   * It will not be possible to call the functions with the `onlyOwner`\n   * modifier anymore.\n   */\n  function renounceOwnership() public onlyOwner {\n    emit OwnershipRenounced(owner);\n    owner = address(0);\n  }\n\n  /**\n   * @dev Allows the current owner to transfer control of the contract to a newOwner.\n   * @param _newOwner The address to transfer ownership to.\n   */\n  function transferOwnership(address _newOwner) public onlyOwner {\n    _transferOwnership(_newOwner);\n  }\n\n  /**\n   * @dev Transfers control of the contract to a newOwner.\n   * @param _newOwner The address to transfer ownership to.\n   */\n  function _transferOwnership(address _newOwner) internal {\n    require(_newOwner != address(0));\n    emit OwnershipTransferred(owner, _newOwner);\n    owner = _newOwner;\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
     "exportedSymbols": {
       "Ownable": [
-        282
+        10882
       ]
     },
-    "id": 283,
+    "id": 10883,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 198,
+        "id": 10798,
         "literals": [
           "solidity",
           "^",
@@ -99,7 +99,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:1"
+        "src": "0:24:16"
       },
       {
         "baseContracts": [],
@@ -107,20 +107,20 @@
         "contractKind": "contract",
         "documentation": "@title Ownable\n@dev The Ownable contract has an owner address, and provides basic authorization control\nfunctions, this simplifies the implementation of \"user permissions\".",
         "fullyImplemented": true,
-        "id": 282,
+        "id": 10882,
         "linearizedBaseContracts": [
-          282
+          10882
         ],
         "name": "Ownable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 200,
+            "id": 10800,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 282,
-            "src": "238:20:1",
+            "scope": 10882,
+            "src": "238:20:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -128,10 +128,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 199,
+              "id": 10799,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "238:7:1",
+              "src": "238:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -143,21 +143,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 204,
+            "id": 10804,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 203,
+              "id": 10803,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 202,
+                  "id": 10802,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 204,
-                  "src": "289:29:1",
+                  "scope": 10804,
+                  "src": "289:29:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -165,10 +165,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 201,
+                    "id": 10801,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "289:7:1",
+                    "src": "289:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -178,28 +178,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "288:31:1"
+              "src": "288:31:16"
             },
-            "src": "264:56:1"
+            "src": "264:56:16"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 210,
+            "id": 10810,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 209,
+              "id": 10809,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 206,
+                  "id": 10806,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 210,
-                  "src": "355:29:1",
+                  "scope": 10810,
+                  "src": "355:29:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -207,10 +207,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 205,
+                    "id": 10805,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "355:7:1",
+                    "src": "355:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -221,12 +221,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 208,
+                  "id": 10808,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 210,
-                  "src": "390:24:1",
+                  "scope": 10810,
+                  "src": "390:24:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -234,10 +234,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 207,
+                    "id": 10807,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "390:7:1",
+                    "src": "390:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -247,32 +247,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "349:69:1"
+              "src": "349:69:16"
             },
-            "src": "323:96:1"
+            "src": "323:96:16"
           },
           {
             "body": {
-              "id": 218,
+              "id": 10818,
               "nodeType": "Block",
-              "src": "561:29:1",
+              "src": "561:29:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 216,
+                    "id": 10816,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 213,
+                      "id": 10813,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "567:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "567:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -284,18 +284,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 214,
+                        "id": 10814,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 297,
-                        "src": "575:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "575:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 215,
+                      "id": 10815,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -303,26 +303,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "575:10:1",
+                      "src": "575:10:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "567:18:1",
+                    "src": "567:18:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 217,
+                  "id": 10817,
                   "nodeType": "ExpressionStatement",
-                  "src": "567:18:1"
+                  "src": "567:18:16"
                 }
               ]
             },
             "documentation": "@dev The Ownable constructor sets the original `owner` of the contract to the sender\naccount.",
-            "id": 219,
+            "id": 10819,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -330,29 +330,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 211,
+              "id": 10811,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:1"
+              "src": "551:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 212,
+              "id": 10812,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "561:0:1"
+              "src": "561:0:16"
             },
-            "scope": 282,
-            "src": "540:50:1",
+            "scope": 10882,
+            "src": "540:50:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 229,
+              "id": 10829,
               "nodeType": "Block",
-              "src": "691:46:1",
+              "src": "691:46:16",
               "statements": [
                 {
                   "expression": {
@@ -364,7 +364,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 225,
+                        "id": 10825,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -373,18 +373,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 222,
+                            "id": 10822,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 297,
-                            "src": "705:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "705:3:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 223,
+                          "id": 10823,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -392,7 +392,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "705:10:1",
+                          "src": "705:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -402,18 +402,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 224,
+                          "id": 10824,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 200,
-                          "src": "719:5:1",
+                          "referencedDeclaration": 10800,
+                          "src": "719:5:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "705:19:1",
+                        "src": "705:19:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -427,21 +427,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 221,
+                      "id": 10821,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        300,
-                        301
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 300,
-                      "src": "697:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "697:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 226,
+                    "id": 10826,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -449,41 +449,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "697:28:1",
+                    "src": "697:28:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 227,
+                  "id": 10827,
                   "nodeType": "ExpressionStatement",
-                  "src": "697:28:1"
+                  "src": "697:28:16"
                 },
                 {
-                  "id": 228,
+                  "id": 10828,
                   "nodeType": "PlaceholderStatement",
-                  "src": "731:1:1"
+                  "src": "731:1:16"
                 }
               ]
             },
             "documentation": "@dev Throws if called by any account other than the owner.",
-            "id": 230,
+            "id": 10830,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 220,
+              "id": 10820,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "688:2:1"
+              "src": "688:2:16"
             },
-            "src": "670:67:1",
+            "src": "670:67:16",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 245,
+              "id": 10845,
               "nodeType": "Block",
-              "src": "1047:65:1",
+              "src": "1047:65:16",
               "statements": [
                 {
                   "eventCall": {
@@ -491,12 +491,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 236,
+                        "id": 10836,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 200,
-                        "src": "1077:5:1",
+                        "referencedDeclaration": 10800,
+                        "src": "1077:5:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -510,18 +510,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 235,
+                      "id": 10835,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 204,
-                      "src": "1058:18:1",
+                      "referencedDeclaration": 10804,
+                      "src": "1058:18:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 237,
+                    "id": 10837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -529,32 +529,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1058:25:1",
+                    "src": "1058:25:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 238,
+                  "id": 10838,
                   "nodeType": "EmitStatement",
-                  "src": "1053:30:1"
+                  "src": "1053:30:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 243,
+                    "id": 10843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 239,
+                      "id": 10839,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "1089:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "1089:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -568,14 +568,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 241,
+                          "id": 10841,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1105:1:1",
+                          "src": "1105:1:16",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -591,20 +591,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 240,
+                        "id": 10840,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "1097:7:1",
+                        "src": "1097:7:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 242,
+                      "id": 10842,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -612,76 +612,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:10:1",
+                      "src": "1097:10:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1089:18:1",
+                    "src": "1089:18:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 244,
+                  "id": 10844,
                   "nodeType": "ExpressionStatement",
-                  "src": "1089:18:1"
+                  "src": "1089:18:16"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to relinquish control of the contract.\n@notice Renouncing to ownership will leave the contract without an owner.\nIt will not be possible to call the functions with the `onlyOwner`\nmodifier anymore.",
-            "id": 246,
+            "id": 10846,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 233,
+                "id": 10833,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 232,
+                  "id": 10832,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 230,
-                  "src": "1037:9:1",
+                  "referencedDeclaration": 10830,
+                  "src": "1037:9:16",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1037:9:1"
+                "src": "1037:9:16"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 231,
+              "id": 10831,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1027:2:1"
+              "src": "1027:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 234,
+              "id": 10834,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1047:0:1"
+              "src": "1047:0:16"
             },
-            "scope": 282,
-            "src": "1001:111:1",
+            "scope": 10882,
+            "src": "1001:111:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 257,
+              "id": 10857,
               "nodeType": "Block",
-              "src": "1337:40:1",
+              "src": "1337:40:16",
               "statements": [
                 {
                   "expression": {
@@ -689,12 +689,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 254,
+                        "id": 10854,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 248,
-                        "src": "1362:9:1",
+                        "referencedDeclaration": 10848,
+                        "src": "1362:9:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -708,18 +708,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 253,
+                      "id": 10853,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 281,
-                      "src": "1343:18:1",
+                      "referencedDeclaration": 10881,
+                      "src": "1343:18:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 255,
+                    "id": 10855,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -727,57 +727,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1343:29:1",
+                    "src": "1343:29:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 256,
+                  "id": 10856,
                   "nodeType": "ExpressionStatement",
-                  "src": "1343:29:1"
+                  "src": "1343:29:16"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to transfer control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 258,
+            "id": 10858,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 251,
+                "id": 10851,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 250,
+                  "id": 10850,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 230,
-                  "src": "1327:9:1",
+                  "referencedDeclaration": 10830,
+                  "src": "1327:9:16",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1327:9:1"
+                "src": "1327:9:16"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 249,
+              "id": 10849,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 248,
+                  "id": 10848,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 258,
-                  "src": "1301:17:1",
+                  "scope": 10858,
+                  "src": "1301:17:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -785,10 +785,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 247,
+                    "id": 10847,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1301:7:1",
+                    "src": "1301:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -798,26 +798,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1300:19:1"
+              "src": "1300:19:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 252,
+              "id": 10852,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1337:0:1"
+              "src": "1337:0:16"
             },
-            "scope": 282,
-            "src": "1274:103:1",
+            "scope": 10882,
+            "src": "1274:103:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 280,
+              "id": 10880,
               "nodeType": "Block",
-              "src": "1568:115:1",
+              "src": "1568:115:16",
               "statements": [
                 {
                   "expression": {
@@ -829,19 +829,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 268,
+                        "id": 10868,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 264,
+                          "id": 10864,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 260,
-                          "src": "1582:9:1",
+                          "referencedDeclaration": 10860,
+                          "src": "1582:9:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -855,14 +855,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 266,
+                              "id": 10866,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1603:1:1",
+                              "src": "1603:1:16",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -878,20 +878,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 265,
+                            "id": 10865,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1595:7:1",
+                            "src": "1595:7:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 267,
+                          "id": 10867,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -899,13 +899,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1595:10:1",
+                          "src": "1595:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1582:23:1",
+                        "src": "1582:23:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -919,21 +919,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 263,
+                      "id": 10863,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        300,
-                        301
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 300,
-                      "src": "1574:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1574:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 269,
+                    "id": 10869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -941,15 +941,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:32:1",
+                    "src": "1574:32:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 270,
+                  "id": 10870,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:32:1"
+                  "src": "1574:32:16"
                 },
                 {
                   "eventCall": {
@@ -957,12 +957,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 272,
+                        "id": 10872,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 200,
-                        "src": "1638:5:1",
+                        "referencedDeclaration": 10800,
+                        "src": "1638:5:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -970,12 +970,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 273,
+                        "id": 10873,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 260,
-                        "src": "1645:9:1",
+                        "referencedDeclaration": 10860,
+                        "src": "1645:9:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -993,18 +993,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 271,
+                      "id": 10871,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 210,
-                      "src": "1617:20:1",
+                      "referencedDeclaration": 10810,
+                      "src": "1617:20:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 274,
+                    "id": 10874,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1012,32 +1012,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1617:38:1",
+                    "src": "1617:38:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 275,
+                  "id": 10875,
                   "nodeType": "EmitStatement",
-                  "src": "1612:43:1"
+                  "src": "1612:43:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 278,
+                    "id": 10878,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 276,
+                      "id": 10876,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "1661:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "1661:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1047,31 +1047,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 277,
+                      "id": 10877,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 260,
-                      "src": "1669:9:1",
+                      "referencedDeclaration": 10860,
+                      "src": "1669:9:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1661:17:1",
+                    "src": "1661:17:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 279,
+                  "id": 10879,
                   "nodeType": "ExpressionStatement",
-                  "src": "1661:17:1"
+                  "src": "1661:17:16"
                 }
               ]
             },
             "documentation": "@dev Transfers control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 281,
+            "id": 10881,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1079,16 +1079,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 261,
+              "id": 10861,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 260,
+                  "id": 10860,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 281,
-                  "src": "1540:17:1",
+                  "scope": 10881,
+                  "src": "1540:17:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1096,10 +1096,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 259,
+                    "id": 10859,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1540:7:1",
+                    "src": "1540:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1109,40 +1109,40 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1539:19:1"
+              "src": "1539:19:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 262,
+              "id": 10862,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1568:0:1"
+              "src": "1568:0:16"
             },
-            "scope": 282,
-            "src": "1512:171:1",
+            "scope": 10882,
+            "src": "1512:171:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 283,
-        "src": "217:1468:1"
+        "scope": 10883,
+        "src": "217:1468:16"
       }
     ],
-    "src": "0:1686:1"
+    "src": "0:1686:16"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
     "exportedSymbols": {
       "Ownable": [
-        282
+        10882
       ]
     },
-    "id": 283,
+    "id": 10883,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 198,
+        "id": 10798,
         "literals": [
           "solidity",
           "^",
@@ -1150,7 +1150,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:1"
+        "src": "0:24:16"
       },
       {
         "baseContracts": [],
@@ -1158,20 +1158,20 @@
         "contractKind": "contract",
         "documentation": "@title Ownable\n@dev The Ownable contract has an owner address, and provides basic authorization control\nfunctions, this simplifies the implementation of \"user permissions\".",
         "fullyImplemented": true,
-        "id": 282,
+        "id": 10882,
         "linearizedBaseContracts": [
-          282
+          10882
         ],
         "name": "Ownable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 200,
+            "id": 10800,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 282,
-            "src": "238:20:1",
+            "scope": 10882,
+            "src": "238:20:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1179,10 +1179,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 199,
+              "id": 10799,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "238:7:1",
+              "src": "238:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -1194,21 +1194,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 204,
+            "id": 10804,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 203,
+              "id": 10803,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 202,
+                  "id": 10802,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 204,
-                  "src": "289:29:1",
+                  "scope": 10804,
+                  "src": "289:29:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1216,10 +1216,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 201,
+                    "id": 10801,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "289:7:1",
+                    "src": "289:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1229,28 +1229,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "288:31:1"
+              "src": "288:31:16"
             },
-            "src": "264:56:1"
+            "src": "264:56:16"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 210,
+            "id": 10810,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 209,
+              "id": 10809,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 206,
+                  "id": 10806,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 210,
-                  "src": "355:29:1",
+                  "scope": 10810,
+                  "src": "355:29:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1258,10 +1258,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 205,
+                    "id": 10805,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "355:7:1",
+                    "src": "355:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1272,12 +1272,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 208,
+                  "id": 10808,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 210,
-                  "src": "390:24:1",
+                  "scope": 10810,
+                  "src": "390:24:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1285,10 +1285,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 207,
+                    "id": 10807,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "390:7:1",
+                    "src": "390:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1298,32 +1298,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "349:69:1"
+              "src": "349:69:16"
             },
-            "src": "323:96:1"
+            "src": "323:96:16"
           },
           {
             "body": {
-              "id": 218,
+              "id": 10818,
               "nodeType": "Block",
-              "src": "561:29:1",
+              "src": "561:29:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 216,
+                    "id": 10816,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 213,
+                      "id": 10813,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "567:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "567:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1335,18 +1335,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 214,
+                        "id": 10814,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 297,
-                        "src": "575:3:1",
+                        "referencedDeclaration": 11315,
+                        "src": "575:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 215,
+                      "id": 10815,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1354,26 +1354,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "575:10:1",
+                      "src": "575:10:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "567:18:1",
+                    "src": "567:18:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 217,
+                  "id": 10817,
                   "nodeType": "ExpressionStatement",
-                  "src": "567:18:1"
+                  "src": "567:18:16"
                 }
               ]
             },
             "documentation": "@dev The Ownable constructor sets the original `owner` of the contract to the sender\naccount.",
-            "id": 219,
+            "id": 10819,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1381,29 +1381,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 211,
+              "id": 10811,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:1"
+              "src": "551:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 212,
+              "id": 10812,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "561:0:1"
+              "src": "561:0:16"
             },
-            "scope": 282,
-            "src": "540:50:1",
+            "scope": 10882,
+            "src": "540:50:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 229,
+              "id": 10829,
               "nodeType": "Block",
-              "src": "691:46:1",
+              "src": "691:46:16",
               "statements": [
                 {
                   "expression": {
@@ -1415,7 +1415,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 225,
+                        "id": 10825,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1424,18 +1424,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 222,
+                            "id": 10822,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 297,
-                            "src": "705:3:1",
+                            "referencedDeclaration": 11315,
+                            "src": "705:3:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 223,
+                          "id": 10823,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1443,7 +1443,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "705:10:1",
+                          "src": "705:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1453,18 +1453,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 224,
+                          "id": 10824,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 200,
-                          "src": "719:5:1",
+                          "referencedDeclaration": 10800,
+                          "src": "719:5:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "705:19:1",
+                        "src": "705:19:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1478,21 +1478,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 221,
+                      "id": 10821,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        300,
-                        301
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 300,
-                      "src": "697:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "697:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 226,
+                    "id": 10826,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1500,41 +1500,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "697:28:1",
+                    "src": "697:28:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 227,
+                  "id": 10827,
                   "nodeType": "ExpressionStatement",
-                  "src": "697:28:1"
+                  "src": "697:28:16"
                 },
                 {
-                  "id": 228,
+                  "id": 10828,
                   "nodeType": "PlaceholderStatement",
-                  "src": "731:1:1"
+                  "src": "731:1:16"
                 }
               ]
             },
             "documentation": "@dev Throws if called by any account other than the owner.",
-            "id": 230,
+            "id": 10830,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 220,
+              "id": 10820,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "688:2:1"
+              "src": "688:2:16"
             },
-            "src": "670:67:1",
+            "src": "670:67:16",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 245,
+              "id": 10845,
               "nodeType": "Block",
-              "src": "1047:65:1",
+              "src": "1047:65:16",
               "statements": [
                 {
                   "eventCall": {
@@ -1542,12 +1542,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 236,
+                        "id": 10836,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 200,
-                        "src": "1077:5:1",
+                        "referencedDeclaration": 10800,
+                        "src": "1077:5:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1561,18 +1561,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 235,
+                      "id": 10835,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 204,
-                      "src": "1058:18:1",
+                      "referencedDeclaration": 10804,
+                      "src": "1058:18:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 237,
+                    "id": 10837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1580,32 +1580,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1058:25:1",
+                    "src": "1058:25:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 238,
+                  "id": 10838,
                   "nodeType": "EmitStatement",
-                  "src": "1053:30:1"
+                  "src": "1053:30:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 243,
+                    "id": 10843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 239,
+                      "id": 10839,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "1089:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "1089:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1619,14 +1619,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 241,
+                          "id": 10841,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1105:1:1",
+                          "src": "1105:1:16",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1642,20 +1642,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 240,
+                        "id": 10840,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "1097:7:1",
+                        "src": "1097:7:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 242,
+                      "id": 10842,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1663,76 +1663,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:10:1",
+                      "src": "1097:10:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1089:18:1",
+                    "src": "1089:18:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 244,
+                  "id": 10844,
                   "nodeType": "ExpressionStatement",
-                  "src": "1089:18:1"
+                  "src": "1089:18:16"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to relinquish control of the contract.\n@notice Renouncing to ownership will leave the contract without an owner.\nIt will not be possible to call the functions with the `onlyOwner`\nmodifier anymore.",
-            "id": 246,
+            "id": 10846,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 233,
+                "id": 10833,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 232,
+                  "id": 10832,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 230,
-                  "src": "1037:9:1",
+                  "referencedDeclaration": 10830,
+                  "src": "1037:9:16",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1037:9:1"
+                "src": "1037:9:16"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 231,
+              "id": 10831,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1027:2:1"
+              "src": "1027:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 234,
+              "id": 10834,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1047:0:1"
+              "src": "1047:0:16"
             },
-            "scope": 282,
-            "src": "1001:111:1",
+            "scope": 10882,
+            "src": "1001:111:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 257,
+              "id": 10857,
               "nodeType": "Block",
-              "src": "1337:40:1",
+              "src": "1337:40:16",
               "statements": [
                 {
                   "expression": {
@@ -1740,12 +1740,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 254,
+                        "id": 10854,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 248,
-                        "src": "1362:9:1",
+                        "referencedDeclaration": 10848,
+                        "src": "1362:9:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1759,18 +1759,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 253,
+                      "id": 10853,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 281,
-                      "src": "1343:18:1",
+                      "referencedDeclaration": 10881,
+                      "src": "1343:18:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 255,
+                    "id": 10855,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1778,57 +1778,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1343:29:1",
+                    "src": "1343:29:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 256,
+                  "id": 10856,
                   "nodeType": "ExpressionStatement",
-                  "src": "1343:29:1"
+                  "src": "1343:29:16"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to transfer control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 258,
+            "id": 10858,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 251,
+                "id": 10851,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 250,
+                  "id": 10850,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 230,
-                  "src": "1327:9:1",
+                  "referencedDeclaration": 10830,
+                  "src": "1327:9:16",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1327:9:1"
+                "src": "1327:9:16"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 249,
+              "id": 10849,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 248,
+                  "id": 10848,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 258,
-                  "src": "1301:17:1",
+                  "scope": 10858,
+                  "src": "1301:17:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1836,10 +1836,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 247,
+                    "id": 10847,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1301:7:1",
+                    "src": "1301:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1849,26 +1849,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1300:19:1"
+              "src": "1300:19:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 252,
+              "id": 10852,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1337:0:1"
+              "src": "1337:0:16"
             },
-            "scope": 282,
-            "src": "1274:103:1",
+            "scope": 10882,
+            "src": "1274:103:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 280,
+              "id": 10880,
               "nodeType": "Block",
-              "src": "1568:115:1",
+              "src": "1568:115:16",
               "statements": [
                 {
                   "expression": {
@@ -1880,19 +1880,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 268,
+                        "id": 10868,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 264,
+                          "id": 10864,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 260,
-                          "src": "1582:9:1",
+                          "referencedDeclaration": 10860,
+                          "src": "1582:9:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1906,14 +1906,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 266,
+                              "id": 10866,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1603:1:1",
+                              "src": "1603:1:16",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1929,20 +1929,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 265,
+                            "id": 10865,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1595:7:1",
+                            "src": "1595:7:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 267,
+                          "id": 10867,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1950,13 +1950,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1595:10:1",
+                          "src": "1595:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1582:23:1",
+                        "src": "1582:23:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1970,21 +1970,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 263,
+                      "id": 10863,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        300,
-                        301
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 300,
-                      "src": "1574:7:1",
+                      "referencedDeclaration": 11318,
+                      "src": "1574:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 269,
+                    "id": 10869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1992,15 +1992,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:32:1",
+                    "src": "1574:32:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 270,
+                  "id": 10870,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:32:1"
+                  "src": "1574:32:16"
                 },
                 {
                   "eventCall": {
@@ -2008,12 +2008,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 272,
+                        "id": 10872,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 200,
-                        "src": "1638:5:1",
+                        "referencedDeclaration": 10800,
+                        "src": "1638:5:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2021,12 +2021,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 273,
+                        "id": 10873,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 260,
-                        "src": "1645:9:1",
+                        "referencedDeclaration": 10860,
+                        "src": "1645:9:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2044,18 +2044,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 271,
+                      "id": 10871,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 210,
-                      "src": "1617:20:1",
+                      "referencedDeclaration": 10810,
+                      "src": "1617:20:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 274,
+                    "id": 10874,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2063,32 +2063,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1617:38:1",
+                    "src": "1617:38:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 275,
+                  "id": 10875,
                   "nodeType": "EmitStatement",
-                  "src": "1612:43:1"
+                  "src": "1612:43:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 278,
+                    "id": 10878,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 276,
+                      "id": 10876,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 200,
-                      "src": "1661:5:1",
+                      "referencedDeclaration": 10800,
+                      "src": "1661:5:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2098,31 +2098,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 277,
+                      "id": 10877,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 260,
-                      "src": "1669:9:1",
+                      "referencedDeclaration": 10860,
+                      "src": "1669:9:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1661:17:1",
+                    "src": "1661:17:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 279,
+                  "id": 10879,
                   "nodeType": "ExpressionStatement",
-                  "src": "1661:17:1"
+                  "src": "1661:17:16"
                 }
               ]
             },
             "documentation": "@dev Transfers control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 281,
+            "id": 10881,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2130,16 +2130,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 261,
+              "id": 10861,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 260,
+                  "id": 10860,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 281,
-                  "src": "1540:17:1",
+                  "scope": 10881,
+                  "src": "1540:17:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2147,10 +2147,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 259,
+                    "id": 10859,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1540:7:1",
+                    "src": "1540:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2160,27 +2160,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1539:19:1"
+              "src": "1539:19:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 262,
+              "id": 10862,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1568:0:1"
+              "src": "1568:0:16"
             },
-            "scope": 282,
-            "src": "1512:171:1",
+            "scope": 10882,
+            "src": "1512:171:16",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 283,
-        "src": "217:1468:1"
+        "scope": 10883,
+        "src": "217:1468:16"
       }
     ],
-    "src": "0:1686:1"
+    "src": "0:1686:16"
   },
   "compiler": {
     "name": "solc",
@@ -2188,5 +2188,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T17:20:47.271Z"
+  "updatedAt": "2019-01-10T13:57:39.952Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Pausable.json b/blockchain/source/migration_artifacts/contracts/Pausable.json
index f65074880..02a577100 100644
--- a/blockchain/source/migration_artifacts/contracts/Pausable.json
+++ b/blockchain/source/migration_artifacts/contracts/Pausable.json
@@ -114,22 +114,22 @@
   ],
   "bytecode": "0x608060405260008054600160a860020a031916331790556103c4806100256000396000f3006080604052600436106100775763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633f4ba83a811461007c5780635c975abb14610093578063715018a6146100bc5780638456cb59146100d15780638da5cb5b146100e6578063f2fde38b14610117575b600080fd5b34801561008857600080fd5b50610091610138565b005b34801561009f57600080fd5b506100a86101bf565b604080519115158252519081900360200190f35b3480156100c857600080fd5b506100916101e0565b3480156100dd57600080fd5b5061009161024c565b3480156100f257600080fd5b506100fb6102e9565b60408051600160a060020a039092168252519081900360200190f35b34801561012357600080fd5b50610091600160a060020a03600435166102f8565b600054600160a060020a0316331461014f57600080fd5b60005474010000000000000000000000000000000000000000900460ff16151561017857600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005474010000000000000000000000000000000000000000900460ff1681565b600054600160a060020a031633146101f757600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a0316331461026357600080fd5b60005474010000000000000000000000000000000000000000900460ff161561028b57600080fd5b6000805474ff00000000000000000000000000000000000000001916740100000000000000000000000000000000000000001781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600054600160a060020a031681565b600054600160a060020a0316331461030f57600080fd5b6103188161031b565b50565b600160a060020a038116151561033057600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582056cc310923aaf34129a45de00e2ba3a49678d81490d65c412f75569fc383e3870029",
   "deployedBytecode": "0x6080604052600436106100775763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633f4ba83a811461007c5780635c975abb14610093578063715018a6146100bc5780638456cb59146100d15780638da5cb5b146100e6578063f2fde38b14610117575b600080fd5b34801561008857600080fd5b50610091610138565b005b34801561009f57600080fd5b506100a86101bf565b604080519115158252519081900360200190f35b3480156100c857600080fd5b506100916101e0565b3480156100dd57600080fd5b5061009161024c565b3480156100f257600080fd5b506100fb6102e9565b60408051600160a060020a039092168252519081900360200190f35b34801561012357600080fd5b50610091600160a060020a03600435166102f8565b600054600160a060020a0316331461014f57600080fd5b60005474010000000000000000000000000000000000000000900460ff16151561017857600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005474010000000000000000000000000000000000000000900460ff1681565b600054600160a060020a031633146101f757600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a0316331461026357600080fd5b60005474010000000000000000000000000000000000000000900460ff161561028b57600080fd5b6000805474ff00000000000000000000000000000000000000001916740100000000000000000000000000000000000000001781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600054600160a060020a031681565b600054600160a060020a0316331461030f57600080fd5b6103188161031b565b50565b600160a060020a038116151561033057600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582056cc310923aaf34129a45de00e2ba3a49678d81490d65c412f75569fc383e3870029",
-  "sourceMap": "177:755:16:-;;;268:5;247:26;;-1:-1:-1;;;;;;567:18:18;575:10;567:18;;;177:755:16;;;;;;",
-  "deployedSourceMap": "177:755:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:16;;;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:16;;;;;;;;;;;;;;;;;;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;666:90:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:16;;;;238:20:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;;;;;-1:-1:-1;;;;;238:20:18;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;838:92:16;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;568:6:16;;;;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:16;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;;;;;;;:::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;666:90:16:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;416:6:16;;;;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:16;;;;;744:7;;;;720:6;744:7;666:90::o;238:20:18:-;;;-1:-1:-1;;;;;238:20:18;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o",
+  "sourceMap": "177:755:14:-;;;268:5;247:26;;-1:-1:-1;;;;;;567:18:16;575:10;567:18;;;177:755:14;;;;;;",
+  "deployedSourceMap": "177:755:14:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;;;;;;;;;;;;;;;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;838:92:14;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;;;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;;;;;;;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;;;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;;;;;744:7;;;;720:6;744:7;666:90::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.24;\n\n\nimport \"../ownership/Ownable.sol\";\n\n\n/**\n * @title Pausable\n * @dev Base contract which allows children to implement an emergency stop mechanism.\n */\ncontract Pausable is Ownable {\n  event Pause();\n  event Unpause();\n\n  bool public paused = false;\n\n\n  /**\n   * @dev Modifier to make a function callable only when the contract is not paused.\n   */\n  modifier whenNotPaused() {\n    require(!paused);\n    _;\n  }\n\n  /**\n   * @dev Modifier to make a function callable only when the contract is paused.\n   */\n  modifier whenPaused() {\n    require(paused);\n    _;\n  }\n\n  /**\n   * @dev called by the owner to pause, triggers stopped state\n   */\n  function pause() public onlyOwner whenNotPaused {\n    paused = true;\n    emit Pause();\n  }\n\n  /**\n   * @dev called by the owner to unpause, returns to normal state\n   */\n  function unpause() public onlyOwner whenPaused {\n    paused = false;\n    emit Unpause();\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
     "exportedSymbols": {
       "Pausable": [
-        7156
+        10702
       ]
     },
-    "id": 7157,
+    "id": 10703,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7098,
+        "id": 10644,
         "literals": [
           "solidity",
           "^",
@@ -137,16 +137,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:16"
+        "src": "0:24:14"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "../ownership/Ownable.sol",
-        "id": 7099,
+        "id": 10645,
         "nodeType": "ImportDirective",
-        "scope": 7157,
-        "sourceUnit": 7337,
-        "src": "27:34:16",
+        "scope": 10703,
+        "sourceUnit": 10883,
+        "src": "27:34:14",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -156,31 +156,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7100,
+              "id": 10646,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "198:7:16",
+              "referencedDeclaration": 10882,
+              "src": "198:7:14",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 7101,
+            "id": 10647,
             "nodeType": "InheritanceSpecifier",
-            "src": "198:7:16"
+            "src": "198:7:14"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": "@title Pausable\n@dev Base contract which allows children to implement an emergency stop mechanism.",
         "fullyImplemented": true,
-        "id": 7156,
+        "id": 10702,
         "linearizedBaseContracts": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "name": "Pausable",
         "nodeType": "ContractDefinition",
@@ -188,38 +188,38 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7103,
+            "id": 10649,
             "name": "Pause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7102,
+              "id": 10648,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "221:2:16"
+              "src": "221:2:14"
             },
-            "src": "210:14:16"
+            "src": "210:14:14"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7105,
+            "id": 10651,
             "name": "Unpause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7104,
+              "id": 10650,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "240:2:16"
+              "src": "240:2:14"
             },
-            "src": "227:16:16"
+            "src": "227:16:14"
           },
           {
             "constant": false,
-            "id": 7108,
+            "id": 10654,
             "name": "paused",
             "nodeType": "VariableDeclaration",
-            "scope": 7156,
-            "src": "247:26:16",
+            "scope": 10702,
+            "src": "247:26:14",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -227,10 +227,10 @@
               "typeString": "bool"
             },
             "typeName": {
-              "id": 7106,
+              "id": 10652,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
-              "src": "247:4:16",
+              "src": "247:4:14",
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
@@ -239,14 +239,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "66616c7365",
-              "id": 7107,
+              "id": 10653,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "bool",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "268:5:16",
+              "src": "268:5:14",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
@@ -258,9 +258,9 @@
           },
           {
             "body": {
-              "id": 7116,
+              "id": 10662,
               "nodeType": "Block",
-              "src": "401:34:16",
+              "src": "401:34:14",
               "statements": [
                 {
                   "expression": {
@@ -268,7 +268,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7112,
+                        "id": 10658,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -276,15 +276,15 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "415:7:16",
+                        "src": "415:7:14",
                         "subExpression": {
                           "argumentTypes": null,
-                          "id": 7111,
+                          "id": 10657,
                           "name": "paused",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7108,
-                          "src": "416:6:16",
+                          "referencedDeclaration": 10654,
+                          "src": "416:6:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -303,21 +303,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7110,
+                      "id": 10656,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "407:7:16",
+                      "referencedDeclaration": 11318,
+                      "src": "407:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7113,
+                    "id": 10659,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -325,41 +325,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "407:16:16",
+                    "src": "407:16:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7114,
+                  "id": 10660,
                   "nodeType": "ExpressionStatement",
-                  "src": "407:16:16"
+                  "src": "407:16:14"
                 },
                 {
-                  "id": 7115,
+                  "id": 10661,
                   "nodeType": "PlaceholderStatement",
-                  "src": "429:1:16"
+                  "src": "429:1:14"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is not paused.",
-            "id": 7117,
+            "id": 10663,
             "name": "whenNotPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 7109,
+              "id": 10655,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "398:2:16"
+              "src": "398:2:14"
             },
-            "src": "376:59:16",
+            "src": "376:59:14",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 7124,
+              "id": 10670,
               "nodeType": "Block",
-              "src": "554:33:16",
+              "src": "554:33:14",
               "statements": [
                 {
                   "expression": {
@@ -367,12 +367,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7120,
+                        "id": 10666,
                         "name": "paused",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7108,
-                        "src": "568:6:16",
+                        "referencedDeclaration": 10654,
+                        "src": "568:6:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -386,21 +386,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7119,
+                      "id": 10665,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "560:7:16",
+                      "referencedDeclaration": 11318,
+                      "src": "560:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7121,
+                    "id": 10667,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -408,58 +408,58 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "560:15:16",
+                    "src": "560:15:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7122,
+                  "id": 10668,
                   "nodeType": "ExpressionStatement",
-                  "src": "560:15:16"
+                  "src": "560:15:14"
                 },
                 {
-                  "id": 7123,
+                  "id": 10669,
                   "nodeType": "PlaceholderStatement",
-                  "src": "581:1:16"
+                  "src": "581:1:14"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is paused.",
-            "id": 7125,
+            "id": 10671,
             "name": "whenPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 7118,
+              "id": 10664,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:16"
+              "src": "551:2:14"
             },
-            "src": "532:55:16",
+            "src": "532:55:14",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 7139,
+              "id": 10685,
               "nodeType": "Block",
-              "src": "714:42:16",
+              "src": "714:42:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7134,
+                    "id": 10680,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 7132,
+                      "id": 10678,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7108,
-                      "src": "720:6:16",
+                      "referencedDeclaration": 10654,
+                      "src": "720:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -470,14 +470,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 7133,
+                      "id": 10679,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "729:4:16",
+                      "src": "729:4:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -485,15 +485,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "720:13:16",
+                    "src": "720:13:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 7135,
+                  "id": 10681,
                   "nodeType": "ExpressionStatement",
-                  "src": "720:13:16"
+                  "src": "720:13:14"
                 },
                 {
                   "eventCall": {
@@ -501,18 +501,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 7136,
+                      "id": 10682,
                       "name": "Pause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7103,
-                      "src": "744:5:16",
+                      "referencedDeclaration": 10649,
+                      "src": "744:5:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 7137,
+                    "id": 10683,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -520,106 +520,106 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "744:7:16",
+                    "src": "744:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7138,
+                  "id": 10684,
                   "nodeType": "EmitStatement",
-                  "src": "739:12:16"
+                  "src": "739:12:14"
                 }
               ]
             },
             "documentation": "@dev called by the owner to pause, triggers stopped state",
-            "id": 7140,
+            "id": 10686,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 7128,
+                "id": 10674,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7127,
+                  "id": 10673,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "690:9:16",
+                  "referencedDeclaration": 10830,
+                  "src": "690:9:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "690:9:16"
+                "src": "690:9:14"
               },
               {
                 "arguments": null,
-                "id": 7130,
+                "id": 10676,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7129,
+                  "id": 10675,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "700:13:16",
+                  "referencedDeclaration": 10663,
+                  "src": "700:13:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "700:13:16"
+                "src": "700:13:14"
               }
             ],
             "name": "pause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7126,
+              "id": 10672,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "680:2:16"
+              "src": "680:2:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7131,
+              "id": 10677,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "714:0:16"
+              "src": "714:0:14"
             },
-            "scope": 7156,
-            "src": "666:90:16",
+            "scope": 10702,
+            "src": "666:90:14",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7154,
+              "id": 10700,
               "nodeType": "Block",
-              "src": "885:45:16",
+              "src": "885:45:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7149,
+                    "id": 10695,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 7147,
+                      "id": 10693,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7108,
-                      "src": "891:6:16",
+                      "referencedDeclaration": 10654,
+                      "src": "891:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -630,14 +630,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 7148,
+                      "id": 10694,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "900:5:16",
+                      "src": "900:5:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -645,15 +645,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "891:14:16",
+                    "src": "891:14:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 7150,
+                  "id": 10696,
                   "nodeType": "ExpressionStatement",
-                  "src": "891:14:16"
+                  "src": "891:14:14"
                 },
                 {
                   "eventCall": {
@@ -661,18 +661,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 7151,
+                      "id": 10697,
                       "name": "Unpause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7105,
-                      "src": "916:7:16",
+                      "referencedDeclaration": 10651,
+                      "src": "916:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 7152,
+                    "id": 10698,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -680,103 +680,103 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "916:9:16",
+                    "src": "916:9:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7153,
+                  "id": 10699,
                   "nodeType": "EmitStatement",
-                  "src": "911:14:16"
+                  "src": "911:14:14"
                 }
               ]
             },
             "documentation": "@dev called by the owner to unpause, returns to normal state",
-            "id": 7155,
+            "id": 10701,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 7143,
+                "id": 10689,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7142,
+                  "id": 10688,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "864:9:16",
+                  "referencedDeclaration": 10830,
+                  "src": "864:9:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "864:9:16"
+                "src": "864:9:14"
               },
               {
                 "arguments": null,
-                "id": 7145,
+                "id": 10691,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7144,
+                  "id": 10690,
                   "name": "whenPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7125,
-                  "src": "874:10:16",
+                  "referencedDeclaration": 10671,
+                  "src": "874:10:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "874:10:16"
+                "src": "874:10:14"
               }
             ],
             "name": "unpause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7141,
+              "id": 10687,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "854:2:16"
+              "src": "854:2:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7146,
+              "id": 10692,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "885:0:16"
+              "src": "885:0:14"
             },
-            "scope": 7156,
-            "src": "838:92:16",
+            "scope": 10702,
+            "src": "838:92:14",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 7157,
-        "src": "177:755:16"
+        "scope": 10703,
+        "src": "177:755:14"
       }
     ],
-    "src": "0:933:16"
+    "src": "0:933:14"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
     "exportedSymbols": {
       "Pausable": [
-        7156
+        10702
       ]
     },
-    "id": 7157,
+    "id": 10703,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7098,
+        "id": 10644,
         "literals": [
           "solidity",
           "^",
@@ -784,16 +784,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:16"
+        "src": "0:24:14"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "../ownership/Ownable.sol",
-        "id": 7099,
+        "id": 10645,
         "nodeType": "ImportDirective",
-        "scope": 7157,
-        "sourceUnit": 7337,
-        "src": "27:34:16",
+        "scope": 10703,
+        "sourceUnit": 10883,
+        "src": "27:34:14",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -803,31 +803,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7100,
+              "id": 10646,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "198:7:16",
+              "referencedDeclaration": 10882,
+              "src": "198:7:14",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 7101,
+            "id": 10647,
             "nodeType": "InheritanceSpecifier",
-            "src": "198:7:16"
+            "src": "198:7:14"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": "@title Pausable\n@dev Base contract which allows children to implement an emergency stop mechanism.",
         "fullyImplemented": true,
-        "id": 7156,
+        "id": 10702,
         "linearizedBaseContracts": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "name": "Pausable",
         "nodeType": "ContractDefinition",
@@ -835,38 +835,38 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7103,
+            "id": 10649,
             "name": "Pause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7102,
+              "id": 10648,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "221:2:16"
+              "src": "221:2:14"
             },
-            "src": "210:14:16"
+            "src": "210:14:14"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 7105,
+            "id": 10651,
             "name": "Unpause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 7104,
+              "id": 10650,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "240:2:16"
+              "src": "240:2:14"
             },
-            "src": "227:16:16"
+            "src": "227:16:14"
           },
           {
             "constant": false,
-            "id": 7108,
+            "id": 10654,
             "name": "paused",
             "nodeType": "VariableDeclaration",
-            "scope": 7156,
-            "src": "247:26:16",
+            "scope": 10702,
+            "src": "247:26:14",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -874,10 +874,10 @@
               "typeString": "bool"
             },
             "typeName": {
-              "id": 7106,
+              "id": 10652,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
-              "src": "247:4:16",
+              "src": "247:4:14",
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
@@ -886,14 +886,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "66616c7365",
-              "id": 7107,
+              "id": 10653,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "bool",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "268:5:16",
+              "src": "268:5:14",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
@@ -905,9 +905,9 @@
           },
           {
             "body": {
-              "id": 7116,
+              "id": 10662,
               "nodeType": "Block",
-              "src": "401:34:16",
+              "src": "401:34:14",
               "statements": [
                 {
                   "expression": {
@@ -915,7 +915,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7112,
+                        "id": 10658,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -923,15 +923,15 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "415:7:16",
+                        "src": "415:7:14",
                         "subExpression": {
                           "argumentTypes": null,
-                          "id": 7111,
+                          "id": 10657,
                           "name": "paused",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7108,
-                          "src": "416:6:16",
+                          "referencedDeclaration": 10654,
+                          "src": "416:6:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -950,21 +950,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7110,
+                      "id": 10656,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "407:7:16",
+                      "referencedDeclaration": 11318,
+                      "src": "407:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7113,
+                    "id": 10659,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -972,41 +972,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "407:16:16",
+                    "src": "407:16:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7114,
+                  "id": 10660,
                   "nodeType": "ExpressionStatement",
-                  "src": "407:16:16"
+                  "src": "407:16:14"
                 },
                 {
-                  "id": 7115,
+                  "id": 10661,
                   "nodeType": "PlaceholderStatement",
-                  "src": "429:1:16"
+                  "src": "429:1:14"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is not paused.",
-            "id": 7117,
+            "id": 10663,
             "name": "whenNotPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 7109,
+              "id": 10655,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "398:2:16"
+              "src": "398:2:14"
             },
-            "src": "376:59:16",
+            "src": "376:59:14",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 7124,
+              "id": 10670,
               "nodeType": "Block",
-              "src": "554:33:16",
+              "src": "554:33:14",
               "statements": [
                 {
                   "expression": {
@@ -1014,12 +1014,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7120,
+                        "id": 10666,
                         "name": "paused",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7108,
-                        "src": "568:6:16",
+                        "referencedDeclaration": 10654,
+                        "src": "568:6:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1033,21 +1033,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7119,
+                      "id": 10665,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "560:7:16",
+                      "referencedDeclaration": 11318,
+                      "src": "560:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7121,
+                    "id": 10667,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1055,58 +1055,58 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "560:15:16",
+                    "src": "560:15:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7122,
+                  "id": 10668,
                   "nodeType": "ExpressionStatement",
-                  "src": "560:15:16"
+                  "src": "560:15:14"
                 },
                 {
-                  "id": 7123,
+                  "id": 10669,
                   "nodeType": "PlaceholderStatement",
-                  "src": "581:1:16"
+                  "src": "581:1:14"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is paused.",
-            "id": 7125,
+            "id": 10671,
             "name": "whenPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 7118,
+              "id": 10664,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:16"
+              "src": "551:2:14"
             },
-            "src": "532:55:16",
+            "src": "532:55:14",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 7139,
+              "id": 10685,
               "nodeType": "Block",
-              "src": "714:42:16",
+              "src": "714:42:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7134,
+                    "id": 10680,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 7132,
+                      "id": 10678,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7108,
-                      "src": "720:6:16",
+                      "referencedDeclaration": 10654,
+                      "src": "720:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1117,14 +1117,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 7133,
+                      "id": 10679,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "729:4:16",
+                      "src": "729:4:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1132,15 +1132,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "720:13:16",
+                    "src": "720:13:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 7135,
+                  "id": 10681,
                   "nodeType": "ExpressionStatement",
-                  "src": "720:13:16"
+                  "src": "720:13:14"
                 },
                 {
                   "eventCall": {
@@ -1148,18 +1148,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 7136,
+                      "id": 10682,
                       "name": "Pause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7103,
-                      "src": "744:5:16",
+                      "referencedDeclaration": 10649,
+                      "src": "744:5:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 7137,
+                    "id": 10683,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1167,106 +1167,106 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "744:7:16",
+                    "src": "744:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7138,
+                  "id": 10684,
                   "nodeType": "EmitStatement",
-                  "src": "739:12:16"
+                  "src": "739:12:14"
                 }
               ]
             },
             "documentation": "@dev called by the owner to pause, triggers stopped state",
-            "id": 7140,
+            "id": 10686,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 7128,
+                "id": 10674,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7127,
+                  "id": 10673,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "690:9:16",
+                  "referencedDeclaration": 10830,
+                  "src": "690:9:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "690:9:16"
+                "src": "690:9:14"
               },
               {
                 "arguments": null,
-                "id": 7130,
+                "id": 10676,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7129,
+                  "id": 10675,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "700:13:16",
+                  "referencedDeclaration": 10663,
+                  "src": "700:13:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "700:13:16"
+                "src": "700:13:14"
               }
             ],
             "name": "pause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7126,
+              "id": 10672,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "680:2:16"
+              "src": "680:2:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7131,
+              "id": 10677,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "714:0:16"
+              "src": "714:0:14"
             },
-            "scope": 7156,
-            "src": "666:90:16",
+            "scope": 10702,
+            "src": "666:90:14",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7154,
+              "id": 10700,
               "nodeType": "Block",
-              "src": "885:45:16",
+              "src": "885:45:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7149,
+                    "id": 10695,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 7147,
+                      "id": 10693,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7108,
-                      "src": "891:6:16",
+                      "referencedDeclaration": 10654,
+                      "src": "891:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1277,14 +1277,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 7148,
+                      "id": 10694,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "900:5:16",
+                      "src": "900:5:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1292,15 +1292,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "891:14:16",
+                    "src": "891:14:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 7150,
+                  "id": 10696,
                   "nodeType": "ExpressionStatement",
-                  "src": "891:14:16"
+                  "src": "891:14:14"
                 },
                 {
                   "eventCall": {
@@ -1308,18 +1308,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 7151,
+                      "id": 10697,
                       "name": "Unpause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7105,
-                      "src": "916:7:16",
+                      "referencedDeclaration": 10651,
+                      "src": "916:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 7152,
+                    "id": 10698,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1327,90 +1327,90 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "916:9:16",
+                    "src": "916:9:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7153,
+                  "id": 10699,
                   "nodeType": "EmitStatement",
-                  "src": "911:14:16"
+                  "src": "911:14:14"
                 }
               ]
             },
             "documentation": "@dev called by the owner to unpause, returns to normal state",
-            "id": 7155,
+            "id": 10701,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 7143,
+                "id": 10689,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7142,
+                  "id": 10688,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "864:9:16",
+                  "referencedDeclaration": 10830,
+                  "src": "864:9:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "864:9:16"
+                "src": "864:9:14"
               },
               {
                 "arguments": null,
-                "id": 7145,
+                "id": 10691,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 7144,
+                  "id": 10690,
                   "name": "whenPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7125,
-                  "src": "874:10:16",
+                  "referencedDeclaration": 10671,
+                  "src": "874:10:14",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "874:10:16"
+                "src": "874:10:14"
               }
             ],
             "name": "unpause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7141,
+              "id": 10687,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "854:2:16"
+              "src": "854:2:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7146,
+              "id": 10692,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "885:0:16"
+              "src": "885:0:14"
             },
-            "scope": 7156,
-            "src": "838:92:16",
+            "scope": 10702,
+            "src": "838:92:14",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 7157,
-        "src": "177:755:16"
+        "scope": 10703,
+        "src": "177:755:14"
       }
     ],
-    "src": "0:933:16"
+    "src": "0:933:14"
   },
   "compiler": {
     "name": "solc",
@@ -1418,5 +1418,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.161Z"
+  "updatedAt": "2019-01-10T13:57:39.949Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
index 4e025ee50..a862758e4 100644
--- a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
+++ b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
@@ -449,22 +449,22 @@
   ],
   "bytecode": "0x60806040526000805460a060020a60ff021916815560015534801561002357600080fd5b5060008054600160a060020a031990811633908117909116811782558152600260205260409020805460ff191660ff179055611311806100646000396000f3006080604052600436106101045763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041662707c75811461010957806274fc391461013e5780630553701a146101d75780631af60f72146101f857806323eee3e6146102355780632eb4b2a51461027a5780633e34e129146102945780633f4ba83a1461035d5780635c975abb146103725780636209a63314610387578063663b3e22146103bd578063715018a6146103d55780638456cb59146103ea5780638997d27a146103ff5780638da5cb5b1461043957806393d767421461044e578063e7bcef44146104b7578063f2fde38b146104de578063fa52c7d8146104ff575b600080fd5b34801561011557600080fd5b5061012a600160a060020a0360043516610520565b604080519115158252519081900360200190f35b34801561014a57600080fd5b50610162600160a060020a0360043516602435610564565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561019c578181015183820152602001610184565b50505050905090810190601f1680156101c95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101e357600080fd5b5061012a600160a060020a0360043516610618565b34801561020457600080fd5b50610219600160a060020a0360043516610670565b60408051600160a060020a039092168252519081900360200190f35b34801561024157600080fd5b50610256600160a060020a0360043516610706565b6040518082600481111561026657fe5b60ff16815260200191505060405180910390f35b34801561028657600080fd5b50610292600435610766565b005b3480156102a057600080fd5b506102ac600435610a48565b6040518085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561031f578181015183820152602001610307565b50505050905090810190601f16801561034c5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036957600080fd5b50610292610b1a565b34801561037e57600080fd5b5061012a610b90565b34801561039357600080fd5b506103ab600160a060020a0360043516602435610ba0565b60408051918252519081900360200190f35b3480156103c957600080fd5b506102ac600435610bc8565b3480156103e157600080fd5b50610292610c87565b3480156103f657600080fd5b50610292610cf3565b34801561040b57600080fd5b50610420600160a060020a0360043516610d6e565b60408051600092830b90920b8252519081900360200190f35b34801561044557600080fd5b50610219610d8b565b34801561045a57600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610292948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610d9a9650505050505050565b3480156104c357600080fd5b50610219600160a060020a036004351660243560000b6110c3565b3480156104ea57600080fd5b50610292600160a060020a0360043516611170565b34801561050b57600080fd5b50610420600160a060020a0360043516611193565b60008054600160a060020a0316331461053857600080fd5b50600160a060020a0381166000908152600260205260409020805460ff191660ff17905560015b919050565b600160a060020a038216600090815260046020908152604080832084845282529182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084526060939283018282801561060b5780601f106105e05761010080835404028352916020019161060b565b820191906000526020600020905b8154815290600101906020018083116105ee57829003601f168201915b5050505050905092915050565b60008054600160a060020a0316331461063057600080fd5b61063982610d6e565b60000b60001914151561064b57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600061067b33610d6e565b60000b60001914151561068d57600080fd5b60005460a060020a900460ff16156106a457600080fd5b60006106af83610d6e565b60000b136106bc57600080fd5b600160a060020a038216600081815260026020526040808220805460ff19169055517fa7a579573d398d7b67cd7450121bb250bbd060b29eabafdebc3ce0918658635c9190a25090565b60008061071583610579610564565b5111156107245750600461055f565b600061073283610515610564565b5111156107415750600361055f565b600061074f836104b1610564565b51111561075e5750600261055f565b50600161055f565b61076e611224565b60005460a060020a900460ff161561078557600080fd5b60008281526003602081815260409283902083516080810185528154600160a060020a0390811682526001808401549091168285015260028084015483880152948301805487516101009382161593909302600019011695909504601f8101859004850282018501909652858152909491936060860193919290918301828280156108515780601f1061082657610100808354040283529160200191610851565b820191906000526020600020905b81548152906001019060200180831161083457829003601f168201915b505050505081525050905033600160a060020a03168160200151600160a060020a0316148061088957508051600160a060020a031633145b806108a0575061089833610d6e565b60000b600019145b15156108ab57600080fd5b604051606082015180517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4709290819060208401908083835b602083106109025780518252601f1990920191602091820191016108e3565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161415151561094057600080fd5b60208082018051600160a060020a03908116600090815260058085526040808320818801805185529087528184205486518616855283885282852082518652885282852060001990910190559451909316825284528181209251815291909252205415156109e957604080516020818101808452600080845285830151600160a060020a031681526004835284812086860151825290925292902090516109e7929061124a565b505b6040805160208181018084526000808452868152600392839052939093209151610a189392909101919061124a565b5060405182907f9a100d2018161ede6ca34c8007992b09bbffc636a636014a922e4c875041262890600090a25050565b6000818152600360208181526040808420805460018083015460028085015494909701805486516101009482161594909402600019011697909704601f810187900487028301870190955284825287968796606096600160a060020a039586169695909316949391928391830182828015610b045780601f10610ad957610100808354040283529160200191610b04565b820191906000526020600020905b815481529060010190602001808311610ae757829003601f168201915b5050505050905093509350935093509193509193565b600054600160a060020a03163314610b3157600080fd5b60005460a060020a900460ff161515610b4957600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005460a060020a900460ff1681565b600160a060020a03919091166000908152600560209081526040808320938352929052205490565b6003602081815260009283526040928390208054600180830154600280850154968501805489516101009582161595909502600019011691909104601f8101879004870284018701909852878352600160a060020a039384169793909116959491929091830182828015610c7d5780601f10610c5257610100808354040283529160200191610c7d565b820191906000526020600020905b815481529060010190602001808311610c6057829003601f168201915b5050505050905084565b600054600160a060020a03163314610c9e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a03163314610d0a57600080fd5b60005460a060020a900460ff1615610d2157600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600160a060020a0316600090815260026020526040812054900b90565b600054600160a060020a031681565b60008054819060a060020a900460ff1615610db457600080fd5b61044c8410610de857600a60648504069150610dcf33610d6e565b60000b8260000b13151515610de357600080fd5b610dfd565b600160a060020a0385163314610dfd57600080fd5b60405183517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470918591819060208401908083835b60208310610e505780518252601f199092019160209182019101610e31565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151515610e8e57600080fd5b5060026103e884041480610fd457600160a060020a03851660009081526005602090815260408083208784529091529020541515610efd57600160a060020a038516600090815260046020908152604080832087845282529091208451610ef79286019061124a565b50610fd4565b826040518082805190602001908083835b60208310610f2d5780518252601f199092019160209182019101610f0e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916610f688686610564565b6040518082805190602001908083835b60208310610f975780518252601f199092019160209182019101610f78565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916141515610fd457600080fd5b600160a060020a0380861660008181526005602090815260408083208984528252808320805460019081019091558054810180825582516080810184523381528085019687528084018c8152606082018c815292875260038087529490962081518154908a1673ffffffffffffffffffffffffffffffffffffffff19918216178255975193810180549490991693909716929092179096559251600285015593518051929461108b9390850192919091019061124a565b50506001546040519091507fb9bb1df26fde5c1295a7ccd167330e5d6cb9df14fe4c3884669a64433cc9e76090600090a25050505050565b60006110ce33610d6e565b60000b6000191415156110e057600080fd5b60005460a060020a900460ff16156110f757600080fd5b600082810b1361110657600080fd5b61110f83610d6e565b60000b1561111c57600080fd5b600160a060020a038316600081815260026020526040808220805460ff191660ff87850b16179055517f02db26aafd16e8ecd93c4fa202917d50b1693f30b1594e57f7a432ede944eefc9190a25090919050565b600054600160a060020a0316331461118757600080fd5b611190816111a7565b50565b600260205260009081526040812054900b81565b600160a060020a03811615156111bc57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b604080516080810182526000808252602082018190529181019190915260608082015290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b6112e291905b808211156112c457600081556001016112ce565b905600a165627a7a7230582062063412dc64c0ee657ce05f8e88f1f13a7c8937a61cd4f42db5d324754e10750029",
   "deployedBytecode": "0x6080604052600436106101045763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041662707c75811461010957806274fc391461013e5780630553701a146101d75780631af60f72146101f857806323eee3e6146102355780632eb4b2a51461027a5780633e34e129146102945780633f4ba83a1461035d5780635c975abb146103725780636209a63314610387578063663b3e22146103bd578063715018a6146103d55780638456cb59146103ea5780638997d27a146103ff5780638da5cb5b1461043957806393d767421461044e578063e7bcef44146104b7578063f2fde38b146104de578063fa52c7d8146104ff575b600080fd5b34801561011557600080fd5b5061012a600160a060020a0360043516610520565b604080519115158252519081900360200190f35b34801561014a57600080fd5b50610162600160a060020a0360043516602435610564565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561019c578181015183820152602001610184565b50505050905090810190601f1680156101c95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101e357600080fd5b5061012a600160a060020a0360043516610618565b34801561020457600080fd5b50610219600160a060020a0360043516610670565b60408051600160a060020a039092168252519081900360200190f35b34801561024157600080fd5b50610256600160a060020a0360043516610706565b6040518082600481111561026657fe5b60ff16815260200191505060405180910390f35b34801561028657600080fd5b50610292600435610766565b005b3480156102a057600080fd5b506102ac600435610a48565b6040518085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561031f578181015183820152602001610307565b50505050905090810190601f16801561034c5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036957600080fd5b50610292610b1a565b34801561037e57600080fd5b5061012a610b90565b34801561039357600080fd5b506103ab600160a060020a0360043516602435610ba0565b60408051918252519081900360200190f35b3480156103c957600080fd5b506102ac600435610bc8565b3480156103e157600080fd5b50610292610c87565b3480156103f657600080fd5b50610292610cf3565b34801561040b57600080fd5b50610420600160a060020a0360043516610d6e565b60408051600092830b90920b8252519081900360200190f35b34801561044557600080fd5b50610219610d8b565b34801561045a57600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610292948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610d9a9650505050505050565b3480156104c357600080fd5b50610219600160a060020a036004351660243560000b6110c3565b3480156104ea57600080fd5b50610292600160a060020a0360043516611170565b34801561050b57600080fd5b50610420600160a060020a0360043516611193565b60008054600160a060020a0316331461053857600080fd5b50600160a060020a0381166000908152600260205260409020805460ff191660ff17905560015b919050565b600160a060020a038216600090815260046020908152604080832084845282529182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084526060939283018282801561060b5780601f106105e05761010080835404028352916020019161060b565b820191906000526020600020905b8154815290600101906020018083116105ee57829003601f168201915b5050505050905092915050565b60008054600160a060020a0316331461063057600080fd5b61063982610d6e565b60000b60001914151561064b57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600061067b33610d6e565b60000b60001914151561068d57600080fd5b60005460a060020a900460ff16156106a457600080fd5b60006106af83610d6e565b60000b136106bc57600080fd5b600160a060020a038216600081815260026020526040808220805460ff19169055517fa7a579573d398d7b67cd7450121bb250bbd060b29eabafdebc3ce0918658635c9190a25090565b60008061071583610579610564565b5111156107245750600461055f565b600061073283610515610564565b5111156107415750600361055f565b600061074f836104b1610564565b51111561075e5750600261055f565b50600161055f565b61076e611224565b60005460a060020a900460ff161561078557600080fd5b60008281526003602081815260409283902083516080810185528154600160a060020a0390811682526001808401549091168285015260028084015483880152948301805487516101009382161593909302600019011695909504601f8101859004850282018501909652858152909491936060860193919290918301828280156108515780601f1061082657610100808354040283529160200191610851565b820191906000526020600020905b81548152906001019060200180831161083457829003601f168201915b505050505081525050905033600160a060020a03168160200151600160a060020a0316148061088957508051600160a060020a031633145b806108a0575061089833610d6e565b60000b600019145b15156108ab57600080fd5b604051606082015180517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4709290819060208401908083835b602083106109025780518252601f1990920191602091820191016108e3565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161415151561094057600080fd5b60208082018051600160a060020a03908116600090815260058085526040808320818801805185529087528184205486518616855283885282852082518652885282852060001990910190559451909316825284528181209251815291909252205415156109e957604080516020818101808452600080845285830151600160a060020a031681526004835284812086860151825290925292902090516109e7929061124a565b505b6040805160208181018084526000808452868152600392839052939093209151610a189392909101919061124a565b5060405182907f9a100d2018161ede6ca34c8007992b09bbffc636a636014a922e4c875041262890600090a25050565b6000818152600360208181526040808420805460018083015460028085015494909701805486516101009482161594909402600019011697909704601f810187900487028301870190955284825287968796606096600160a060020a039586169695909316949391928391830182828015610b045780601f10610ad957610100808354040283529160200191610b04565b820191906000526020600020905b815481529060010190602001808311610ae757829003601f168201915b5050505050905093509350935093509193509193565b600054600160a060020a03163314610b3157600080fd5b60005460a060020a900460ff161515610b4957600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005460a060020a900460ff1681565b600160a060020a03919091166000908152600560209081526040808320938352929052205490565b6003602081815260009283526040928390208054600180830154600280850154968501805489516101009582161595909502600019011691909104601f8101879004870284018701909852878352600160a060020a039384169793909116959491929091830182828015610c7d5780601f10610c5257610100808354040283529160200191610c7d565b820191906000526020600020905b815481529060010190602001808311610c6057829003601f168201915b5050505050905084565b600054600160a060020a03163314610c9e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a03163314610d0a57600080fd5b60005460a060020a900460ff1615610d2157600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600160a060020a0316600090815260026020526040812054900b90565b600054600160a060020a031681565b60008054819060a060020a900460ff1615610db457600080fd5b61044c8410610de857600a60648504069150610dcf33610d6e565b60000b8260000b13151515610de357600080fd5b610dfd565b600160a060020a0385163314610dfd57600080fd5b60405183517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470918591819060208401908083835b60208310610e505780518252601f199092019160209182019101610e31565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151515610e8e57600080fd5b5060026103e884041480610fd457600160a060020a03851660009081526005602090815260408083208784529091529020541515610efd57600160a060020a038516600090815260046020908152604080832087845282529091208451610ef79286019061124a565b50610fd4565b826040518082805190602001908083835b60208310610f2d5780518252601f199092019160209182019101610f0e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916610f688686610564565b6040518082805190602001908083835b60208310610f975780518252601f199092019160209182019101610f78565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916141515610fd457600080fd5b600160a060020a0380861660008181526005602090815260408083208984528252808320805460019081019091558054810180825582516080810184523381528085019687528084018c8152606082018c815292875260038087529490962081518154908a1673ffffffffffffffffffffffffffffffffffffffff19918216178255975193810180549490991693909716929092179096559251600285015593518051929461108b9390850192919091019061124a565b50506001546040519091507fb9bb1df26fde5c1295a7ccd167330e5d6cb9df14fe4c3884669a64433cc9e76090600090a25050505050565b60006110ce33610d6e565b60000b6000191415156110e057600080fd5b60005460a060020a900460ff16156110f757600080fd5b600082810b1361110657600080fd5b61110f83610d6e565b60000b1561111c57600080fd5b600160a060020a038316600081815260026020526040808220805460ff191660ff87850b16179055517f02db26aafd16e8ecd93c4fa202917d50b1693f30b1594e57f7a432ede944eefc9190a25090919050565b600054600160a060020a0316331461118757600080fd5b611190816111a7565b50565b600260205260009081526040812054900b81565b600160a060020a03811615156111bc57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b604080516080810182526000808252602082018190529181019190915260608082015290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b6112e291905b808211156112c457600081556001016112ce565b905600a165627a7a7230582062063412dc64c0ee657ce05f8e88f1f13a7c8937a61cd4f42db5d324754e10750029",
-  "sourceMap": "150:4701:9:-;;;268:5:16;247:26;;-1:-1:-1;;;;;;247:26:16;;;;765:29:9;1045:94;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:18;:18;;-1:-1:-1;;;;;;567:18:18;;;575:10;567:18;;;1076::9;;;;;;;1104:22;;:10;:22;;;;;:28;;-1:-1:-1;;1104:28:9;;;;;150:4701;;;;;;",
-  "deployedSourceMap": "150:4701:9:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4501:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4501:143:9;-1:-1:-1;;;;;4501:143:9;;;;;;;;;;;;;;;;;;;;;;;3719:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3719:141:9;-1:-1:-1;;;;;3719:141:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3719:141:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4650:199;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4650:199:9;-1:-1:-1;;;;;4650:199:9;;;;;1454:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1454:258:9;-1:-1:-1;;;;;1454:258:9;;;;;;;;;-1:-1:-1;;;;;1454:258:9;;;;;;;;;;;;;;4015:480;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4015:480:9;-1:-1:-1;;;;;4015:480:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2890:597;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2890:597:9;;;;;;;3493:220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3493:220:9;;;;;;;;;;-1:-1:-1;;;;;3493:220:9;-1:-1:-1;;;;;3493:220:9;;;;;;-1:-1:-1;;;;;3493:220:9;-1:-1:-1;;;;;3493:220:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3493:220:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:16;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:16;;;;3866:143:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3866:143:9;-1:-1:-1;;;;;3866:143:9;;;;;;;;;;;;;;;;;;;;;;;850:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;850:51:9;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;666:90:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:16;;;;1718:120:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1718:120:9;-1:-1:-1;;;;;1718:120:9;;;;;;;;;;;;;;;;;;;;;;;;;;;238:20:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;1844:1040:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1844:1040:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1844:1040:9;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1844:1040:9;;-1:-1:-1;1844:1040:9;;-1:-1:-1;;;;;;;1844:1040:9;1145:303;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1145:303:9;-1:-1:-1;;;;;1145:303:9;;;;;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;801:42:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;801:42:9;-1:-1:-1;;;;;801:42:9;;;;;4501:143;4573:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;;4589:22:9;;;;;;:10;:22;;;;;:27;;-1:-1:-1;;4589:27:9;;;;;;731:1:18;4501:143:9;;;:::o;3719:141::-;-1:-1:-1;;;;;3822:24:9;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;3815:38;;;;;;-1:-1:-1;;3815:38:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3798:5;;3815:38;;;3822:31;3815:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3719:141;;;;:::o;4650:199::-;4725:4;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;4749:29:9;4767:10;4749:17;:29::i;:::-;:35;;-1:-1:-1;;4749:35:9;4741:44;;;;;;;;-1:-1:-1;;;;;;4795:22:9;4820:1;4795:22;;;:10;:22;;;;;:26;;-1:-1:-1;;4795:26:9;;;-1:-1:-1;;4650:199:9:o;1454:258::-;1538:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:9;233:45;;;;;;;;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;1597:1:9;1565:29;1583:10;1565:17;:29::i;:::-;:33;;;1557:42;;;;;;-1:-1:-1;;;;;1609:22:9;;1634:1;1609:22;;;:10;:22;;;;;;:26;;-1:-1:-1;;1609:26:9;;;1650:28;;;1634:1;1650:28;-1:-1:-1;1695:10:9;1454:258::o;4015:480::-;4077:13;4147:1;4106:31;4124:6;4132:4;4106:17;:31::i;:::-;:38;:42;4102:387;;;-1:-1:-1;4171:26:9;4164:33;;4102:387;4259:1;4218:31;4236:6;4244:4;4218:17;:31::i;:::-;:38;:42;4214:275;;;-1:-1:-1;4283:24:9;4276:31;;4214:275;4369:1;4328:31;4346:6;4354:4;4328:17;:31::i;:::-;:38;:42;4324:165;;;-1:-1:-1;4393:24:9;4386:31;;4324:165;-1:-1:-1;4455:23:9;4448:30;;2890:597;2961:22;;:::i;:::-;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;2986:17:9;;;;:12;:17;;;;;;;;;2961:42;;;;;;;;;-1:-1:-1;;;;;2961:42:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2961:42:9;;;;;;;;;;;;;;;;;;;;;;;;;;2986:17;;2961:42;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3032:10;-1:-1:-1;;;;;3022:20:9;:3;:6;;;-1:-1:-1;;;;;3022:20:9;;:46;;;-1:-1:-1;3046:8:9;;-1:-1:-1;;;;;3046:22:9;3058:10;3046:22;3022:46;:85;;;;3072:29;3090:10;3072:17;:29::i;:::-;:35;;-1:-1:-1;;3072:35:9;3022:85;3014:94;;;;;;;;3150:13;;3136:9;;;;3126:20;;3150:13;;;;;3126:20;;;;;3150:13;3126:20;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3126:20:9;;;;;;;;;;;;;;;;:37;;;;;3118:46;;;;;;;;3238:6;;;;;;-1:-1:-1;;;;;3221:24:9;;;;;;;:16;:24;;;;;;;3246:17;;;;;3221:43;;;;;;;;;3192:6;;3175:24;;;;;;;;;;3200:17;;3175:43;;;;;;;-1:-1:-1;;3221:47:9;;;3175:93;;3299:6;;3282:24;;;;;;;;;;3307:17;;3282:43;;;;;;;;:48;3278:127;;;3346:48;;;;;;;;;;-1:-1:-1;3346:48:9;;;3363:6;;;;-1:-1:-1;;;;;3346:24:9;;;:16;:24;;;;;3371:17;;;;3346:43;;;;;;;;:48;;;;;;:::i;:::-;;3278:127;3414:28;;;;;;;;;;-1:-1:-1;3414:28:9;;;:17;;;:12;:17;;;;;;;;:28;;;;:23;;;;;:28;;:::i;:::-;-1:-1:-1;3457:23:9;;3476:3;;3457:23;;;;;2890:597;;:::o;3493:220::-;3551:7;3603:17;;;:12;:17;;;;;;;;:22;;;3627:20;;;;3649:31;;;;;3682:23;;;;3595:111;;;;3603:22;3595:111;;;;;;;;-1:-1:-1;;3595:111:9;;;;;;;;;;;;;;;;;;;;;;;;3551:7;;;;3578:5;;-1:-1:-1;;;;;3603:22:9;;;;3627:20;;;;;3649:31;3682:23;;;;3595:111;;3682:23;3595:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3493:220;;;;;:::o;838:92:16:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;568:6:16;;-1:-1:-1;;;568:6:16;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:16;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;-1:-1:-1;;;247:26:16;;;;;:::o;3866:143:9:-;-1:-1:-1;;;;;3971:24:9;;;;3945:7;3971:24;;;:16;:24;;;;;;;;:31;;;;;;;;;3866:143::o;850:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;850:51:9;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;850:51:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;666:90:16:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:16;-1:-1:-1;;;720:13:16;;;744:7;;;;720:6;744:7;666:90::o;1718:120:9:-;-1:-1:-1;;;;;1809:22:9;1786:4;1809:22;;;:10;:22;;;;;;;;;1718:120::o;238:20:18:-;;;-1:-1:-1;;;;;238:20:18;;:::o;1844:1040:9:-;2012:19;416:6:16;;2012:19:9;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;1992:4:9;1983:13;;1979:218;;2053:2;2047:3;2039:11;;:16;2012:44;;2096:29;2114:10;2096:17;:29::i;:::-;2078:47;;:14;:47;;;;2070:56;;;;;;;;1979:218;;;-1:-1:-1;;;;;2165:20:9;;2175:10;2165:20;2157:29;;;;;;2265:13;;2244:17;;2265:13;;2254:6;;2265:13;;2244:17;;;;;2265:13;2244:17;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2244:17:9;;;;;;;;;;;;;;;;:34;;;;;2236:43;;;;;;;;-1:-1:-1;2324:1:9;2316:4;2308:12;;:17;;2335:268;;-1:-1:-1;;;;;2370:24:9;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;:36;2366:227;;;-1:-1:-1;;;;;2426:24:9;;;;;;:16;:24;;;;;;;;:31;;;;;;;;:40;;;;;;;;:::i;:::-;;2366:227;;;2570:6;2560:17;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2560:17:9;;;;;;;;;;;;;;;;2513:64;;;2523:32;2541:6;2549:5;2523:17;:32::i;:::-;2513:43;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2513:43:9;;;;;;;;;;;;;;;;:64;;;;2505:73;;;;;;;;-1:-1:-1;;;;;2647:24:9;;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;;2681:1;2647:35;;;2613:69;;;2713:17;;:21;;2693:41;;;2778:46;;;;;;;2790:10;2778:46;;;;;;;;;;;;;;;;;;;;2744:31;;;:12;:31;;;;;;;:80;;;;;;;-1:-1:-1;;2744:80:9;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2778:46;;2744:80;;;;;;;;;;;;:::i;:::-;-1:-1:-1;;2859:17:9;;2840:37;;2859:17;;-1:-1:-1;2840:37:9;;;;;1844:1040;;;;;:::o;1145:303::-;1239:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:9;233:45;;;;;;;;416:6:16;;-1:-1:-1;;;416:6:16;;;;415:7;407:16;;;;;;1275:1:9;1266:10;;;;1258:19;;;;;;1295:29;1313:10;1295:17;:29::i;:::-;:34;;;1287:43;;;;;;-1:-1:-1;;;;;1340:22:9;;;;;;:10;:22;;;;;;:31;;-1:-1:-1;;1340:31:9;;;;;;;;;1386:28;;;1340:22;1386:28;-1:-1:-1;1431:10:9;;1145:303;-1:-1:-1;1145:303:9:o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;801:42:9:-;;;;;;;;;;;;;;;:::o;1512:171:18:-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o;150:4701:9:-;;;;;;;;;-1:-1:-1;150:4701:9;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;150:4701:9;;;-1:-1:-1;150:4701:9;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o",
+  "sourceMap": "150:4701:11:-;;;268:5:14;247:26;;-1:-1:-1;;;;;;247:26:14;;;;765:29:11;1045:94;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;1076::11;;;;;;;1104:22;;:10;:22;;;;;:28;;-1:-1:-1;;1104:28:11;;;;;150:4701;;;;;;",
+  "deployedSourceMap": "150:4701:11:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4501:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4501:143:11;-1:-1:-1;;;;;4501:143:11;;;;;;;;;;;;;;;;;;;;;;;3719:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3719:141:11;-1:-1:-1;;;;;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4650:199;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4650:199:11;-1:-1:-1;;;;;4650:199:11;;;;;1454:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1454:258:11;-1:-1:-1;;;;;1454:258:11;;;;;;;;;-1:-1:-1;;;;;1454:258:11;;;;;;;;;;;;;;4015:480;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4015:480:11;-1:-1:-1;;;;;4015:480:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2890:597;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2890:597:11;;;;;;;3493:220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3493:220:11;;;;;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;3866:143:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3866:143:11;-1:-1:-1;;;;;3866:143:11;;;;;;;;;;;;;;;;;;;;;;;850:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;850:51:11;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;1718:120:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1718:120:11;-1:-1:-1;;;;;1718:120:11;;;;;;;;;;;;;;;;;;;;;;;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;1844:1040:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1844:1040:11;;-1:-1:-1;1844:1040:11;;-1:-1:-1;;;;;;;1844:1040:11;1145:303;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1145:303:11;-1:-1:-1;;;;;1145:303:11;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;801:42:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;801:42:11;-1:-1:-1;;;;;801:42:11;;;;;4501:143;4573:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;;4589:22:11;;;;;;:10;:22;;;;;:27;;-1:-1:-1;;4589:27:11;;;;;;731:1:16;4501:143:11;;;:::o;3719:141::-;-1:-1:-1;;;;;3822:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;3815:38;;;;;;-1:-1:-1;;3815:38:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3798:5;;3815:38;;;3822:31;3815:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3719:141;;;;:::o;4650:199::-;4725:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;4749:29:11;4767:10;4749:17;:29::i;:::-;:35;;-1:-1:-1;;4749:35:11;4741:44;;;;;;;;-1:-1:-1;;;;;;4795:22:11;4820:1;4795:22;;;:10;:22;;;;;:26;;-1:-1:-1;;4795:26:11;;;-1:-1:-1;;4650:199:11:o;1454:258::-;1538:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1597:1:11;1565:29;1583:10;1565:17;:29::i;:::-;:33;;;1557:42;;;;;;-1:-1:-1;;;;;1609:22:11;;1634:1;1609:22;;;:10;:22;;;;;;:26;;-1:-1:-1;;1609:26:11;;;1650:28;;;1634:1;1650:28;-1:-1:-1;1695:10:11;1454:258::o;4015:480::-;4077:13;4147:1;4106:31;4124:6;4132:4;4106:17;:31::i;:::-;:38;:42;4102:387;;;-1:-1:-1;4171:26:11;4164:33;;4102:387;4259:1;4218:31;4236:6;4244:4;4218:17;:31::i;:::-;:38;:42;4214:275;;;-1:-1:-1;4283:24:11;4276:31;;4214:275;4369:1;4328:31;4346:6;4354:4;4328:17;:31::i;:::-;:38;:42;4324:165;;;-1:-1:-1;4393:24:11;4386:31;;4324:165;-1:-1:-1;4455:23:11;4448:30;;2890:597;2961:22;;:::i;:::-;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;2986:17:11;;;;:12;:17;;;;;;;;;2961:42;;;;;;;;;-1:-1:-1;;;;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;2986:17;;2961:42;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3032:10;-1:-1:-1;;;;;3022:20:11;:3;:6;;;-1:-1:-1;;;;;3022:20:11;;:46;;;-1:-1:-1;3046:8:11;;-1:-1:-1;;;;;3046:22:11;3058:10;3046:22;3022:46;:85;;;;3072:29;3090:10;3072:17;:29::i;:::-;:35;;-1:-1:-1;;3072:35:11;3022:85;3014:94;;;;;;;;3150:13;;3136:9;;;;3126:20;;3150:13;;;;;3126:20;;;;;3150:13;3126:20;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3126:20:11;;;;;;;;;;;;;;;;:37;;;;;3118:46;;;;;;;;3238:6;;;;;;-1:-1:-1;;;;;3221:24:11;;;;;;;:16;:24;;;;;;;3246:17;;;;;3221:43;;;;;;;;;3192:6;;3175:24;;;;;;;;;;3200:17;;3175:43;;;;;;;-1:-1:-1;;3221:47:11;;;3175:93;;3299:6;;3282:24;;;;;;;;;;3307:17;;3282:43;;;;;;;;:48;3278:127;;;3346:48;;;;;;;;;;-1:-1:-1;3346:48:11;;;3363:6;;;;-1:-1:-1;;;;;3346:24:11;;;:16;:24;;;;;3371:17;;;;3346:43;;;;;;;;:48;;;;;;:::i;:::-;;3278:127;3414:28;;;;;;;;;;-1:-1:-1;3414:28:11;;;:17;;;:12;:17;;;;;;;;:28;;;;:23;;;;;:28;;:::i;:::-;-1:-1:-1;3457:23:11;;3476:3;;3457:23;;;;;2890:597;;:::o;3493:220::-;3551:7;3603:17;;;:12;:17;;;;;;;;:22;;;3627:20;;;;3649:31;;;;;3682:23;;;;3595:111;;;;3603:22;3595:111;;;;;;;;-1:-1:-1;;3595:111:11;;;;;;;;;;;;;;;;;;;;;;;;3551:7;;;;3578:5;;-1:-1:-1;;;;;3603:22:11;;;;3627:20;;;;;3649:31;3682:23;;;;3595:111;;3682:23;3595:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3493:220;;;;;:::o;838:92:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;-1:-1:-1;;;568:6:14;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;-1:-1:-1;;;247:26:14;;;;;:::o;3866:143:11:-;-1:-1:-1;;;;;3971:24:11;;;;3945:7;3971:24;;;:16;:24;;;;;;;;:31;;;;;;;;;3866:143::o;850:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;-1:-1:-1;;;720:13:14;;;744:7;;;;720:6;744:7;666:90::o;1718:120:11:-;-1:-1:-1;;;;;1809:22:11;1786:4;1809:22;;;:10;:22;;;;;;;;;1718:120::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;1844:1040:11:-;2012:19;416:6:14;;2012:19:11;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1992:4:11;1983:13;;1979:218;;2053:2;2047:3;2039:11;;:16;2012:44;;2096:29;2114:10;2096:17;:29::i;:::-;2078:47;;:14;:47;;;;2070:56;;;;;;;;1979:218;;;-1:-1:-1;;;;;2165:20:11;;2175:10;2165:20;2157:29;;;;;;2265:13;;2244:17;;2265:13;;2254:6;;2265:13;;2244:17;;;;;2265:13;2244:17;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2244:17:11;;;;;;;;;;;;;;;;:34;;;;;2236:43;;;;;;;;-1:-1:-1;2324:1:11;2316:4;2308:12;;:17;;2335:268;;-1:-1:-1;;;;;2370:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;:36;2366:227;;;-1:-1:-1;;;;;2426:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;:40;;;;;;;;:::i;:::-;;2366:227;;;2570:6;2560:17;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2560:17:11;;;;;;;;;;;;;;;;2513:64;;;2523:32;2541:6;2549:5;2523:17;:32::i;:::-;2513:43;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2513:43:11;;;;;;;;;;;;;;;;:64;;;;2505:73;;;;;;;;-1:-1:-1;;;;;2647:24:11;;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;;2681:1;2647:35;;;2613:69;;;2713:17;;:21;;2693:41;;;2778:46;;;;;;;2790:10;2778:46;;;;;;;;;;;;;;;;;;;;2744:31;;;:12;:31;;;;;;;:80;;;;;;;-1:-1:-1;;2744:80:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2778:46;;2744:80;;;;;;;;;;;;:::i;:::-;-1:-1:-1;;2859:17:11;;2840:37;;2859:17;;-1:-1:-1;2840:37:11;;;;;1844:1040;;;;;:::o;1145:303::-;1239:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1275:1:11;1266:10;;;;1258:19;;;;;;1295:29;1313:10;1295:17;:29::i;:::-;:34;;;1287:43;;;;;;-1:-1:-1;;;;;1340:22:11;;;;;;:10;:22;;;;;;:31;;-1:-1:-1;;1340:31:11;;;;;;;;;1386:28;;;1340:22;1386:28;-1:-1:-1;1431:10:11;;1145:303;-1:-1:-1;1145:303:11:o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;801:42:11:-;;;;;;;;;;;;;;;:::o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o;150:4701:11:-;;;;;;;;;-1:-1:-1;150:4701:11;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;150:4701:11;;;-1:-1:-1;150:4701:11;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"zeppelin-solidity/contracts/lifecycle/Pausable.sol\";\n\n\ncontract ProfileRegistry is Ownable, Pausable {\n\n    modifier onlySonm() {\n        require(GetValidatorLevel(msg.sender) == - 1);\n        _;\n    }\n\n    enum IdentityLevel {\n        UNKNOWN,\n        ANONYMOUS,\n        REGISTERED,\n        IDENTIFIED,\n        PROFESSIONAL\n    }\n\n    struct Certificate {\n        address from;\n\n        address to;\n\n        uint attributeType;\n\n        bytes value;\n    }\n\n    event ValidatorCreated(address indexed validator);\n\n    event ValidatorDeleted(address indexed validator);\n\n    event CertificateCreated(uint indexed id);\n\n    event CertificateUpdated(uint indexed id);\n\n    uint256 certificatesCount = 0;\n\n    mapping(address => int8) public validators;\n\n    mapping(uint256 => Certificate) public certificates;\n\n    mapping(address => mapping(uint256 => bytes)) certificateValue;\n\n    mapping(address => mapping(uint256 => uint)) certificateCount;\n\n    constructor() public {\n        owner = msg.sender;\n        validators[msg.sender] = - 1;\n    }\n\n    function AddValidator(address _validator, int8 _level) public onlySonm whenNotPaused returns (address) {\n        require(_level > 0);\n        require(GetValidatorLevel(_validator) == 0);\n        validators[_validator] = _level;\n        emit ValidatorCreated(_validator);\n        return _validator;\n    }\n\n    function RemoveValidator(address _validator) public onlySonm whenNotPaused returns (address) {\n        require(GetValidatorLevel(_validator) > 0);\n        validators[_validator] = 0;\n        emit ValidatorDeleted(_validator);\n        return _validator;\n    }\n\n    function GetValidatorLevel(address _validator) public view returns (int8) {\n        return validators[_validator];\n    }\n\n    function CreateCertificate(address _owner, uint256 _type, bytes _value) public whenNotPaused {\n        //Check validator level\n        if (_type >= 1100) {\n            int8 attributeLevel = int8(_type / 100 % 10);\n            require(attributeLevel <= GetValidatorLevel(msg.sender));\n        } else {\n            require(_owner == msg.sender);\n        }\n\n        // Check empty value\n        require(keccak256(_value) != keccak256(\"\"));\n\n        bool isMultiple = _type / 1000 == 2;\n        if (!isMultiple) {\n            if (certificateCount[_owner][_type] == 0) {\n                certificateValue[_owner][_type] = _value;\n            } else {\n                require(keccak256(GetAttributeValue(_owner, _type)) == keccak256(_value));\n            }\n        }\n\n        certificateCount[_owner][_type] = certificateCount[_owner][_type] + 1;\n\n        certificatesCount = certificatesCount + 1;\n        certificates[certificatesCount] = Certificate(msg.sender, _owner, _type, _value);\n\n        emit CertificateCreated(certificatesCount);\n    }\n\n    function RemoveCertificate(uint256 _id) public whenNotPaused {\n        Certificate memory crt = certificates[_id];\n\n        require(crt.to == msg.sender || crt.from == msg.sender || GetValidatorLevel(msg.sender) == -1);\n        require(keccak256(crt.value) != keccak256(\"\"));\n\n        certificateCount[crt.to][crt.attributeType] = certificateCount[crt.to][crt.attributeType] - 1;\n        if (certificateCount[crt.to][crt.attributeType] == 0) {\n            certificateValue[crt.to][crt.attributeType] = \"\";\n        }\n        certificates[_id].value = \"\";\n        emit CertificateUpdated(_id);\n    }\n\n    function GetCertificate(uint256 _id) public view returns (address, address, uint256, bytes) {\n        return (certificates[_id].from, certificates[_id].to, certificates[_id].attributeType, certificates[_id].value);\n    }\n\n    function GetAttributeValue(address _owner, uint256 _type) public view returns (bytes) {\n        return certificateValue[_owner][_type];\n    }\n\n    function GetAttributeCount(address _owner, uint256 _type) public view returns (uint256) {\n        return certificateCount[_owner][_type];\n    }\n\n    function GetProfileLevel(address _owner) public view returns (IdentityLevel) {\n        if (GetAttributeValue(_owner, 1401).length > 0) {\n            return IdentityLevel.PROFESSIONAL;\n        } else if (GetAttributeValue(_owner, 1301).length > 0) {\n            return IdentityLevel.IDENTIFIED;\n        } else if (GetAttributeValue(_owner, 1201).length > 0) {\n            return IdentityLevel.REGISTERED;\n        } else {\n            return IdentityLevel.ANONYMOUS;\n        }\n    }\n\n    function AddSonmValidator(address _validator) public onlyOwner returns (bool) {\n        validators[_validator] = -1;\n        return true;\n    }\n\n    function RemoveSonmValidator(address _validator) public onlyOwner returns (bool) {\n        require(GetValidatorLevel(_validator) == -1);\n        validators[_validator] = 0;\n        return true;\n    }\n}\n",
   "sourcePath": "contracts/ProfileRegistry.sol",
   "ast": {
     "absolutePath": "contracts/ProfileRegistry.sol",
     "exportedSymbols": {
       "ProfileRegistry": [
-        5469
+        10035
       ]
     },
-    "id": 5470,
+    "id": 10036,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 4905,
+        "id": 9471,
         "literals": [
           "solidity",
           "^",
@@ -472,27 +472,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:9"
+        "src": "0:24:11"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 4906,
+        "id": 9472,
         "nodeType": "ImportDirective",
-        "scope": 5470,
-        "sourceUnit": 7337,
-        "src": "27:59:9",
+        "scope": 10036,
+        "sourceUnit": 10883,
+        "src": "27:59:11",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 4907,
+        "id": 9473,
         "nodeType": "ImportDirective",
-        "scope": 5470,
-        "sourceUnit": 7157,
-        "src": "87:60:9",
+        "scope": 10036,
+        "sourceUnit": 10703,
+        "src": "87:60:11",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -502,60 +502,60 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4908,
+              "id": 9474,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "178:7:9",
+              "referencedDeclaration": 10882,
+              "src": "178:7:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 4909,
+            "id": 9475,
             "nodeType": "InheritanceSpecifier",
-            "src": "178:7:9"
+            "src": "178:7:11"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4910,
+              "id": 9476,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7156,
-              "src": "187:8:9",
+              "referencedDeclaration": 10702,
+              "src": "187:8:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$7156",
+                "typeIdentifier": "t_contract$_Pausable_$10702",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 4911,
+            "id": 9477,
             "nodeType": "InheritanceSpecifier",
-            "src": "187:8:9"
+            "src": "187:8:11"
           }
         ],
         "contractDependencies": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5469,
+        "id": 10035,
         "linearizedBaseContracts": [
-          5469,
-          7156,
-          7336
+          10035,
+          10702,
+          10882
         ],
         "name": "ProfileRegistry",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 4924,
+              "id": 9490,
               "nodeType": "Block",
-              "src": "223:73:9",
+              "src": "223:73:11",
               "statements": [
                 {
                   "expression": {
@@ -567,7 +567,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 4920,
+                        "id": 9486,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -579,18 +579,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4915,
+                                "id": 9481,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "259:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "259:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4916,
+                              "id": 9482,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -598,7 +598,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "259:10:9",
+                              "src": "259:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -612,18 +612,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 4914,
+                            "id": 9480,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "241:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "241:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 4917,
+                          "id": 9483,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -631,7 +631,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "241:29:9",
+                          "src": "241:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -641,7 +641,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4919,
+                          "id": 9485,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -649,18 +649,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "-",
                           "prefix": true,
-                          "src": "274:3:9",
+                          "src": "274:3:11",
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4918,
+                            "id": 9484,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "276:1:9",
+                            "src": "276:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1_by_1",
@@ -673,7 +673,7 @@
                             "typeString": "int_const -1"
                           }
                         },
-                        "src": "241:36:9",
+                        "src": "241:36:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -687,21 +687,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4913,
+                      "id": 9479,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "233:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "233:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4921,
+                    "id": 9487,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -709,86 +709,86 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "233:45:9",
+                    "src": "233:45:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4922,
+                  "id": 9488,
                   "nodeType": "ExpressionStatement",
-                  "src": "233:45:9"
+                  "src": "233:45:11"
                 },
                 {
-                  "id": 4923,
+                  "id": 9489,
                   "nodeType": "PlaceholderStatement",
-                  "src": "288:1:9"
+                  "src": "288:1:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 4925,
+            "id": 9491,
             "name": "onlySonm",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4912,
+              "id": 9478,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "220:2:9"
+              "src": "220:2:11"
             },
-            "src": "203:93:9",
+            "src": "203:93:11",
             "visibility": "internal"
           },
           {
             "canonicalName": "ProfileRegistry.IdentityLevel",
-            "id": 4931,
+            "id": 9497,
             "members": [
               {
-                "id": 4926,
+                "id": 9492,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "331:7:9"
+                "src": "331:7:11"
               },
               {
-                "id": 4927,
+                "id": 9493,
                 "name": "ANONYMOUS",
                 "nodeType": "EnumValue",
-                "src": "348:9:9"
+                "src": "348:9:11"
               },
               {
-                "id": 4928,
+                "id": 9494,
                 "name": "REGISTERED",
                 "nodeType": "EnumValue",
-                "src": "367:10:9"
+                "src": "367:10:11"
               },
               {
-                "id": 4929,
+                "id": 9495,
                 "name": "IDENTIFIED",
                 "nodeType": "EnumValue",
-                "src": "387:10:9"
+                "src": "387:10:11"
               },
               {
-                "id": 4930,
+                "id": 9496,
                 "name": "PROFESSIONAL",
                 "nodeType": "EnumValue",
-                "src": "407:12:9"
+                "src": "407:12:11"
               }
             ],
             "name": "IdentityLevel",
             "nodeType": "EnumDefinition",
-            "src": "302:123:9"
+            "src": "302:123:11"
           },
           {
             "canonicalName": "ProfileRegistry.Certificate",
-            "id": 4940,
+            "id": 9506,
             "members": [
               {
                 "constant": false,
-                "id": 4933,
+                "id": 9499,
                 "name": "from",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "460:12:9",
+                "scope": 9506,
+                "src": "460:12:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -796,10 +796,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 4932,
+                  "id": 9498,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "460:7:9",
+                  "src": "460:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -810,11 +810,11 @@
               },
               {
                 "constant": false,
-                "id": 4935,
+                "id": 9501,
                 "name": "to",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "483:10:9",
+                "scope": 9506,
+                "src": "483:10:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -822,10 +822,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 4934,
+                  "id": 9500,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "483:7:9",
+                  "src": "483:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -836,11 +836,11 @@
               },
               {
                 "constant": false,
-                "id": 4937,
+                "id": 9503,
                 "name": "attributeType",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "504:18:9",
+                "scope": 9506,
+                "src": "504:18:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -848,10 +848,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 4936,
+                  "id": 9502,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "504:4:9",
+                  "src": "504:4:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -862,11 +862,11 @@
               },
               {
                 "constant": false,
-                "id": 4939,
+                "id": 9505,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "533:11:9",
+                "scope": 9506,
+                "src": "533:11:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -874,10 +874,10 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 4938,
+                  "id": 9504,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "533:5:9",
+                  "src": "533:5:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -889,28 +889,28 @@
             ],
             "name": "Certificate",
             "nodeType": "StructDefinition",
-            "scope": 5469,
-            "src": "431:120:9",
+            "scope": 10035,
+            "src": "431:120:11",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4944,
+            "id": 9510,
             "name": "ValidatorCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4943,
+              "id": 9509,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4942,
+                  "id": 9508,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4944,
-                  "src": "580:25:9",
+                  "scope": 9510,
+                  "src": "580:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -918,10 +918,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4941,
+                    "id": 9507,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "580:7:9",
+                    "src": "580:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -931,28 +931,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "579:27:9"
+              "src": "579:27:11"
             },
-            "src": "557:50:9"
+            "src": "557:50:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4948,
+            "id": 9514,
             "name": "ValidatorDeleted",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4947,
+              "id": 9513,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4946,
+                  "id": 9512,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4948,
-                  "src": "636:25:9",
+                  "scope": 9514,
+                  "src": "636:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -960,10 +960,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4945,
+                    "id": 9511,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "636:7:9",
+                    "src": "636:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -973,28 +973,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "635:27:9"
+              "src": "635:27:11"
             },
-            "src": "613:50:9"
+            "src": "613:50:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4952,
+            "id": 9518,
             "name": "CertificateCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4951,
+              "id": 9517,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4950,
+                  "id": 9516,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4952,
-                  "src": "694:15:9",
+                  "scope": 9518,
+                  "src": "694:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1002,10 +1002,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4949,
+                    "id": 9515,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "694:4:9",
+                    "src": "694:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1015,28 +1015,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "693:17:9"
+              "src": "693:17:11"
             },
-            "src": "669:42:9"
+            "src": "669:42:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4956,
+            "id": 9522,
             "name": "CertificateUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4955,
+              "id": 9521,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4954,
+                  "id": 9520,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4956,
-                  "src": "742:15:9",
+                  "scope": 9522,
+                  "src": "742:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1044,10 +1044,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4953,
+                    "id": 9519,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "742:4:9",
+                    "src": "742:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1057,17 +1057,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "741:17:9"
+              "src": "741:17:11"
             },
-            "src": "717:42:9"
+            "src": "717:42:11"
           },
           {
             "constant": false,
-            "id": 4959,
+            "id": 9525,
             "name": "certificatesCount",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "765:29:9",
+            "scope": 10035,
+            "src": "765:29:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1075,10 +1075,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 4957,
+              "id": 9523,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "765:7:9",
+              "src": "765:7:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1087,14 +1087,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 4958,
+              "id": 9524,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "793:1:9",
+              "src": "793:1:11",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -1106,11 +1106,11 @@
           },
           {
             "constant": false,
-            "id": 4963,
+            "id": 9529,
             "name": "validators",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "801:42:9",
+            "scope": 10035,
+            "src": "801:42:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1118,28 +1118,28 @@
               "typeString": "mapping(address => int8)"
             },
             "typeName": {
-              "id": 4962,
+              "id": 9528,
               "keyType": {
-                "id": 4960,
+                "id": 9526,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "809:7:9",
+                "src": "809:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "801:24:9",
+              "src": "801:24:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                 "typeString": "mapping(address => int8)"
               },
               "valueType": {
-                "id": 4961,
+                "id": 9527,
                 "name": "int8",
                 "nodeType": "ElementaryTypeName",
-                "src": "820:4:9",
+                "src": "820:4:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_int8",
                   "typeString": "int8"
@@ -1151,44 +1151,44 @@
           },
           {
             "constant": false,
-            "id": 4967,
+            "id": 9533,
             "name": "certificates",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "850:51:9",
+            "scope": 10035,
+            "src": "850:51:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
             },
             "typeName": {
-              "id": 4966,
+              "id": 9532,
               "keyType": {
-                "id": 4964,
+                "id": 9530,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "858:7:9",
+                "src": "858:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "850:31:9",
+              "src": "850:31:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                 "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 4965,
+                "id": 9531,
                 "name": "Certificate",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 4940,
-                "src": "869:11:9",
+                "referencedDeclaration": 9506,
+                "src": "869:11:11",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Certificate_$4940_storage_ptr",
+                  "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
                   "typeString": "struct ProfileRegistry.Certificate"
                 }
               }
@@ -1198,11 +1198,11 @@
           },
           {
             "constant": false,
-            "id": 4973,
+            "id": 9539,
             "name": "certificateValue",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "908:62:9",
+            "scope": 10035,
+            "src": "908:62:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1210,46 +1210,46 @@
               "typeString": "mapping(address => mapping(uint256 => bytes))"
             },
             "typeName": {
-              "id": 4972,
+              "id": 9538,
               "keyType": {
-                "id": 4968,
+                "id": 9534,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "916:7:9",
+                "src": "916:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "908:45:9",
+              "src": "908:45:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                 "typeString": "mapping(address => mapping(uint256 => bytes))"
               },
               "valueType": {
-                "id": 4971,
+                "id": 9537,
                 "keyType": {
-                  "id": 4969,
+                  "id": 9535,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "935:7:9",
+                  "src": "935:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "927:25:9",
+                "src": "927:25:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                   "typeString": "mapping(uint256 => bytes)"
                 },
                 "valueType": {
-                  "id": 4970,
+                  "id": 9536,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "946:5:9",
+                  "src": "946:5:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -1262,11 +1262,11 @@
           },
           {
             "constant": false,
-            "id": 4979,
+            "id": 9545,
             "name": "certificateCount",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "977:61:9",
+            "scope": 10035,
+            "src": "977:61:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1274,46 +1274,46 @@
               "typeString": "mapping(address => mapping(uint256 => uint256))"
             },
             "typeName": {
-              "id": 4978,
+              "id": 9544,
               "keyType": {
-                "id": 4974,
+                "id": 9540,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "985:7:9",
+                "src": "985:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "977:44:9",
+              "src": "977:44:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(uint256 => uint256))"
               },
               "valueType": {
-                "id": 4977,
+                "id": 9543,
                 "keyType": {
-                  "id": 4975,
+                  "id": 9541,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1004:7:9",
+                  "src": "1004:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "996:24:9",
+                "src": "996:24:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                   "typeString": "mapping(uint256 => uint256)"
                 },
                 "valueType": {
-                  "id": 4976,
+                  "id": 9542,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1015:4:9",
+                  "src": "1015:4:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1326,26 +1326,26 @@
           },
           {
             "body": {
-              "id": 4995,
+              "id": 9561,
               "nodeType": "Block",
-              "src": "1066:73:9",
+              "src": "1066:73:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4985,
+                    "id": 9551,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4982,
+                      "id": 9548,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "1076:5:9",
+                      "referencedDeclaration": 10800,
+                      "src": "1076:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1357,18 +1357,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4983,
+                        "id": 9549,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "1084:3:9",
+                        "referencedDeclaration": 11315,
+                        "src": "1084:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4984,
+                      "id": 9550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1376,26 +1376,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "1084:10:9",
+                      "src": "1084:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1076:18:9",
+                    "src": "1076:18:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4986,
+                  "id": 9552,
                   "nodeType": "ExpressionStatement",
-                  "src": "1076:18:9"
+                  "src": "1076:18:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4993,
+                    "id": 9559,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1404,34 +1404,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4987,
+                        "id": 9553,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1104:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1104:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 4990,
+                      "id": 9556,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4988,
+                          "id": 9554,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1115:3:9",
+                          "referencedDeclaration": 11315,
+                          "src": "1115:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4989,
+                        "id": 9555,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1439,7 +1439,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1115:10:9",
+                        "src": "1115:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1450,7 +1450,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1104:22:9",
+                      "src": "1104:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -1460,7 +1460,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4992,
+                      "id": 9558,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1468,18 +1468,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "-",
                       "prefix": true,
-                      "src": "1129:3:9",
+                      "src": "1129:3:11",
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 4991,
+                        "id": 9557,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "1131:1:9",
+                        "src": "1131:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -1492,20 +1492,20 @@
                         "typeString": "int_const -1"
                       }
                     },
-                    "src": "1104:28:9",
+                    "src": "1104:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 4994,
+                  "id": 9560,
                   "nodeType": "ExpressionStatement",
-                  "src": "1104:28:9"
+                  "src": "1104:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 4996,
+            "id": 9562,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1513,29 +1513,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4980,
+              "id": 9546,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1056:2:9"
+              "src": "1056:2:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4981,
+              "id": 9547,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1066:0:9"
+              "src": "1066:0:11"
             },
-            "scope": 5469,
-            "src": "1045:94:9",
+            "scope": 10035,
+            "src": "1045:94:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5035,
+              "id": 9601,
               "nodeType": "Block",
-              "src": "1248:200:9",
+              "src": "1248:200:11",
               "statements": [
                 {
                   "expression": {
@@ -1547,19 +1547,19 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5012,
+                        "id": 9578,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5010,
+                          "id": 9576,
                           "name": "_level",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5000,
-                          "src": "1266:6:9",
+                          "referencedDeclaration": 9566,
+                          "src": "1266:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -1570,14 +1570,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5011,
+                          "id": 9577,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1275:1:9",
+                          "src": "1275:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1585,7 +1585,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1266:10:9",
+                        "src": "1266:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1599,21 +1599,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5009,
+                      "id": 9575,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1258:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1258:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5013,
+                    "id": 9579,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1621,15 +1621,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1258:19:9",
+                    "src": "1258:19:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5014,
+                  "id": 9580,
                   "nodeType": "ExpressionStatement",
-                  "src": "1258:19:9"
+                  "src": "1258:19:11"
                 },
                 {
                   "expression": {
@@ -1641,7 +1641,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5020,
+                        "id": 9586,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1651,12 +1651,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5017,
+                              "id": 9583,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4998,
-                              "src": "1313:10:9",
+                              "referencedDeclaration": 9564,
+                              "src": "1313:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1670,18 +1670,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5016,
+                            "id": 9582,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "1295:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "1295:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5018,
+                          "id": 9584,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1689,7 +1689,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1295:29:9",
+                          "src": "1295:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -1700,14 +1700,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5019,
+                          "id": 9585,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1328:1:9",
+                          "src": "1328:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1715,7 +1715,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1295:34:9",
+                        "src": "1295:34:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1729,21 +1729,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5015,
+                      "id": 9581,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1287:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1287:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5021,
+                    "id": 9587,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1751,20 +1751,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1287:43:9",
+                    "src": "1287:43:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5022,
+                  "id": 9588,
                   "nodeType": "ExpressionStatement",
-                  "src": "1287:43:9"
+                  "src": "1287:43:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5027,
+                    "id": 9593,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1773,26 +1773,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5023,
+                        "id": 9589,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1340:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1340:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5025,
+                      "id": 9591,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5024,
+                        "id": 9590,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4998,
-                        "src": "1351:10:9",
+                        "referencedDeclaration": 9564,
+                        "src": "1351:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1803,7 +1803,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1340:22:9",
+                      "src": "1340:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -1813,26 +1813,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5026,
+                      "id": 9592,
                       "name": "_level",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5000,
-                      "src": "1365:6:9",
+                      "referencedDeclaration": 9566,
+                      "src": "1365:6:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
                       }
                     },
-                    "src": "1340:31:9",
+                    "src": "1340:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5028,
+                  "id": 9594,
                   "nodeType": "ExpressionStatement",
-                  "src": "1340:31:9"
+                  "src": "1340:31:11"
                 },
                 {
                   "eventCall": {
@@ -1840,12 +1840,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5030,
+                        "id": 9596,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4998,
-                        "src": "1403:10:9",
+                        "referencedDeclaration": 9564,
+                        "src": "1403:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1859,18 +1859,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5029,
+                      "id": 9595,
                       "name": "ValidatorCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4944,
-                      "src": "1386:16:9",
+                      "referencedDeclaration": 9510,
+                      "src": "1386:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5031,
+                    "id": 9597,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1878,95 +1878,95 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1386:28:9",
+                    "src": "1386:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5032,
+                  "id": 9598,
                   "nodeType": "EmitStatement",
-                  "src": "1381:33:9"
+                  "src": "1381:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5033,
+                    "id": 9599,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4998,
-                    "src": "1431:10:9",
+                    "referencedDeclaration": 9564,
+                    "src": "1431:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 5008,
-                  "id": 5034,
+                  "functionReturnParameters": 9574,
+                  "id": 9600,
                   "nodeType": "Return",
-                  "src": "1424:17:9"
+                  "src": "1424:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5036,
+            "id": 9602,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5003,
+                "id": 9569,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5002,
+                  "id": 9568,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4925,
-                  "src": "1207:8:9",
+                  "referencedDeclaration": 9491,
+                  "src": "1207:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1207:8:9"
+                "src": "1207:8:11"
               },
               {
                 "arguments": null,
-                "id": 5005,
+                "id": 9571,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5004,
+                  "id": 9570,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1216:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1216:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1216:13:9"
+                "src": "1216:13:11"
               }
             ],
             "name": "AddValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5001,
+              "id": 9567,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4998,
+                  "id": 9564,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1167:18:9",
+                  "scope": 9602,
+                  "src": "1167:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1974,10 +1974,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4997,
+                    "id": 9563,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1167:7:9",
+                    "src": "1167:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1988,11 +1988,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5000,
+                  "id": 9566,
                   "name": "_level",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1187:11:9",
+                  "scope": 9602,
+                  "src": "1187:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2000,10 +2000,10 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 4999,
+                    "id": 9565,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1187:4:9",
+                    "src": "1187:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
@@ -2013,20 +2013,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1166:33:9"
+              "src": "1166:33:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5008,
+              "id": 9574,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5007,
+                  "id": 9573,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1239:7:9",
+                  "scope": 9602,
+                  "src": "1239:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2034,10 +2034,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5006,
+                    "id": 9572,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1239:7:9",
+                    "src": "1239:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2047,19 +2047,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1238:9:9"
+              "src": "1238:9:11"
             },
-            "scope": 5469,
-            "src": "1145:303:9",
+            "scope": 10035,
+            "src": "1145:303:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5067,
+              "id": 9633,
               "nodeType": "Block",
-              "src": "1547:165:9",
+              "src": "1547:165:11",
               "statements": [
                 {
                   "expression": {
@@ -2071,7 +2071,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5052,
+                        "id": 9618,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2081,12 +2081,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5049,
+                              "id": 9615,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5038,
-                              "src": "1583:10:9",
+                              "referencedDeclaration": 9604,
+                              "src": "1583:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2100,18 +2100,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5048,
+                            "id": 9614,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "1565:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "1565:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5050,
+                          "id": 9616,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2119,7 +2119,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1565:29:9",
+                          "src": "1565:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -2130,14 +2130,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5051,
+                          "id": 9617,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1597:1:9",
+                          "src": "1597:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2145,7 +2145,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1565:33:9",
+                        "src": "1565:33:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2159,21 +2159,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5047,
+                      "id": 9613,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1557:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1557:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5053,
+                    "id": 9619,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2181,20 +2181,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1557:42:9",
+                    "src": "1557:42:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5054,
+                  "id": 9620,
                   "nodeType": "ExpressionStatement",
-                  "src": "1557:42:9"
+                  "src": "1557:42:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5059,
+                    "id": 9625,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2203,26 +2203,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5055,
+                        "id": 9621,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1609:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1609:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5057,
+                      "id": 9623,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5056,
+                        "id": 9622,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5038,
-                        "src": "1620:10:9",
+                        "referencedDeclaration": 9604,
+                        "src": "1620:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2233,7 +2233,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1609:22:9",
+                      "src": "1609:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -2244,14 +2244,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5058,
+                      "id": 9624,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1634:1:9",
+                      "src": "1634:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -2259,15 +2259,15 @@
                       },
                       "value": "0"
                     },
-                    "src": "1609:26:9",
+                    "src": "1609:26:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5060,
+                  "id": 9626,
                   "nodeType": "ExpressionStatement",
-                  "src": "1609:26:9"
+                  "src": "1609:26:11"
                 },
                 {
                   "eventCall": {
@@ -2275,12 +2275,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5062,
+                        "id": 9628,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5038,
-                        "src": "1667:10:9",
+                        "referencedDeclaration": 9604,
+                        "src": "1667:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2294,18 +2294,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5061,
+                      "id": 9627,
                       "name": "ValidatorDeleted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4948,
-                      "src": "1650:16:9",
+                      "referencedDeclaration": 9514,
+                      "src": "1650:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5063,
+                    "id": 9629,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2313,95 +2313,95 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1650:28:9",
+                    "src": "1650:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5064,
+                  "id": 9630,
                   "nodeType": "EmitStatement",
-                  "src": "1645:33:9"
+                  "src": "1645:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5065,
+                    "id": 9631,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5038,
-                    "src": "1695:10:9",
+                    "referencedDeclaration": 9604,
+                    "src": "1695:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 5046,
-                  "id": 5066,
+                  "functionReturnParameters": 9612,
+                  "id": 9632,
                   "nodeType": "Return",
-                  "src": "1688:17:9"
+                  "src": "1688:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5068,
+            "id": 9634,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5041,
+                "id": 9607,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5040,
+                  "id": 9606,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4925,
-                  "src": "1506:8:9",
+                  "referencedDeclaration": 9491,
+                  "src": "1506:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1506:8:9"
+                "src": "1506:8:11"
               },
               {
                 "arguments": null,
-                "id": 5043,
+                "id": 9609,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5042,
+                  "id": 9608,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1515:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1515:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1515:13:9"
+                "src": "1515:13:11"
               }
             ],
             "name": "RemoveValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5039,
+              "id": 9605,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5038,
+                  "id": 9604,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5068,
-                  "src": "1479:18:9",
+                  "scope": 9634,
+                  "src": "1479:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2409,10 +2409,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5037,
+                    "id": 9603,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1479:7:9",
+                    "src": "1479:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2422,20 +2422,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1478:20:9"
+              "src": "1478:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5046,
+              "id": 9612,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5045,
+                  "id": 9611,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5068,
-                  "src": "1538:7:9",
+                  "scope": 9634,
+                  "src": "1538:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2443,10 +2443,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5044,
+                    "id": 9610,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1538:7:9",
+                    "src": "1538:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2456,45 +2456,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1537:9:9"
+              "src": "1537:9:11"
             },
-            "scope": 5469,
-            "src": "1454:258:9",
+            "scope": 10035,
+            "src": "1454:258:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5079,
+              "id": 9645,
               "nodeType": "Block",
-              "src": "1792:46:9",
+              "src": "1792:46:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 5075,
+                      "id": 9641,
                       "name": "validators",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4963,
-                      "src": "1809:10:9",
+                      "referencedDeclaration": 9529,
+                      "src": "1809:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                         "typeString": "mapping(address => int8)"
                       }
                     },
-                    "id": 5077,
+                    "id": 9643,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5076,
+                      "id": 9642,
                       "name": "_validator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5070,
-                      "src": "1820:10:9",
+                      "referencedDeclaration": 9636,
+                      "src": "1820:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2505,21 +2505,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1809:22:9",
+                    "src": "1809:22:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "functionReturnParameters": 5074,
-                  "id": 5078,
+                  "functionReturnParameters": 9640,
+                  "id": 9644,
                   "nodeType": "Return",
-                  "src": "1802:29:9"
+                  "src": "1802:29:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5080,
+            "id": 9646,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2527,16 +2527,16 @@
             "name": "GetValidatorLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5071,
+              "id": 9637,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5070,
+                  "id": 9636,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5080,
-                  "src": "1745:18:9",
+                  "scope": 9646,
+                  "src": "1745:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2544,10 +2544,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5069,
+                    "id": 9635,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1745:7:9",
+                    "src": "1745:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2557,20 +2557,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1744:20:9"
+              "src": "1744:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5074,
+              "id": 9640,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5073,
+                  "id": 9639,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5080,
-                  "src": "1786:4:9",
+                  "scope": 9646,
+                  "src": "1786:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2578,10 +2578,10 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 5072,
+                    "id": 9638,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1786:4:9",
+                    "src": "1786:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
@@ -2591,19 +2591,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1785:6:9"
+              "src": "1785:6:11"
             },
-            "scope": 5469,
-            "src": "1718:120:9",
+            "scope": 10035,
+            "src": "1718:120:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5212,
+              "id": 9778,
               "nodeType": "Block",
-              "src": "1937:947:9",
+              "src": "1937:947:11",
               "statements": [
                 {
                   "condition": {
@@ -2612,19 +2612,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5093,
+                    "id": 9659,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5091,
+                      "id": 9657,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5084,
-                      "src": "1983:5:9",
+                      "referencedDeclaration": 9650,
+                      "src": "1983:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2635,14 +2635,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31313030",
-                      "id": 5092,
+                      "id": 9658,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1992:4:9",
+                      "src": "1992:4:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1100_by_1",
@@ -2650,16 +2650,16 @@
                       },
                       "value": "1100"
                     },
-                    "src": "1983:13:9",
+                    "src": "1983:13:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 5121,
+                    "id": 9687,
                     "nodeType": "Block",
-                    "src": "2143:54:9",
+                    "src": "2143:54:11",
                     "statements": [
                       {
                         "expression": {
@@ -2671,19 +2671,19 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 5118,
+                              "id": 9684,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 5115,
+                                "id": 9681,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5082,
-                                "src": "2165:6:9",
+                                "referencedDeclaration": 9648,
+                                "src": "2165:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2695,18 +2695,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5116,
+                                  "id": 9682,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "2175:3:9",
+                                  "referencedDeclaration": 11315,
+                                  "src": "2175:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 5117,
+                                "id": 9683,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -2714,13 +2714,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "2175:10:9",
+                                "src": "2175:10:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "2165:20:9",
+                              "src": "2165:20:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -2734,21 +2734,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 5114,
+                            "id": 9680,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2157:7:9",
+                            "referencedDeclaration": 11318,
+                            "src": "2157:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 5119,
+                          "id": 9685,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2756,38 +2756,38 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2157:29:9",
+                          "src": "2157:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 5120,
+                        "id": 9686,
                         "nodeType": "ExpressionStatement",
-                        "src": "2157:29:9"
+                        "src": "2157:29:11"
                       }
                     ]
                   },
-                  "id": 5122,
+                  "id": 9688,
                   "nodeType": "IfStatement",
-                  "src": "1979:218:9",
+                  "src": "1979:218:11",
                   "trueBody": {
-                    "id": 5113,
+                    "id": 9679,
                     "nodeType": "Block",
-                    "src": "1998:139:9",
+                    "src": "1998:139:11",
                     "statements": [
                       {
                         "assignments": [
-                          5095
+                          9661
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 5095,
+                            "id": 9661,
                             "name": "attributeLevel",
                             "nodeType": "VariableDeclaration",
-                            "scope": 5213,
-                            "src": "2012:19:9",
+                            "scope": 9779,
+                            "src": "2012:19:11",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -2795,10 +2795,10 @@
                               "typeString": "int8"
                             },
                             "typeName": {
-                              "id": 5094,
+                              "id": 9660,
                               "name": "int8",
                               "nodeType": "ElementaryTypeName",
-                              "src": "2012:4:9",
+                              "src": "2012:4:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
@@ -2808,7 +2808,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 5103,
+                        "id": 9669,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -2818,7 +2818,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 5101,
+                              "id": 9667,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -2829,19 +2829,19 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 5099,
+                                "id": 9665,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "argumentTypes": null,
-                                  "id": 5097,
+                                  "id": 9663,
                                   "name": "_type",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5084,
-                                  "src": "2039:5:9",
+                                  "referencedDeclaration": 9650,
+                                  "src": "2039:5:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -2852,14 +2852,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "313030",
-                                  "id": 5098,
+                                  "id": 9664,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "2047:3:9",
+                                  "src": "2047:3:11",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_100_by_1",
@@ -2867,7 +2867,7 @@
                                   },
                                   "value": "100"
                                 },
-                                "src": "2039:11:9",
+                                "src": "2039:11:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -2878,14 +2878,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "3130",
-                                "id": 5100,
+                                "id": 9666,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "2053:2:9",
+                                "src": "2053:2:11",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_10_by_1",
@@ -2893,7 +2893,7 @@
                                 },
                                 "value": "10"
                               },
-                              "src": "2039:16:9",
+                              "src": "2039:16:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2907,20 +2907,20 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 5096,
+                            "id": 9662,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "2034:4:9",
+                            "src": "2034:4:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_int8_$",
                               "typeString": "type(int8)"
                             },
                             "typeName": "int8"
                           },
-                          "id": 5102,
+                          "id": 9668,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2928,14 +2928,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2034:22:9",
+                          "src": "2034:22:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "2012:44:9"
+                        "src": "2012:44:11"
                       },
                       {
                         "expression": {
@@ -2947,19 +2947,19 @@
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
                               },
-                              "id": 5110,
+                              "id": 9676,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 5105,
+                                "id": 9671,
                                 "name": "attributeLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5095,
-                                "src": "2078:14:9",
+                                "referencedDeclaration": 9661,
+                                "src": "2078:14:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
                                   "typeString": "int8"
@@ -2974,18 +2974,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 5107,
+                                      "id": 9673,
                                       "name": "msg",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 7769,
-                                      "src": "2114:3:9",
+                                      "referencedDeclaration": 11315,
+                                      "src": "2114:3:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_magic_message",
                                         "typeString": "msg"
                                       }
                                     },
-                                    "id": 5108,
+                                    "id": 9674,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -2993,7 +2993,7 @@
                                     "memberName": "sender",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "2114:10:9",
+                                    "src": "2114:10:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -3007,18 +3007,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 5106,
+                                  "id": 9672,
                                   "name": "GetValidatorLevel",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5080,
-                                  "src": "2096:17:9",
+                                  "referencedDeclaration": 9646,
+                                  "src": "2096:17:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                     "typeString": "function (address) view returns (int8)"
                                   }
                                 },
-                                "id": 5109,
+                                "id": 9675,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3026,13 +3026,13 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "2096:29:9",
+                                "src": "2096:29:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
                                   "typeString": "int8"
                                 }
                               },
-                              "src": "2078:47:9",
+                              "src": "2078:47:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -3046,21 +3046,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 5104,
+                            "id": 9670,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2070:7:9",
+                            "referencedDeclaration": 11318,
+                            "src": "2070:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 5111,
+                          "id": 9677,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3068,15 +3068,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2070:56:9",
+                          "src": "2070:56:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 5112,
+                        "id": 9678,
                         "nodeType": "ExpressionStatement",
-                        "src": "2070:56:9"
+                        "src": "2070:56:11"
                       }
                     ]
                   }
@@ -3091,7 +3091,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 5130,
+                        "id": 9696,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3101,12 +3101,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5125,
+                              "id": 9691,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5086,
-                              "src": "2254:6:9",
+                              "referencedDeclaration": 9652,
+                              "src": "2254:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
                                 "typeString": "bytes memory"
@@ -3120,18 +3120,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 5124,
+                            "id": 9690,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "2244:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "2244:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5126,
+                          "id": 9692,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3139,7 +3139,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2244:17:9",
+                          "src": "2244:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -3153,14 +3153,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 5128,
+                              "id": 9694,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "string",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "2275:2:9",
+                              "src": "2275:2:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -3176,18 +3176,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 5127,
+                            "id": 9693,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "2265:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "2265:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5129,
+                          "id": 9695,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3195,13 +3195,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2265:13:9",
+                          "src": "2265:13:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
                           }
                         },
-                        "src": "2244:34:9",
+                        "src": "2244:34:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3215,21 +3215,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5123,
+                      "id": 9689,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2236:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "2236:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5131,
+                    "id": 9697,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3237,28 +3237,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2236:43:9",
+                    "src": "2236:43:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5132,
+                  "id": 9698,
                   "nodeType": "ExpressionStatement",
-                  "src": "2236:43:9"
+                  "src": "2236:43:11"
                 },
                 {
                   "assignments": [
-                    5134
+                    9700
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5134,
+                      "id": 9700,
                       "name": "isMultiple",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5213,
-                      "src": "2290:15:9",
+                      "scope": 9779,
+                      "src": "2290:15:11",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -3266,10 +3266,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 5133,
+                        "id": 9699,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "2290:4:9",
+                        "src": "2290:4:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3279,14 +3279,14 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5140,
+                  "id": 9706,
                   "initialValue": {
                     "argumentTypes": null,
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5139,
+                    "id": 9705,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3297,19 +3297,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5137,
+                      "id": 9703,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 5135,
+                        "id": 9701,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5084,
-                        "src": "2308:5:9",
+                        "referencedDeclaration": 9650,
+                        "src": "2308:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3320,14 +3320,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31303030",
-                        "id": 5136,
+                        "id": 9702,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2316:4:9",
+                        "src": "2316:4:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000_by_1",
@@ -3335,7 +3335,7 @@
                         },
                         "value": "1000"
                       },
-                      "src": "2308:12:9",
+                      "src": "2308:12:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3346,14 +3346,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "32",
-                      "id": 5138,
+                      "id": 9704,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2324:1:9",
+                      "src": "2324:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_2_by_1",
@@ -3361,19 +3361,19 @@
                       },
                       "value": "2"
                     },
-                    "src": "2308:17:9",
+                    "src": "2308:17:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2290:35:9"
+                  "src": "2290:35:11"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
-                    "id": 5142,
+                    "id": 9708,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3381,15 +3381,15 @@
                     "nodeType": "UnaryOperation",
                     "operator": "!",
                     "prefix": true,
-                    "src": "2339:11:9",
+                    "src": "2339:11:11",
                     "subExpression": {
                       "argumentTypes": null,
-                      "id": 5141,
+                      "id": 9707,
                       "name": "isMultiple",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5134,
-                      "src": "2340:10:9",
+                      "referencedDeclaration": 9700,
+                      "src": "2340:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -3401,13 +3401,13 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 5175,
+                  "id": 9741,
                   "nodeType": "IfStatement",
-                  "src": "2335:268:9",
+                  "src": "2335:268:11",
                   "trueBody": {
-                    "id": 5174,
+                    "id": 9740,
                     "nodeType": "Block",
-                    "src": "2352:251:9",
+                    "src": "2352:251:11",
                     "statements": [
                       {
                         "condition": {
@@ -3416,7 +3416,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 5149,
+                          "id": 9715,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3427,26 +3427,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 5143,
+                                "id": 9709,
                                 "name": "certificateCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4979,
-                                "src": "2370:16:9",
+                                "referencedDeclaration": 9545,
+                                "src": "2370:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => uint256))"
                                 }
                               },
-                              "id": 5145,
+                              "id": 9711,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 5144,
+                                "id": 9710,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5082,
-                                "src": "2387:6:9",
+                                "referencedDeclaration": 9648,
+                                "src": "2387:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -3457,21 +3457,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "2370:24:9",
+                              "src": "2370:24:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                                 "typeString": "mapping(uint256 => uint256)"
                               }
                             },
-                            "id": 5147,
+                            "id": 9713,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5146,
+                              "id": 9712,
                               "name": "_type",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5084,
-                              "src": "2395:5:9",
+                              "referencedDeclaration": 9650,
+                              "src": "2395:5:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -3482,7 +3482,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2370:31:9",
+                            "src": "2370:31:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3493,14 +3493,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 5148,
+                            "id": 9714,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "2405:1:9",
+                            "src": "2405:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -3508,16 +3508,16 @@
                             },
                             "value": "0"
                           },
-                          "src": "2370:36:9",
+                          "src": "2370:36:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 5172,
+                          "id": 9738,
                           "nodeType": "Block",
-                          "src": "2487:106:9",
+                          "src": "2487:106:11",
                           "statements": [
                             {
                               "expression": {
@@ -3529,7 +3529,7 @@
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
                                     },
-                                    "id": 5169,
+                                    "id": 9735,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -3542,12 +3542,12 @@
                                           "arguments": [
                                             {
                                               "argumentTypes": null,
-                                              "id": 5162,
+                                              "id": 9728,
                                               "name": "_owner",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 5082,
-                                              "src": "2541:6:9",
+                                              "referencedDeclaration": 9648,
+                                              "src": "2541:6:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
                                                 "typeString": "address"
@@ -3555,12 +3555,12 @@
                                             },
                                             {
                                               "argumentTypes": null,
-                                              "id": 5163,
+                                              "id": 9729,
                                               "name": "_type",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 5084,
-                                              "src": "2549:5:9",
+                                              "referencedDeclaration": 9650,
+                                              "src": "2549:5:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_uint256",
                                                 "typeString": "uint256"
@@ -3578,18 +3578,18 @@
                                                 "typeString": "uint256"
                                               }
                                             ],
-                                            "id": 5161,
+                                            "id": 9727,
                                             "name": "GetAttributeValue",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 5358,
-                                            "src": "2523:17:9",
+                                            "referencedDeclaration": 9924,
+                                            "src": "2523:17:11",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                               "typeString": "function (address,uint256) view returns (bytes memory)"
                                             }
                                           },
-                                          "id": 5164,
+                                          "id": 9730,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -3597,7 +3597,7 @@
                                           "lValueRequested": false,
                                           "names": [],
                                           "nodeType": "FunctionCall",
-                                          "src": "2523:32:9",
+                                          "src": "2523:32:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
                                             "typeString": "bytes memory"
@@ -3611,18 +3611,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 5160,
+                                        "id": 9726,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7763,
-                                        "src": "2513:9:9",
+                                        "referencedDeclaration": 11309,
+                                        "src": "2513:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 5165,
+                                      "id": 9731,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -3630,7 +3630,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "2513:43:9",
+                                      "src": "2513:43:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
@@ -3643,12 +3643,12 @@
                                       "arguments": [
                                         {
                                           "argumentTypes": null,
-                                          "id": 5167,
+                                          "id": 9733,
                                           "name": "_value",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 5086,
-                                          "src": "2570:6:9",
+                                          "referencedDeclaration": 9652,
+                                          "src": "2570:6:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
                                             "typeString": "bytes memory"
@@ -3662,18 +3662,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 5166,
+                                        "id": 9732,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7763,
-                                        "src": "2560:9:9",
+                                        "referencedDeclaration": 11309,
+                                        "src": "2560:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 5168,
+                                      "id": 9734,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -3681,13 +3681,13 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "2560:17:9",
+                                      "src": "2560:17:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "src": "2513:64:9",
+                                    "src": "2513:64:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -3701,21 +3701,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 5159,
+                                  "id": 9725,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "2505:7:9",
+                                  "referencedDeclaration": 11318,
+                                  "src": "2505:7:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 5170,
+                                "id": 9736,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3723,30 +3723,30 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "2505:73:9",
+                                "src": "2505:73:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 5171,
+                              "id": 9737,
                               "nodeType": "ExpressionStatement",
-                              "src": "2505:73:9"
+                              "src": "2505:73:11"
                             }
                           ]
                         },
-                        "id": 5173,
+                        "id": 9739,
                         "nodeType": "IfStatement",
-                        "src": "2366:227:9",
+                        "src": "2366:227:11",
                         "trueBody": {
-                          "id": 5158,
+                          "id": 9724,
                           "nodeType": "Block",
-                          "src": "2408:73:9",
+                          "src": "2408:73:11",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5156,
+                                "id": 9722,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3757,26 +3757,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 5150,
+                                      "id": 9716,
                                       "name": "certificateValue",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4973,
-                                      "src": "2426:16:9",
+                                      "referencedDeclaration": 9539,
+                                      "src": "2426:16:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                         "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                       }
                                     },
-                                    "id": 5153,
+                                    "id": 9719,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 5151,
+                                      "id": 9717,
                                       "name": "_owner",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 5082,
-                                      "src": "2443:6:9",
+                                      "referencedDeclaration": 9648,
+                                      "src": "2443:6:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -3787,21 +3787,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "2426:24:9",
+                                    "src": "2426:24:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                                       "typeString": "mapping(uint256 => bytes storage ref)"
                                     }
                                   },
-                                  "id": 5154,
+                                  "id": 9720,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 5152,
+                                    "id": 9718,
                                     "name": "_type",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 5084,
-                                    "src": "2451:5:9",
+                                    "referencedDeclaration": 9650,
+                                    "src": "2451:5:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -3812,7 +3812,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "2426:31:9",
+                                  "src": "2426:31:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_storage",
                                     "typeString": "bytes storage ref"
@@ -3822,26 +3822,26 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 5155,
+                                  "id": 9721,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5086,
-                                  "src": "2460:6:9",
+                                  "referencedDeclaration": 9652,
+                                  "src": "2460:6:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_memory_ptr",
                                     "typeString": "bytes memory"
                                   }
                                 },
-                                "src": "2426:40:9",
+                                "src": "2426:40:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes_storage",
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 5157,
+                              "id": 9723,
                               "nodeType": "ExpressionStatement",
-                              "src": "2426:40:9"
+                              "src": "2426:40:11"
                             }
                           ]
                         }
@@ -3852,7 +3852,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5188,
+                    "id": 9754,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3863,26 +3863,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5176,
+                          "id": 9742,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "2613:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "2613:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5179,
+                        "id": 9745,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5177,
+                          "id": 9743,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5082,
-                          "src": "2630:6:9",
+                          "referencedDeclaration": 9648,
+                          "src": "2630:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3893,21 +3893,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2613:24:9",
+                        "src": "2613:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5180,
+                      "id": 9746,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5178,
+                        "id": 9744,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5084,
-                        "src": "2638:5:9",
+                        "referencedDeclaration": 9650,
+                        "src": "2638:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3918,7 +3918,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "2613:31:9",
+                      "src": "2613:31:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3932,7 +3932,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5187,
+                      "id": 9753,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3943,26 +3943,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5181,
+                            "id": 9747,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4979,
-                            "src": "2647:16:9",
+                            "referencedDeclaration": 9545,
+                            "src": "2647:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 5183,
+                          "id": 9749,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5182,
+                            "id": 9748,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5082,
-                            "src": "2664:6:9",
+                            "referencedDeclaration": 9648,
+                            "src": "2664:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3973,21 +3973,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "2647:24:9",
+                          "src": "2647:24:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 5185,
+                        "id": 9751,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5184,
+                          "id": 9750,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5084,
-                          "src": "2672:5:9",
+                          "referencedDeclaration": 9650,
+                          "src": "2672:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3998,7 +3998,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2647:31:9",
+                        "src": "2647:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4009,14 +4009,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5186,
+                        "id": 9752,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2681:1:9",
+                        "src": "2681:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -4024,38 +4024,38 @@
                         },
                         "value": "1"
                       },
-                      "src": "2647:35:9",
+                      "src": "2647:35:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2613:69:9",
+                    "src": "2613:69:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5189,
+                  "id": 9755,
                   "nodeType": "ExpressionStatement",
-                  "src": "2613:69:9"
+                  "src": "2613:69:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5194,
+                    "id": 9760,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5190,
+                      "id": 9756,
                       "name": "certificatesCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4959,
-                      "src": "2693:17:9",
+                      "referencedDeclaration": 9525,
+                      "src": "2693:17:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4069,19 +4069,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5193,
+                      "id": 9759,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 5191,
+                        "id": 9757,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2713:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2713:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4092,14 +4092,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5192,
+                        "id": 9758,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2733:1:9",
+                        "src": "2733:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -4107,26 +4107,26 @@
                         },
                         "value": "1"
                       },
-                      "src": "2713:21:9",
+                      "src": "2713:21:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2693:41:9",
+                    "src": "2693:41:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5195,
+                  "id": 9761,
                   "nodeType": "ExpressionStatement",
-                  "src": "2693:41:9"
+                  "src": "2693:41:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5206,
+                    "id": 9772,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4135,26 +4135,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5196,
+                        "id": 9762,
                         "name": "certificates",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4967,
-                        "src": "2744:12:9",
+                        "referencedDeclaration": 9533,
+                        "src": "2744:12:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                           "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                         }
                       },
-                      "id": 5198,
+                      "id": 9764,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5197,
+                        "id": 9763,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2757:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2757:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4165,9 +4165,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "2744:31:9",
+                      "src": "2744:31:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                         "typeString": "struct ProfileRegistry.Certificate storage ref"
                       }
                     },
@@ -4180,18 +4180,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5200,
+                            "id": 9766,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2790:3:9",
+                            "referencedDeclaration": 11315,
+                            "src": "2790:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 5201,
+                          "id": 9767,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4199,7 +4199,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2790:10:9",
+                          "src": "2790:10:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4207,12 +4207,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5202,
+                          "id": 9768,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5082,
-                          "src": "2802:6:9",
+                          "referencedDeclaration": 9648,
+                          "src": "2802:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4220,12 +4220,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5203,
+                          "id": 9769,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5084,
-                          "src": "2810:5:9",
+                          "referencedDeclaration": 9650,
+                          "src": "2810:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4233,12 +4233,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5204,
+                          "id": 9770,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5086,
-                          "src": "2817:6:9",
+                          "referencedDeclaration": 9652,
+                          "src": "2817:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -4264,18 +4264,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 5199,
+                        "id": 9765,
                         "name": "Certificate",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4940,
-                        "src": "2778:11:9",
+                        "referencedDeclaration": 9506,
+                        "src": "2778:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Certificate_$4940_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Certificate_$9506_storage_ptr_$",
                           "typeString": "type(struct ProfileRegistry.Certificate storage pointer)"
                         }
                       },
-                      "id": 5205,
+                      "id": 9771,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4283,21 +4283,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2778:46:9",
+                      "src": "2778:46:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_memory",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_memory",
                         "typeString": "struct ProfileRegistry.Certificate memory"
                       }
                     },
-                    "src": "2744:80:9",
+                    "src": "2744:80:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
-                  "id": 5207,
+                  "id": 9773,
                   "nodeType": "ExpressionStatement",
-                  "src": "2744:80:9"
+                  "src": "2744:80:11"
                 },
                 {
                   "eventCall": {
@@ -4305,12 +4305,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5209,
+                        "id": 9775,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2859:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2859:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4324,18 +4324,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5208,
+                      "id": 9774,
                       "name": "CertificateCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4952,
-                      "src": "2840:18:9",
+                      "referencedDeclaration": 9518,
+                      "src": "2840:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5210,
+                    "id": 9776,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4343,57 +4343,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2840:37:9",
+                    "src": "2840:37:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5211,
+                  "id": 9777,
                   "nodeType": "EmitStatement",
-                  "src": "2835:42:9"
+                  "src": "2835:42:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5213,
+            "id": 9779,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5089,
+                "id": 9655,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5088,
+                  "id": 9654,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1923:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1923:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1923:13:9"
+                "src": "1923:13:11"
               }
             ],
             "name": "CreateCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5087,
+              "id": 9653,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5082,
+                  "id": 9648,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1871:14:9",
+                  "scope": 9779,
+                  "src": "1871:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4401,10 +4401,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5081,
+                    "id": 9647,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1871:7:9",
+                    "src": "1871:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4415,11 +4415,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5084,
+                  "id": 9650,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1887:13:9",
+                  "scope": 9779,
+                  "src": "1887:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4427,10 +4427,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5083,
+                    "id": 9649,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1887:7:9",
+                    "src": "1887:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4441,11 +4441,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5086,
+                  "id": 9652,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1902:12:9",
+                  "scope": 9779,
+                  "src": "1902:12:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4453,10 +4453,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5085,
+                    "id": 9651,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1902:5:9",
+                    "src": "1902:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -4466,54 +4466,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1870:45:9"
+              "src": "1870:45:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5090,
+              "id": 9656,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1937:0:9"
+              "src": "1937:0:11"
             },
-            "scope": 5469,
-            "src": "1844:1040:9",
+            "scope": 10035,
+            "src": "1844:1040:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5309,
+              "id": 9875,
               "nodeType": "Block",
-              "src": "2951:536:9",
+              "src": "2951:536:11",
               "statements": [
                 {
                   "assignments": [
-                    5221
+                    9787
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5221,
+                      "id": 9787,
                       "name": "crt",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5310,
-                      "src": "2961:22:9",
+                      "scope": 9876,
+                      "src": "2961:22:11",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                         "typeString": "struct ProfileRegistry.Certificate"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 5220,
+                        "id": 9786,
                         "name": "Certificate",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 4940,
-                        "src": "2961:11:9",
+                        "referencedDeclaration": 9506,
+                        "src": "2961:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$4940_storage_ptr",
+                          "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
                           "typeString": "struct ProfileRegistry.Certificate"
                         }
                       },
@@ -4521,31 +4521,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5225,
+                  "id": 9791,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 5222,
+                      "id": 9788,
                       "name": "certificates",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4967,
-                      "src": "2986:12:9",
+                      "referencedDeclaration": 9533,
+                      "src": "2986:12:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                         "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                       }
                     },
-                    "id": 5224,
+                    "id": 9790,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5223,
+                      "id": 9789,
                       "name": "_id",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5215,
-                      "src": "2999:3:9",
+                      "referencedDeclaration": 9781,
+                      "src": "2999:3:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4556,14 +4556,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2986:17:9",
+                    "src": "2986:17:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2961:42:9"
+                  "src": "2961:42:11"
                 },
                 {
                   "expression": {
@@ -4575,7 +4575,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 5245,
+                        "id": 9811,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4586,7 +4586,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 5237,
+                          "id": 9803,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4597,7 +4597,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 5231,
+                            "id": 9797,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4606,26 +4606,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5227,
+                                "id": 9793,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3022:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3022:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5228,
+                              "id": 9794,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "to",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4935,
-                              "src": "3022:6:9",
+                              "referencedDeclaration": 9501,
+                              "src": "3022:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4637,18 +4637,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5229,
+                                "id": 9795,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "3032:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "3032:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 5230,
+                              "id": 9796,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4656,13 +4656,13 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3032:10:9",
+                              "src": "3032:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3022:20:9",
+                            "src": "3022:20:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -4676,7 +4676,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 5236,
+                            "id": 9802,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4685,26 +4685,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5232,
+                                "id": 9798,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3046:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3046:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5233,
+                              "id": 9799,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "from",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4933,
-                              "src": "3046:8:9",
+                              "referencedDeclaration": 9499,
+                              "src": "3046:8:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4716,18 +4716,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5234,
+                                "id": 9800,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "3058:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "3058:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 5235,
+                              "id": 9801,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4735,19 +4735,19 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3058:10:9",
+                              "src": "3058:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3046:22:9",
+                            "src": "3046:22:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "3022:46:9",
+                          "src": "3022:46:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4761,7 +4761,7 @@
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           },
-                          "id": 5244,
+                          "id": 9810,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4773,18 +4773,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5239,
+                                  "id": 9805,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3090:3:9",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3090:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 5240,
+                                "id": 9806,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4792,7 +4792,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3090:10:9",
+                                "src": "3090:10:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -4806,18 +4806,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 5238,
+                              "id": 9804,
                               "name": "GetValidatorLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5080,
-                              "src": "3072:17:9",
+                              "referencedDeclaration": 9646,
+                              "src": "3072:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                 "typeString": "function (address) view returns (int8)"
                               }
                             },
-                            "id": 5241,
+                            "id": 9807,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4825,7 +4825,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3072:29:9",
+                            "src": "3072:29:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_int8",
                               "typeString": "int8"
@@ -4835,7 +4835,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 5243,
+                            "id": 9809,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -4843,18 +4843,18 @@
                             "nodeType": "UnaryOperation",
                             "operator": "-",
                             "prefix": true,
-                            "src": "3105:2:9",
+                            "src": "3105:2:11",
                             "subExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 5242,
+                              "id": 9808,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "3106:1:9",
+                              "src": "3106:1:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -4867,13 +4867,13 @@
                               "typeString": "int_const -1"
                             }
                           },
-                          "src": "3072:35:9",
+                          "src": "3072:35:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "3022:85:9",
+                        "src": "3022:85:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4887,21 +4887,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5226,
+                      "id": 9792,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "3014:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "3014:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5246,
+                    "id": 9812,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4909,15 +4909,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3014:94:9",
+                    "src": "3014:94:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5247,
+                  "id": 9813,
                   "nodeType": "ExpressionStatement",
-                  "src": "3014:94:9"
+                  "src": "3014:94:11"
                 },
                 {
                   "expression": {
@@ -4929,7 +4929,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 5256,
+                        "id": 9822,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4941,26 +4941,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5250,
+                                "id": 9816,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3136:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3136:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5251,
+                              "id": 9817,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4939,
-                              "src": "3136:9:9",
+                              "referencedDeclaration": 9505,
+                              "src": "3136:9:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory",
                                 "typeString": "bytes memory"
@@ -4974,18 +4974,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 5249,
+                            "id": 9815,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "3126:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "3126:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5252,
+                          "id": 9818,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4993,7 +4993,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3126:20:9",
+                          "src": "3126:20:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -5007,14 +5007,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 5254,
+                              "id": 9820,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "string",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "3160:2:9",
+                              "src": "3160:2:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -5030,18 +5030,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 5253,
+                            "id": 9819,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "3150:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "3150:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5255,
+                          "id": 9821,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5049,13 +5049,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3150:13:9",
+                          "src": "3150:13:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
                           }
                         },
-                        "src": "3126:37:9",
+                        "src": "3126:37:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -5069,21 +5069,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5248,
+                      "id": 9814,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "3118:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "3118:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5257,
+                    "id": 9823,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5091,20 +5091,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3118:46:9",
+                    "src": "3118:46:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5258,
+                  "id": 9824,
                   "nodeType": "ExpressionStatement",
-                  "src": "3118:46:9"
+                  "src": "3118:46:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5275,
+                    "id": 9841,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5115,42 +5115,42 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5259,
+                          "id": 9825,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "3175:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "3175:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5264,
+                        "id": 9830,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5260,
+                            "id": 9826,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3192:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3192:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5261,
+                          "id": 9827,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4935,
-                          "src": "3192:6:9",
+                          "referencedDeclaration": 9501,
+                          "src": "3192:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5161,37 +5161,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3175:24:9",
+                        "src": "3175:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5265,
+                      "id": 9831,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5262,
+                          "id": 9828,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5221,
-                          "src": "3200:3:9",
+                          "referencedDeclaration": 9787,
+                          "src": "3200:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 5263,
+                        "id": 9829,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3200:17:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3200:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5202,7 +5202,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3175:43:9",
+                      "src": "3175:43:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5216,7 +5216,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5274,
+                      "id": 9840,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5227,42 +5227,42 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5266,
+                            "id": 9832,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4979,
-                            "src": "3221:16:9",
+                            "referencedDeclaration": 9545,
+                            "src": "3221:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 5269,
+                          "id": 9835,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 5267,
+                              "id": 9833,
                               "name": "crt",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5221,
-                              "src": "3238:3:9",
+                              "referencedDeclaration": 9787,
+                              "src": "3238:3:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                 "typeString": "struct ProfileRegistry.Certificate memory"
                               }
                             },
-                            "id": 5268,
+                            "id": 9834,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "to",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4935,
-                            "src": "3238:6:9",
+                            "referencedDeclaration": 9501,
+                            "src": "3238:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5273,37 +5273,37 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3221:24:9",
+                          "src": "3221:24:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 5272,
+                        "id": 9838,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5270,
+                            "id": 9836,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3246:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3246:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5271,
+                          "id": 9837,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "attributeType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4937,
-                          "src": "3246:17:9",
+                          "referencedDeclaration": 9503,
+                          "src": "3246:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5314,7 +5314,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3221:43:9",
+                        "src": "3221:43:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5325,14 +5325,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5273,
+                        "id": 9839,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "3267:1:9",
+                        "src": "3267:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -5340,21 +5340,21 @@
                         },
                         "value": "1"
                       },
-                      "src": "3221:47:9",
+                      "src": "3221:47:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3175:93:9",
+                    "src": "3175:93:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5276,
+                  "id": 9842,
                   "nodeType": "ExpressionStatement",
-                  "src": "3175:93:9"
+                  "src": "3175:93:11"
                 },
                 {
                   "condition": {
@@ -5363,7 +5363,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5285,
+                    "id": 9851,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5374,42 +5374,42 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5277,
+                          "id": 9843,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "3282:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "3282:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5280,
+                        "id": 9846,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5278,
+                            "id": 9844,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3299:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3299:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5279,
+                          "id": 9845,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4935,
-                          "src": "3299:6:9",
+                          "referencedDeclaration": 9501,
+                          "src": "3299:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5420,37 +5420,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3282:24:9",
+                        "src": "3282:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5283,
+                      "id": 9849,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5281,
+                          "id": 9847,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5221,
-                          "src": "3307:3:9",
+                          "referencedDeclaration": 9787,
+                          "src": "3307:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 5282,
+                        "id": 9848,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3307:17:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3307:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5461,7 +5461,7 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3282:43:9",
+                      "src": "3282:43:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5472,14 +5472,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5284,
+                      "id": 9850,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3329:1:9",
+                      "src": "3329:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -5487,25 +5487,25 @@
                       },
                       "value": "0"
                     },
-                    "src": "3282:48:9",
+                    "src": "3282:48:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 5297,
+                  "id": 9863,
                   "nodeType": "IfStatement",
-                  "src": "3278:127:9",
+                  "src": "3278:127:11",
                   "trueBody": {
-                    "id": 5296,
+                    "id": 9862,
                     "nodeType": "Block",
-                    "src": "3332:73:9",
+                    "src": "3332:73:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5294,
+                          "id": 9860,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5516,42 +5516,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 5286,
+                                "id": 9852,
                                 "name": "certificateValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4973,
-                                "src": "3346:16:9",
+                                "referencedDeclaration": 9539,
+                                "src": "3346:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                 }
                               },
-                              "id": 5291,
+                              "id": 9857,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5287,
+                                  "id": 9853,
                                   "name": "crt",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5221,
-                                  "src": "3363:3:9",
+                                  "referencedDeclaration": 9787,
+                                  "src": "3363:3:11",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                     "typeString": "struct ProfileRegistry.Certificate memory"
                                   }
                                 },
-                                "id": 5288,
+                                "id": 9854,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "to",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 4935,
-                                "src": "3363:6:9",
+                                "referencedDeclaration": 9501,
+                                "src": "3363:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -5562,37 +5562,37 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3346:24:9",
+                              "src": "3346:24:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                                 "typeString": "mapping(uint256 => bytes storage ref)"
                               }
                             },
-                            "id": 5292,
+                            "id": 9858,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5289,
+                                "id": 9855,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3371:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3371:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5290,
+                              "id": 9856,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "attributeType",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4937,
-                              "src": "3371:17:9",
+                              "referencedDeclaration": 9503,
+                              "src": "3371:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5603,7 +5603,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3346:43:9",
+                            "src": "3346:43:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bytes_storage",
                               "typeString": "bytes storage ref"
@@ -5614,14 +5614,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "",
-                            "id": 5293,
+                            "id": 9859,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "string",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3392:2:9",
+                            "src": "3392:2:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -5629,15 +5629,15 @@
                             },
                             "value": ""
                           },
-                          "src": "3346:48:9",
+                          "src": "3346:48:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_storage",
                             "typeString": "bytes storage ref"
                           }
                         },
-                        "id": 5295,
+                        "id": 9861,
                         "nodeType": "ExpressionStatement",
-                        "src": "3346:48:9"
+                        "src": "3346:48:11"
                       }
                     ]
                   }
@@ -5645,7 +5645,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5303,
+                    "id": 9869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5656,26 +5656,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5298,
+                          "id": 9864,
                           "name": "certificates",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4967,
-                          "src": "3414:12:9",
+                          "referencedDeclaration": 9533,
+                          "src": "3414:12:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                             "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                           }
                         },
-                        "id": 5300,
+                        "id": 9866,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5299,
+                          "id": 9865,
                           "name": "_id",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5215,
-                          "src": "3427:3:9",
+                          "referencedDeclaration": 9781,
+                          "src": "3427:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5686,21 +5686,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3414:17:9",
+                        "src": "3414:17:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                          "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                           "typeString": "struct ProfileRegistry.Certificate storage ref"
                         }
                       },
-                      "id": 5301,
+                      "id": 9867,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "value",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 4939,
-                      "src": "3414:23:9",
+                      "referencedDeclaration": 9505,
+                      "src": "3414:23:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes_storage",
                         "typeString": "bytes storage ref"
@@ -5711,14 +5711,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "",
-                      "id": 5302,
+                      "id": 9868,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "string",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3440:2:9",
+                      "src": "3440:2:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -5726,15 +5726,15 @@
                       },
                       "value": ""
                     },
-                    "src": "3414:28:9",
+                    "src": "3414:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage",
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "id": 5304,
+                  "id": 9870,
                   "nodeType": "ExpressionStatement",
-                  "src": "3414:28:9"
+                  "src": "3414:28:11"
                 },
                 {
                   "eventCall": {
@@ -5742,12 +5742,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5306,
+                        "id": 9872,
                         "name": "_id",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5215,
-                        "src": "3476:3:9",
+                        "referencedDeclaration": 9781,
+                        "src": "3476:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5761,18 +5761,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5305,
+                      "id": 9871,
                       "name": "CertificateUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4956,
-                      "src": "3457:18:9",
+                      "referencedDeclaration": 9522,
+                      "src": "3457:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5307,
+                    "id": 9873,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5780,57 +5780,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3457:23:9",
+                    "src": "3457:23:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5308,
+                  "id": 9874,
                   "nodeType": "EmitStatement",
-                  "src": "3452:28:9"
+                  "src": "3452:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5310,
+            "id": 9876,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5218,
+                "id": 9784,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5217,
+                  "id": 9783,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "2937:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "2937:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2937:13:9"
+                "src": "2937:13:11"
               }
             ],
             "name": "RemoveCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5216,
+              "id": 9782,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5215,
+                  "id": 9781,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5310,
-                  "src": "2917:11:9",
+                  "scope": 9876,
+                  "src": "2917:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5838,10 +5838,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5214,
+                    "id": 9780,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2917:7:9",
+                    "src": "2917:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5851,26 +5851,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2916:13:9"
+              "src": "2916:13:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5219,
+              "id": 9785,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2951:0:9"
+              "src": "2951:0:11"
             },
-            "scope": 5469,
-            "src": "2890:597:9",
+            "scope": 10035,
+            "src": "2890:597:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5341,
+              "id": 9907,
               "nodeType": "Block",
-              "src": "3585:128:9",
+              "src": "3585:128:11",
               "statements": [
                 {
                   "expression": {
@@ -5882,26 +5882,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5323,
+                            "id": 9889,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3603:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3603:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5325,
+                          "id": 9891,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5324,
+                            "id": 9890,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3616:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3616:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -5912,21 +5912,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3603:17:9",
+                          "src": "3603:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5326,
+                        "id": 9892,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "from",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4933,
-                        "src": "3603:22:9",
+                        "referencedDeclaration": 9499,
+                        "src": "3603:22:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5938,26 +5938,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5327,
+                            "id": 9893,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3627:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3627:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5329,
+                          "id": 9895,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5328,
+                            "id": 9894,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3640:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3640:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -5968,21 +5968,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3627:17:9",
+                          "src": "3627:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5330,
+                        "id": 9896,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "to",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4935,
-                        "src": "3627:20:9",
+                        "referencedDeclaration": 9501,
+                        "src": "3627:20:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5994,26 +5994,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5331,
+                            "id": 9897,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3649:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3649:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5333,
+                          "id": 9899,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5332,
+                            "id": 9898,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3662:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3662:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6024,21 +6024,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3649:17:9",
+                          "src": "3649:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5334,
+                        "id": 9900,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3649:31:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3649:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6050,26 +6050,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5335,
+                            "id": 9901,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3682:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3682:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5337,
+                          "id": 9903,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5336,
+                            "id": 9902,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3695:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3695:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6080,49 +6080,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3682:17:9",
+                          "src": "3682:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5338,
+                        "id": 9904,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "value",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4939,
-                        "src": "3682:23:9",
+                        "referencedDeclaration": 9505,
+                        "src": "3682:23:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage",
                           "typeString": "bytes storage ref"
                         }
                       }
                     ],
-                    "id": 5339,
+                    "id": 9905,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "3602:104:9",
+                    "src": "3602:104:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint256_$_t_bytes_storage_$",
                       "typeString": "tuple(address,address,uint256,bytes storage ref)"
                     }
                   },
-                  "functionReturnParameters": 5322,
-                  "id": 5340,
+                  "functionReturnParameters": 9888,
+                  "id": 9906,
                   "nodeType": "Return",
-                  "src": "3595:111:9"
+                  "src": "3595:111:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5342,
+            "id": 9908,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6130,16 +6130,16 @@
             "name": "GetCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5313,
+              "id": 9879,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5312,
+                  "id": 9878,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3517:11:9",
+                  "scope": 9908,
+                  "src": "3517:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6147,10 +6147,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5311,
+                    "id": 9877,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3517:7:9",
+                    "src": "3517:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6160,20 +6160,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3516:13:9"
+              "src": "3516:13:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5322,
+              "id": 9888,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5315,
+                  "id": 9881,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3551:7:9",
+                  "scope": 9908,
+                  "src": "3551:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6181,10 +6181,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5314,
+                    "id": 9880,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3551:7:9",
+                    "src": "3551:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6195,11 +6195,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5317,
+                  "id": 9883,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3560:7:9",
+                  "scope": 9908,
+                  "src": "3560:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6207,10 +6207,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5316,
+                    "id": 9882,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3560:7:9",
+                    "src": "3560:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6221,11 +6221,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5319,
+                  "id": 9885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3569:7:9",
+                  "scope": 9908,
+                  "src": "3569:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6233,10 +6233,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5318,
+                    "id": 9884,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3569:7:9",
+                    "src": "3569:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6247,11 +6247,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5321,
+                  "id": 9887,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3578:5:9",
+                  "scope": 9908,
+                  "src": "3578:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6259,10 +6259,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5320,
+                    "id": 9886,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3578:5:9",
+                    "src": "3578:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -6272,19 +6272,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3550:34:9"
+              "src": "3550:34:11"
             },
-            "scope": 5469,
-            "src": "3493:220:9",
+            "scope": 10035,
+            "src": "3493:220:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5357,
+              "id": 9923,
               "nodeType": "Block",
-              "src": "3805:55:9",
+              "src": "3805:55:11",
               "statements": [
                 {
                   "expression": {
@@ -6293,26 +6293,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5351,
+                        "id": 9917,
                         "name": "certificateValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4973,
-                        "src": "3822:16:9",
+                        "referencedDeclaration": 9539,
+                        "src": "3822:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                           "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                         }
                       },
-                      "id": 5353,
+                      "id": 9919,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5352,
+                        "id": 9918,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5344,
-                        "src": "3839:6:9",
+                        "referencedDeclaration": 9910,
+                        "src": "3839:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6323,21 +6323,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3822:24:9",
+                      "src": "3822:24:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                         "typeString": "mapping(uint256 => bytes storage ref)"
                       }
                     },
-                    "id": 5355,
+                    "id": 9921,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5354,
+                      "id": 9920,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5346,
-                      "src": "3847:5:9",
+                      "referencedDeclaration": 9912,
+                      "src": "3847:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6348,21 +6348,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3822:31:9",
+                    "src": "3822:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage",
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "functionReturnParameters": 5350,
-                  "id": 5356,
+                  "functionReturnParameters": 9916,
+                  "id": 9922,
                   "nodeType": "Return",
-                  "src": "3815:38:9"
+                  "src": "3815:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5358,
+            "id": 9924,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6370,16 +6370,16 @@
             "name": "GetAttributeValue",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5347,
+              "id": 9913,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5344,
+                  "id": 9910,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3746:14:9",
+                  "scope": 9924,
+                  "src": "3746:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6387,10 +6387,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5343,
+                    "id": 9909,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3746:7:9",
+                    "src": "3746:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6401,11 +6401,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5346,
+                  "id": 9912,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3762:13:9",
+                  "scope": 9924,
+                  "src": "3762:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6413,10 +6413,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5345,
+                    "id": 9911,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3762:7:9",
+                    "src": "3762:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6426,20 +6426,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3745:31:9"
+              "src": "3745:31:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5350,
+              "id": 9916,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5349,
+                  "id": 9915,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3798:5:9",
+                  "scope": 9924,
+                  "src": "3798:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6447,10 +6447,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5348,
+                    "id": 9914,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3798:5:9",
+                    "src": "3798:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -6460,19 +6460,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3797:7:9"
+              "src": "3797:7:11"
             },
-            "scope": 5469,
-            "src": "3719:141:9",
+            "scope": 10035,
+            "src": "3719:141:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5373,
+              "id": 9939,
               "nodeType": "Block",
-              "src": "3954:55:9",
+              "src": "3954:55:11",
               "statements": [
                 {
                   "expression": {
@@ -6481,26 +6481,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5367,
+                        "id": 9933,
                         "name": "certificateCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4979,
-                        "src": "3971:16:9",
+                        "referencedDeclaration": 9545,
+                        "src": "3971:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(uint256 => uint256))"
                         }
                       },
-                      "id": 5369,
+                      "id": 9935,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5368,
+                        "id": 9934,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5360,
-                        "src": "3988:6:9",
+                        "referencedDeclaration": 9926,
+                        "src": "3988:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6511,21 +6511,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3971:24:9",
+                      "src": "3971:24:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                         "typeString": "mapping(uint256 => uint256)"
                       }
                     },
-                    "id": 5371,
+                    "id": 9937,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5370,
+                      "id": 9936,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5362,
-                      "src": "3996:5:9",
+                      "referencedDeclaration": 9928,
+                      "src": "3996:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6536,21 +6536,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3971:31:9",
+                    "src": "3971:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 5366,
-                  "id": 5372,
+                  "functionReturnParameters": 9932,
+                  "id": 9938,
                   "nodeType": "Return",
-                  "src": "3964:38:9"
+                  "src": "3964:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5374,
+            "id": 9940,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6558,16 +6558,16 @@
             "name": "GetAttributeCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5363,
+              "id": 9929,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5360,
+                  "id": 9926,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3893:14:9",
+                  "scope": 9940,
+                  "src": "3893:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6575,10 +6575,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5359,
+                    "id": 9925,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3893:7:9",
+                    "src": "3893:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6589,11 +6589,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5362,
+                  "id": 9928,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3909:13:9",
+                  "scope": 9940,
+                  "src": "3909:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6601,10 +6601,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5361,
+                    "id": 9927,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3909:7:9",
+                    "src": "3909:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6614,20 +6614,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3892:31:9"
+              "src": "3892:31:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5366,
+              "id": 9932,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5365,
+                  "id": 9931,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3945:7:9",
+                  "scope": 9940,
+                  "src": "3945:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6635,10 +6635,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5364,
+                    "id": 9930,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3945:7:9",
+                    "src": "3945:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6648,19 +6648,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3944:9:9"
+              "src": "3944:9:11"
             },
-            "scope": 5469,
-            "src": "3866:143:9",
+            "scope": 10035,
+            "src": "3866:143:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5421,
+              "id": 9987,
               "nodeType": "Block",
-              "src": "4092:403:9",
+              "src": "4092:403:11",
               "statements": [
                 {
                   "condition": {
@@ -6669,7 +6669,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5387,
+                    "id": 9953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6681,12 +6681,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 5382,
+                            "id": 9948,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5376,
-                            "src": "4124:6:9",
+                            "referencedDeclaration": 9942,
+                            "src": "4124:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -6695,14 +6695,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "31343031",
-                            "id": 5383,
+                            "id": 9949,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4132:4:9",
+                            "src": "4132:4:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1401_by_1",
@@ -6722,18 +6722,18 @@
                               "typeString": "int_const 1401"
                             }
                           ],
-                          "id": 5381,
+                          "id": 9947,
                           "name": "GetAttributeValue",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5358,
-                          "src": "4106:17:9",
+                          "referencedDeclaration": 9924,
+                          "src": "4106:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                             "typeString": "function (address,uint256) view returns (bytes memory)"
                           }
                         },
-                        "id": 5384,
+                        "id": 9950,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6741,13 +6741,13 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "4106:31:9",
+                        "src": "4106:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
                           "typeString": "bytes memory"
                         }
                       },
-                      "id": 5385,
+                      "id": 9951,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6755,7 +6755,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4106:38:9",
+                      "src": "4106:38:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6766,14 +6766,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5386,
+                      "id": 9952,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4147:1:9",
+                      "src": "4147:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -6781,7 +6781,7 @@
                       },
                       "value": "0"
                     },
-                    "src": "4106:42:9",
+                    "src": "4106:42:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -6794,7 +6794,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5398,
+                      "id": 9964,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6806,12 +6806,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5393,
+                              "id": 9959,
                               "name": "_owner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5376,
-                              "src": "4236:6:9",
+                              "referencedDeclaration": 9942,
+                              "src": "4236:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6820,14 +6820,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "31333031",
-                              "id": 5394,
+                              "id": 9960,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4244:4:9",
+                              "src": "4244:4:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1301_by_1",
@@ -6847,18 +6847,18 @@
                                 "typeString": "int_const 1301"
                               }
                             ],
-                            "id": 5392,
+                            "id": 9958,
                             "name": "GetAttributeValue",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5358,
-                            "src": "4218:17:9",
+                            "referencedDeclaration": 9924,
+                            "src": "4218:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (address,uint256) view returns (bytes memory)"
                             }
                           },
-                          "id": 5395,
+                          "id": 9961,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6866,13 +6866,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4218:31:9",
+                          "src": "4218:31:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
                           }
                         },
-                        "id": 5396,
+                        "id": 9962,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6880,7 +6880,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4218:38:9",
+                        "src": "4218:38:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6891,14 +6891,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 5397,
+                        "id": 9963,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "4259:1:9",
+                        "src": "4259:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -6906,7 +6906,7 @@
                         },
                         "value": "0"
                       },
-                      "src": "4218:42:9",
+                      "src": "4218:42:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -6919,7 +6919,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5409,
+                        "id": 9975,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6931,12 +6931,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 5404,
+                                "id": 9970,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5376,
-                                "src": "4346:6:9",
+                                "referencedDeclaration": 9942,
+                                "src": "4346:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6945,14 +6945,14 @@
                               {
                                 "argumentTypes": null,
                                 "hexValue": "31323031",
-                                "id": 5405,
+                                "id": 9971,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "4354:4:9",
+                                "src": "4354:4:11",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1201_by_1",
@@ -6972,18 +6972,18 @@
                                   "typeString": "int_const 1201"
                                 }
                               ],
-                              "id": 5403,
+                              "id": 9969,
                               "name": "GetAttributeValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5358,
-                              "src": "4328:17:9",
+                              "referencedDeclaration": 9924,
+                              "src": "4328:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                 "typeString": "function (address,uint256) view returns (bytes memory)"
                               }
                             },
-                            "id": 5406,
+                            "id": 9972,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6991,13 +6991,13 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "4328:31:9",
+                            "src": "4328:31:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bytes_memory_ptr",
                               "typeString": "bytes memory"
                             }
                           },
-                          "id": 5407,
+                          "id": 9973,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7005,7 +7005,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4328:38:9",
+                          "src": "4328:38:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7016,14 +7016,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5408,
+                          "id": 9974,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4369:1:9",
+                          "src": "4369:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -7031,34 +7031,34 @@
                           },
                           "value": "0"
                         },
-                        "src": "4328:42:9",
+                        "src": "4328:42:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
                       "falseBody": {
-                        "id": 5417,
+                        "id": 9983,
                         "nodeType": "Block",
-                        "src": "4434:55:9",
+                        "src": "4434:55:11",
                         "statements": [
                           {
                             "expression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5414,
+                                "id": 9980,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4931,
-                                "src": "4455:13:9",
+                                "referencedDeclaration": 9497,
+                                "src": "4455:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 5415,
+                              "id": 9981,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7066,44 +7066,44 @@
                               "memberName": "ANONYMOUS",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "4455:23:9",
+                              "src": "4455:23:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 5380,
-                            "id": 5416,
+                            "functionReturnParameters": 9946,
+                            "id": 9982,
                             "nodeType": "Return",
-                            "src": "4448:30:9"
+                            "src": "4448:30:11"
                           }
                         ]
                       },
-                      "id": 5418,
+                      "id": 9984,
                       "nodeType": "IfStatement",
-                      "src": "4324:165:9",
+                      "src": "4324:165:11",
                       "trueBody": {
-                        "id": 5413,
+                        "id": 9979,
                         "nodeType": "Block",
-                        "src": "4372:56:9",
+                        "src": "4372:56:11",
                         "statements": [
                           {
                             "expression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5410,
+                                "id": 9976,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4931,
-                                "src": "4393:13:9",
+                                "referencedDeclaration": 9497,
+                                "src": "4393:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 5411,
+                              "id": 9977,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7111,45 +7111,45 @@
                               "memberName": "REGISTERED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "4393:24:9",
+                              "src": "4393:24:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 5380,
-                            "id": 5412,
+                            "functionReturnParameters": 9946,
+                            "id": 9978,
                             "nodeType": "Return",
-                            "src": "4386:31:9"
+                            "src": "4386:31:11"
                           }
                         ]
                       }
                     },
-                    "id": 5419,
+                    "id": 9985,
                     "nodeType": "IfStatement",
-                    "src": "4214:275:9",
+                    "src": "4214:275:11",
                     "trueBody": {
-                      "id": 5402,
+                      "id": 9968,
                       "nodeType": "Block",
-                      "src": "4262:56:9",
+                      "src": "4262:56:11",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 5399,
+                              "id": 9965,
                               "name": "IdentityLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4931,
-                              "src": "4283:13:9",
+                              "referencedDeclaration": 9497,
+                              "src": "4283:13:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                 "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                               }
                             },
-                            "id": 5400,
+                            "id": 9966,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -7157,45 +7157,45 @@
                             "memberName": "IDENTIFIED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4283:24:9",
+                            "src": "4283:24:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                              "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                               "typeString": "enum ProfileRegistry.IdentityLevel"
                             }
                           },
-                          "functionReturnParameters": 5380,
-                          "id": 5401,
+                          "functionReturnParameters": 9946,
+                          "id": 9967,
                           "nodeType": "Return",
-                          "src": "4276:31:9"
+                          "src": "4276:31:11"
                         }
                       ]
                     }
                   },
-                  "id": 5420,
+                  "id": 9986,
                   "nodeType": "IfStatement",
-                  "src": "4102:387:9",
+                  "src": "4102:387:11",
                   "trueBody": {
-                    "id": 5391,
+                    "id": 9957,
                     "nodeType": "Block",
-                    "src": "4150:58:9",
+                    "src": "4150:58:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5388,
+                            "id": 9954,
                             "name": "IdentityLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4931,
-                            "src": "4171:13:9",
+                            "referencedDeclaration": 9497,
+                            "src": "4171:13:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 5389,
+                          "id": 9955,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7203,16 +7203,16 @@
                           "memberName": "PROFESSIONAL",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4171:26:9",
+                          "src": "4171:26:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "functionReturnParameters": 5380,
-                        "id": 5390,
+                        "functionReturnParameters": 9946,
+                        "id": 9956,
                         "nodeType": "Return",
-                        "src": "4164:33:9"
+                        "src": "4164:33:11"
                       }
                     ]
                   }
@@ -7220,7 +7220,7 @@
               ]
             },
             "documentation": null,
-            "id": 5422,
+            "id": 9988,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -7228,16 +7228,16 @@
             "name": "GetProfileLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5377,
+              "id": 9943,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5376,
+                  "id": 9942,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5422,
-                  "src": "4040:14:9",
+                  "scope": 9988,
+                  "src": "4040:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7245,10 +7245,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5375,
+                    "id": 9941,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4040:7:9",
+                    "src": "4040:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -7258,35 +7258,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4039:16:9"
+              "src": "4039:16:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5380,
+              "id": 9946,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5379,
+                  "id": 9945,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5422,
-                  "src": "4077:13:9",
+                  "scope": 9988,
+                  "src": "4077:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 5378,
+                    "id": 9944,
                     "name": "IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "4077:13:9",
+                    "referencedDeclaration": 9497,
+                    "src": "4077:13:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -7294,24 +7294,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4076:15:9"
+              "src": "4076:15:11"
             },
-            "scope": 5469,
-            "src": "4015:480:9",
+            "scope": 10035,
+            "src": "4015:480:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5440,
+              "id": 10006,
               "nodeType": "Block",
-              "src": "4579:65:9",
+              "src": "4579:65:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5436,
+                    "id": 10002,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7320,26 +7320,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5431,
+                        "id": 9997,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "4589:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "4589:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5433,
+                      "id": 9999,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5432,
+                        "id": 9998,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5424,
-                        "src": "4600:10:9",
+                        "referencedDeclaration": 9990,
+                        "src": "4600:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -7350,7 +7350,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4589:22:9",
+                      "src": "4589:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -7360,7 +7360,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5435,
+                      "id": 10001,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7368,18 +7368,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "-",
                       "prefix": true,
-                      "src": "4614:2:9",
+                      "src": "4614:2:11",
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5434,
+                        "id": 10000,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "4615:1:9",
+                        "src": "4615:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -7392,28 +7392,28 @@
                         "typeString": "int_const -1"
                       }
                     },
-                    "src": "4589:27:9",
+                    "src": "4589:27:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5437,
+                  "id": 10003,
                   "nodeType": "ExpressionStatement",
-                  "src": "4589:27:9"
+                  "src": "4589:27:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5438,
+                    "id": 10004,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4633:4:9",
+                    "src": "4633:4:11",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -7421,52 +7421,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5430,
-                  "id": 5439,
+                  "functionReturnParameters": 9996,
+                  "id": 10005,
                   "nodeType": "Return",
-                  "src": "4626:11:9"
+                  "src": "4626:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5441,
+            "id": 10007,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5427,
+                "id": 9993,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5426,
+                  "id": 9992,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4554:9:9",
+                  "referencedDeclaration": 10830,
+                  "src": "4554:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4554:9:9"
+                "src": "4554:9:11"
               }
             ],
             "name": "AddSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5425,
+              "id": 9991,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5424,
+                  "id": 9990,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5441,
-                  "src": "4527:18:9",
+                  "scope": 10007,
+                  "src": "4527:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7474,10 +7474,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5423,
+                    "id": 9989,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4527:7:9",
+                    "src": "4527:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -7487,20 +7487,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4526:20:9"
+              "src": "4526:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5430,
+              "id": 9996,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5429,
+                  "id": 9995,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5441,
-                  "src": "4573:4:9",
+                  "scope": 10007,
+                  "src": "4573:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7508,10 +7508,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5428,
+                    "id": 9994,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4573:4:9",
+                    "src": "4573:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -7521,19 +7521,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4572:6:9"
+              "src": "4572:6:11"
             },
-            "scope": 5469,
-            "src": "4501:143:9",
+            "scope": 10035,
+            "src": "4501:143:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5467,
+              "id": 10033,
               "nodeType": "Block",
-              "src": "4731:118:9",
+              "src": "4731:118:11",
               "statements": [
                 {
                   "expression": {
@@ -7545,7 +7545,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5456,
+                        "id": 10022,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7555,12 +7555,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5452,
+                              "id": 10018,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5443,
-                              "src": "4767:10:9",
+                              "referencedDeclaration": 10009,
+                              "src": "4767:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -7574,18 +7574,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5451,
+                            "id": 10017,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "4749:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "4749:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5453,
+                          "id": 10019,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7593,7 +7593,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4749:29:9",
+                          "src": "4749:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -7603,7 +7603,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5455,
+                          "id": 10021,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7611,18 +7611,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "-",
                           "prefix": true,
-                          "src": "4782:2:9",
+                          "src": "4782:2:11",
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 5454,
+                            "id": 10020,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4783:1:9",
+                            "src": "4783:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1_by_1",
@@ -7635,7 +7635,7 @@
                             "typeString": "int_const -1"
                           }
                         },
-                        "src": "4749:35:9",
+                        "src": "4749:35:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7649,21 +7649,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5450,
+                      "id": 10016,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4741:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "4741:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5457,
+                    "id": 10023,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7671,20 +7671,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4741:44:9",
+                    "src": "4741:44:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5458,
+                  "id": 10024,
                   "nodeType": "ExpressionStatement",
-                  "src": "4741:44:9"
+                  "src": "4741:44:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5463,
+                    "id": 10029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7693,26 +7693,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5459,
+                        "id": 10025,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "4795:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "4795:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5461,
+                      "id": 10027,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5460,
+                        "id": 10026,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5443,
-                        "src": "4806:10:9",
+                        "referencedDeclaration": 10009,
+                        "src": "4806:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -7723,7 +7723,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4795:22:9",
+                      "src": "4795:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -7734,14 +7734,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5462,
+                      "id": 10028,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4820:1:9",
+                      "src": "4820:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -7749,28 +7749,28 @@
                       },
                       "value": "0"
                     },
-                    "src": "4795:26:9",
+                    "src": "4795:26:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5464,
+                  "id": 10030,
                   "nodeType": "ExpressionStatement",
-                  "src": "4795:26:9"
+                  "src": "4795:26:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5465,
+                    "id": 10031,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4838:4:9",
+                    "src": "4838:4:11",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -7778,52 +7778,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5449,
-                  "id": 5466,
+                  "functionReturnParameters": 10015,
+                  "id": 10032,
                   "nodeType": "Return",
-                  "src": "4831:11:9"
+                  "src": "4831:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5468,
+            "id": 10034,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5446,
+                "id": 10012,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5445,
+                  "id": 10011,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4706:9:9",
+                  "referencedDeclaration": 10830,
+                  "src": "4706:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4706:9:9"
+                "src": "4706:9:11"
               }
             ],
             "name": "RemoveSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5444,
+              "id": 10010,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5443,
+                  "id": 10009,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5468,
-                  "src": "4679:18:9",
+                  "scope": 10034,
+                  "src": "4679:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7831,10 +7831,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5442,
+                    "id": 10008,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4679:7:9",
+                    "src": "4679:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -7844,20 +7844,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4678:20:9"
+              "src": "4678:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5449,
+              "id": 10015,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5448,
+                  "id": 10014,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5468,
-                  "src": "4725:4:9",
+                  "scope": 10034,
+                  "src": "4725:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7865,10 +7865,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5447,
+                    "id": 10013,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4725:4:9",
+                    "src": "4725:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -7878,33 +7878,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4724:6:9"
+              "src": "4724:6:11"
             },
-            "scope": 5469,
-            "src": "4650:199:9",
+            "scope": 10035,
+            "src": "4650:199:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5470,
-        "src": "150:4701:9"
+        "scope": 10036,
+        "src": "150:4701:11"
       }
     ],
-    "src": "0:4852:9"
+    "src": "0:4852:11"
   },
   "legacyAST": {
     "absolutePath": "contracts/ProfileRegistry.sol",
     "exportedSymbols": {
       "ProfileRegistry": [
-        5469
+        10035
       ]
     },
-    "id": 5470,
+    "id": 10036,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 4905,
+        "id": 9471,
         "literals": [
           "solidity",
           "^",
@@ -7912,27 +7912,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:9"
+        "src": "0:24:11"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 4906,
+        "id": 9472,
         "nodeType": "ImportDirective",
-        "scope": 5470,
-        "sourceUnit": 7337,
-        "src": "27:59:9",
+        "scope": 10036,
+        "sourceUnit": 10883,
+        "src": "27:59:11",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 4907,
+        "id": 9473,
         "nodeType": "ImportDirective",
-        "scope": 5470,
-        "sourceUnit": 7157,
-        "src": "87:60:9",
+        "scope": 10036,
+        "sourceUnit": 10703,
+        "src": "87:60:11",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -7942,60 +7942,60 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4908,
+              "id": 9474,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "178:7:9",
+              "referencedDeclaration": 10882,
+              "src": "178:7:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 4909,
+            "id": 9475,
             "nodeType": "InheritanceSpecifier",
-            "src": "178:7:9"
+            "src": "178:7:11"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 4910,
+              "id": 9476,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7156,
-              "src": "187:8:9",
+              "referencedDeclaration": 10702,
+              "src": "187:8:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$7156",
+                "typeIdentifier": "t_contract$_Pausable_$10702",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 4911,
+            "id": 9477,
             "nodeType": "InheritanceSpecifier",
-            "src": "187:8:9"
+            "src": "187:8:11"
           }
         ],
         "contractDependencies": [
-          7156,
-          7336
+          10702,
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5469,
+        "id": 10035,
         "linearizedBaseContracts": [
-          5469,
-          7156,
-          7336
+          10035,
+          10702,
+          10882
         ],
         "name": "ProfileRegistry",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 4924,
+              "id": 9490,
               "nodeType": "Block",
-              "src": "223:73:9",
+              "src": "223:73:11",
               "statements": [
                 {
                   "expression": {
@@ -8007,7 +8007,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 4920,
+                        "id": 9486,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8019,18 +8019,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4915,
+                                "id": 9481,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "259:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "259:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4916,
+                              "id": 9482,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8038,7 +8038,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "259:10:9",
+                              "src": "259:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -8052,18 +8052,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 4914,
+                            "id": 9480,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "241:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "241:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 4917,
+                          "id": 9483,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8071,7 +8071,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "241:29:9",
+                          "src": "241:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -8081,7 +8081,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4919,
+                          "id": 9485,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -8089,18 +8089,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "-",
                           "prefix": true,
-                          "src": "274:3:9",
+                          "src": "274:3:11",
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4918,
+                            "id": 9484,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "276:1:9",
+                            "src": "276:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1_by_1",
@@ -8113,7 +8113,7 @@
                             "typeString": "int_const -1"
                           }
                         },
-                        "src": "241:36:9",
+                        "src": "241:36:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8127,21 +8127,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4913,
+                      "id": 9479,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "233:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "233:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4921,
+                    "id": 9487,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8149,86 +8149,86 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "233:45:9",
+                    "src": "233:45:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4922,
+                  "id": 9488,
                   "nodeType": "ExpressionStatement",
-                  "src": "233:45:9"
+                  "src": "233:45:11"
                 },
                 {
-                  "id": 4923,
+                  "id": 9489,
                   "nodeType": "PlaceholderStatement",
-                  "src": "288:1:9"
+                  "src": "288:1:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 4925,
+            "id": 9491,
             "name": "onlySonm",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4912,
+              "id": 9478,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "220:2:9"
+              "src": "220:2:11"
             },
-            "src": "203:93:9",
+            "src": "203:93:11",
             "visibility": "internal"
           },
           {
             "canonicalName": "ProfileRegistry.IdentityLevel",
-            "id": 4931,
+            "id": 9497,
             "members": [
               {
-                "id": 4926,
+                "id": 9492,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "331:7:9"
+                "src": "331:7:11"
               },
               {
-                "id": 4927,
+                "id": 9493,
                 "name": "ANONYMOUS",
                 "nodeType": "EnumValue",
-                "src": "348:9:9"
+                "src": "348:9:11"
               },
               {
-                "id": 4928,
+                "id": 9494,
                 "name": "REGISTERED",
                 "nodeType": "EnumValue",
-                "src": "367:10:9"
+                "src": "367:10:11"
               },
               {
-                "id": 4929,
+                "id": 9495,
                 "name": "IDENTIFIED",
                 "nodeType": "EnumValue",
-                "src": "387:10:9"
+                "src": "387:10:11"
               },
               {
-                "id": 4930,
+                "id": 9496,
                 "name": "PROFESSIONAL",
                 "nodeType": "EnumValue",
-                "src": "407:12:9"
+                "src": "407:12:11"
               }
             ],
             "name": "IdentityLevel",
             "nodeType": "EnumDefinition",
-            "src": "302:123:9"
+            "src": "302:123:11"
           },
           {
             "canonicalName": "ProfileRegistry.Certificate",
-            "id": 4940,
+            "id": 9506,
             "members": [
               {
                 "constant": false,
-                "id": 4933,
+                "id": 9499,
                 "name": "from",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "460:12:9",
+                "scope": 9506,
+                "src": "460:12:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8236,10 +8236,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 4932,
+                  "id": 9498,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "460:7:9",
+                  "src": "460:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -8250,11 +8250,11 @@
               },
               {
                 "constant": false,
-                "id": 4935,
+                "id": 9501,
                 "name": "to",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "483:10:9",
+                "scope": 9506,
+                "src": "483:10:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8262,10 +8262,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 4934,
+                  "id": 9500,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "483:7:9",
+                  "src": "483:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -8276,11 +8276,11 @@
               },
               {
                 "constant": false,
-                "id": 4937,
+                "id": 9503,
                 "name": "attributeType",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "504:18:9",
+                "scope": 9506,
+                "src": "504:18:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8288,10 +8288,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 4936,
+                  "id": 9502,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "504:4:9",
+                  "src": "504:4:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8302,11 +8302,11 @@
               },
               {
                 "constant": false,
-                "id": 4939,
+                "id": 9505,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 4940,
-                "src": "533:11:9",
+                "scope": 9506,
+                "src": "533:11:11",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8314,10 +8314,10 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 4938,
+                  "id": 9504,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "533:5:9",
+                  "src": "533:5:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -8329,28 +8329,28 @@
             ],
             "name": "Certificate",
             "nodeType": "StructDefinition",
-            "scope": 5469,
-            "src": "431:120:9",
+            "scope": 10035,
+            "src": "431:120:11",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4944,
+            "id": 9510,
             "name": "ValidatorCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4943,
+              "id": 9509,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4942,
+                  "id": 9508,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4944,
-                  "src": "580:25:9",
+                  "scope": 9510,
+                  "src": "580:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8358,10 +8358,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4941,
+                    "id": 9507,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "580:7:9",
+                    "src": "580:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8371,28 +8371,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "579:27:9"
+              "src": "579:27:11"
             },
-            "src": "557:50:9"
+            "src": "557:50:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4948,
+            "id": 9514,
             "name": "ValidatorDeleted",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4947,
+              "id": 9513,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4946,
+                  "id": 9512,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4948,
-                  "src": "636:25:9",
+                  "scope": 9514,
+                  "src": "636:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8400,10 +8400,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4945,
+                    "id": 9511,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "636:7:9",
+                    "src": "636:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8413,28 +8413,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "635:27:9"
+              "src": "635:27:11"
             },
-            "src": "613:50:9"
+            "src": "613:50:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4952,
+            "id": 9518,
             "name": "CertificateCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4951,
+              "id": 9517,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4950,
+                  "id": 9516,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4952,
-                  "src": "694:15:9",
+                  "scope": 9518,
+                  "src": "694:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8442,10 +8442,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4949,
+                    "id": 9515,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "694:4:9",
+                    "src": "694:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8455,28 +8455,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "693:17:9"
+              "src": "693:17:11"
             },
-            "src": "669:42:9"
+            "src": "669:42:11"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 4956,
+            "id": 9522,
             "name": "CertificateUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 4955,
+              "id": 9521,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4954,
+                  "id": 9520,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4956,
-                  "src": "742:15:9",
+                  "scope": 9522,
+                  "src": "742:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8484,10 +8484,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4953,
+                    "id": 9519,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "742:4:9",
+                    "src": "742:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8497,17 +8497,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "741:17:9"
+              "src": "741:17:11"
             },
-            "src": "717:42:9"
+            "src": "717:42:11"
           },
           {
             "constant": false,
-            "id": 4959,
+            "id": 9525,
             "name": "certificatesCount",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "765:29:9",
+            "scope": 10035,
+            "src": "765:29:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8515,10 +8515,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 4957,
+              "id": 9523,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "765:7:9",
+              "src": "765:7:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -8527,14 +8527,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 4958,
+              "id": 9524,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "793:1:9",
+              "src": "793:1:11",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -8546,11 +8546,11 @@
           },
           {
             "constant": false,
-            "id": 4963,
+            "id": 9529,
             "name": "validators",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "801:42:9",
+            "scope": 10035,
+            "src": "801:42:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8558,28 +8558,28 @@
               "typeString": "mapping(address => int8)"
             },
             "typeName": {
-              "id": 4962,
+              "id": 9528,
               "keyType": {
-                "id": 4960,
+                "id": 9526,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "809:7:9",
+                "src": "809:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "801:24:9",
+              "src": "801:24:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                 "typeString": "mapping(address => int8)"
               },
               "valueType": {
-                "id": 4961,
+                "id": 9527,
                 "name": "int8",
                 "nodeType": "ElementaryTypeName",
-                "src": "820:4:9",
+                "src": "820:4:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_int8",
                   "typeString": "int8"
@@ -8591,44 +8591,44 @@
           },
           {
             "constant": false,
-            "id": 4967,
+            "id": 9533,
             "name": "certificates",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "850:51:9",
+            "scope": 10035,
+            "src": "850:51:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
             },
             "typeName": {
-              "id": 4966,
+              "id": 9532,
               "keyType": {
-                "id": 4964,
+                "id": 9530,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "858:7:9",
+                "src": "858:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "850:31:9",
+              "src": "850:31:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                 "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 4965,
+                "id": 9531,
                 "name": "Certificate",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 4940,
-                "src": "869:11:9",
+                "referencedDeclaration": 9506,
+                "src": "869:11:11",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Certificate_$4940_storage_ptr",
+                  "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
                   "typeString": "struct ProfileRegistry.Certificate"
                 }
               }
@@ -8638,11 +8638,11 @@
           },
           {
             "constant": false,
-            "id": 4973,
+            "id": 9539,
             "name": "certificateValue",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "908:62:9",
+            "scope": 10035,
+            "src": "908:62:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8650,46 +8650,46 @@
               "typeString": "mapping(address => mapping(uint256 => bytes))"
             },
             "typeName": {
-              "id": 4972,
+              "id": 9538,
               "keyType": {
-                "id": 4968,
+                "id": 9534,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "916:7:9",
+                "src": "916:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "908:45:9",
+              "src": "908:45:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                 "typeString": "mapping(address => mapping(uint256 => bytes))"
               },
               "valueType": {
-                "id": 4971,
+                "id": 9537,
                 "keyType": {
-                  "id": 4969,
+                  "id": 9535,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "935:7:9",
+                  "src": "935:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "927:25:9",
+                "src": "927:25:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                   "typeString": "mapping(uint256 => bytes)"
                 },
                 "valueType": {
-                  "id": 4970,
+                  "id": 9536,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "946:5:9",
+                  "src": "946:5:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -8702,11 +8702,11 @@
           },
           {
             "constant": false,
-            "id": 4979,
+            "id": 9545,
             "name": "certificateCount",
             "nodeType": "VariableDeclaration",
-            "scope": 5469,
-            "src": "977:61:9",
+            "scope": 10035,
+            "src": "977:61:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8714,46 +8714,46 @@
               "typeString": "mapping(address => mapping(uint256 => uint256))"
             },
             "typeName": {
-              "id": 4978,
+              "id": 9544,
               "keyType": {
-                "id": 4974,
+                "id": 9540,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "985:7:9",
+                "src": "985:7:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "977:44:9",
+              "src": "977:44:11",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(uint256 => uint256))"
               },
               "valueType": {
-                "id": 4977,
+                "id": 9543,
                 "keyType": {
-                  "id": 4975,
+                  "id": 9541,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1004:7:9",
+                  "src": "1004:7:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "996:24:9",
+                "src": "996:24:11",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                   "typeString": "mapping(uint256 => uint256)"
                 },
                 "valueType": {
-                  "id": 4976,
+                  "id": 9542,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1015:4:9",
+                  "src": "1015:4:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8766,26 +8766,26 @@
           },
           {
             "body": {
-              "id": 4995,
+              "id": 9561,
               "nodeType": "Block",
-              "src": "1066:73:9",
+              "src": "1066:73:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4985,
+                    "id": 9551,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4982,
+                      "id": 9548,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "1076:5:9",
+                      "referencedDeclaration": 10800,
+                      "src": "1076:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -8797,18 +8797,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4983,
+                        "id": 9549,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "1084:3:9",
+                        "referencedDeclaration": 11315,
+                        "src": "1084:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4984,
+                      "id": 9550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -8816,26 +8816,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "1084:10:9",
+                      "src": "1084:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1076:18:9",
+                    "src": "1076:18:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4986,
+                  "id": 9552,
                   "nodeType": "ExpressionStatement",
-                  "src": "1076:18:9"
+                  "src": "1076:18:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4993,
+                    "id": 9559,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8844,34 +8844,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4987,
+                        "id": 9553,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1104:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1104:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 4990,
+                      "id": 9556,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4988,
+                          "id": 9554,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1115:3:9",
+                          "referencedDeclaration": 11315,
+                          "src": "1115:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4989,
+                        "id": 9555,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8879,7 +8879,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1115:10:9",
+                        "src": "1115:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -8890,7 +8890,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1104:22:9",
+                      "src": "1104:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -8900,7 +8900,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4992,
+                      "id": 9558,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8908,18 +8908,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "-",
                       "prefix": true,
-                      "src": "1129:3:9",
+                      "src": "1129:3:11",
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 4991,
+                        "id": 9557,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "1131:1:9",
+                        "src": "1131:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -8932,20 +8932,20 @@
                         "typeString": "int_const -1"
                       }
                     },
-                    "src": "1104:28:9",
+                    "src": "1104:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 4994,
+                  "id": 9560,
                   "nodeType": "ExpressionStatement",
-                  "src": "1104:28:9"
+                  "src": "1104:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 4996,
+            "id": 9562,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -8953,29 +8953,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4980,
+              "id": 9546,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1056:2:9"
+              "src": "1056:2:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4981,
+              "id": 9547,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1066:0:9"
+              "src": "1066:0:11"
             },
-            "scope": 5469,
-            "src": "1045:94:9",
+            "scope": 10035,
+            "src": "1045:94:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5035,
+              "id": 9601,
               "nodeType": "Block",
-              "src": "1248:200:9",
+              "src": "1248:200:11",
               "statements": [
                 {
                   "expression": {
@@ -8987,19 +8987,19 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5012,
+                        "id": 9578,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5010,
+                          "id": 9576,
                           "name": "_level",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5000,
-                          "src": "1266:6:9",
+                          "referencedDeclaration": 9566,
+                          "src": "1266:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -9010,14 +9010,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5011,
+                          "id": 9577,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1275:1:9",
+                          "src": "1275:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -9025,7 +9025,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1266:10:9",
+                        "src": "1266:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9039,21 +9039,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5009,
+                      "id": 9575,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1258:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1258:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5013,
+                    "id": 9579,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9061,15 +9061,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1258:19:9",
+                    "src": "1258:19:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5014,
+                  "id": 9580,
                   "nodeType": "ExpressionStatement",
-                  "src": "1258:19:9"
+                  "src": "1258:19:11"
                 },
                 {
                   "expression": {
@@ -9081,7 +9081,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5020,
+                        "id": 9586,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9091,12 +9091,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5017,
+                              "id": 9583,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4998,
-                              "src": "1313:10:9",
+                              "referencedDeclaration": 9564,
+                              "src": "1313:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -9110,18 +9110,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5016,
+                            "id": 9582,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "1295:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "1295:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5018,
+                          "id": 9584,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9129,7 +9129,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1295:29:9",
+                          "src": "1295:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -9140,14 +9140,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5019,
+                          "id": 9585,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1328:1:9",
+                          "src": "1328:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -9155,7 +9155,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1295:34:9",
+                        "src": "1295:34:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9169,21 +9169,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5015,
+                      "id": 9581,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1287:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1287:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5021,
+                    "id": 9587,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9191,20 +9191,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1287:43:9",
+                    "src": "1287:43:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5022,
+                  "id": 9588,
                   "nodeType": "ExpressionStatement",
-                  "src": "1287:43:9"
+                  "src": "1287:43:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5027,
+                    "id": 9593,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9213,26 +9213,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5023,
+                        "id": 9589,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1340:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1340:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5025,
+                      "id": 9591,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5024,
+                        "id": 9590,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4998,
-                        "src": "1351:10:9",
+                        "referencedDeclaration": 9564,
+                        "src": "1351:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9243,7 +9243,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1340:22:9",
+                      "src": "1340:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -9253,26 +9253,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5026,
+                      "id": 9592,
                       "name": "_level",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5000,
-                      "src": "1365:6:9",
+                      "referencedDeclaration": 9566,
+                      "src": "1365:6:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
                       }
                     },
-                    "src": "1340:31:9",
+                    "src": "1340:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5028,
+                  "id": 9594,
                   "nodeType": "ExpressionStatement",
-                  "src": "1340:31:9"
+                  "src": "1340:31:11"
                 },
                 {
                   "eventCall": {
@@ -9280,12 +9280,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5030,
+                        "id": 9596,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4998,
-                        "src": "1403:10:9",
+                        "referencedDeclaration": 9564,
+                        "src": "1403:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9299,18 +9299,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5029,
+                      "id": 9595,
                       "name": "ValidatorCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4944,
-                      "src": "1386:16:9",
+                      "referencedDeclaration": 9510,
+                      "src": "1386:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5031,
+                    "id": 9597,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9318,95 +9318,95 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1386:28:9",
+                    "src": "1386:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5032,
+                  "id": 9598,
                   "nodeType": "EmitStatement",
-                  "src": "1381:33:9"
+                  "src": "1381:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5033,
+                    "id": 9599,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4998,
-                    "src": "1431:10:9",
+                    "referencedDeclaration": 9564,
+                    "src": "1431:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 5008,
-                  "id": 5034,
+                  "functionReturnParameters": 9574,
+                  "id": 9600,
                   "nodeType": "Return",
-                  "src": "1424:17:9"
+                  "src": "1424:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5036,
+            "id": 9602,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5003,
+                "id": 9569,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5002,
+                  "id": 9568,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4925,
-                  "src": "1207:8:9",
+                  "referencedDeclaration": 9491,
+                  "src": "1207:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1207:8:9"
+                "src": "1207:8:11"
               },
               {
                 "arguments": null,
-                "id": 5005,
+                "id": 9571,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5004,
+                  "id": 9570,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1216:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1216:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1216:13:9"
+                "src": "1216:13:11"
               }
             ],
             "name": "AddValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5001,
+              "id": 9567,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4998,
+                  "id": 9564,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1167:18:9",
+                  "scope": 9602,
+                  "src": "1167:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9414,10 +9414,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4997,
+                    "id": 9563,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1167:7:9",
+                    "src": "1167:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9428,11 +9428,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5000,
+                  "id": 9566,
                   "name": "_level",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1187:11:9",
+                  "scope": 9602,
+                  "src": "1187:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9440,10 +9440,10 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 4999,
+                    "id": 9565,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1187:4:9",
+                    "src": "1187:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
@@ -9453,20 +9453,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1166:33:9"
+              "src": "1166:33:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5008,
+              "id": 9574,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5007,
+                  "id": 9573,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5036,
-                  "src": "1239:7:9",
+                  "scope": 9602,
+                  "src": "1239:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9474,10 +9474,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5006,
+                    "id": 9572,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1239:7:9",
+                    "src": "1239:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9487,19 +9487,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1238:9:9"
+              "src": "1238:9:11"
             },
-            "scope": 5469,
-            "src": "1145:303:9",
+            "scope": 10035,
+            "src": "1145:303:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5067,
+              "id": 9633,
               "nodeType": "Block",
-              "src": "1547:165:9",
+              "src": "1547:165:11",
               "statements": [
                 {
                   "expression": {
@@ -9511,7 +9511,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5052,
+                        "id": 9618,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9521,12 +9521,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5049,
+                              "id": 9615,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5038,
-                              "src": "1583:10:9",
+                              "referencedDeclaration": 9604,
+                              "src": "1583:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -9540,18 +9540,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5048,
+                            "id": 9614,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "1565:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "1565:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5050,
+                          "id": 9616,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9559,7 +9559,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1565:29:9",
+                          "src": "1565:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -9570,14 +9570,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5051,
+                          "id": 9617,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1597:1:9",
+                          "src": "1597:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -9585,7 +9585,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1565:33:9",
+                        "src": "1565:33:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9599,21 +9599,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5047,
+                      "id": 9613,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1557:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "1557:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5053,
+                    "id": 9619,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9621,20 +9621,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1557:42:9",
+                    "src": "1557:42:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5054,
+                  "id": 9620,
                   "nodeType": "ExpressionStatement",
-                  "src": "1557:42:9"
+                  "src": "1557:42:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5059,
+                    "id": 9625,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9643,26 +9643,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5055,
+                        "id": 9621,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "1609:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "1609:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5057,
+                      "id": 9623,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5056,
+                        "id": 9622,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5038,
-                        "src": "1620:10:9",
+                        "referencedDeclaration": 9604,
+                        "src": "1620:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9673,7 +9673,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1609:22:9",
+                      "src": "1609:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -9684,14 +9684,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5058,
+                      "id": 9624,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1634:1:9",
+                      "src": "1634:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -9699,15 +9699,15 @@
                       },
                       "value": "0"
                     },
-                    "src": "1609:26:9",
+                    "src": "1609:26:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5060,
+                  "id": 9626,
                   "nodeType": "ExpressionStatement",
-                  "src": "1609:26:9"
+                  "src": "1609:26:11"
                 },
                 {
                   "eventCall": {
@@ -9715,12 +9715,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5062,
+                        "id": 9628,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5038,
-                        "src": "1667:10:9",
+                        "referencedDeclaration": 9604,
+                        "src": "1667:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9734,18 +9734,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5061,
+                      "id": 9627,
                       "name": "ValidatorDeleted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4948,
-                      "src": "1650:16:9",
+                      "referencedDeclaration": 9514,
+                      "src": "1650:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5063,
+                    "id": 9629,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9753,95 +9753,95 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1650:28:9",
+                    "src": "1650:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5064,
+                  "id": 9630,
                   "nodeType": "EmitStatement",
-                  "src": "1645:33:9"
+                  "src": "1645:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5065,
+                    "id": 9631,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5038,
-                    "src": "1695:10:9",
+                    "referencedDeclaration": 9604,
+                    "src": "1695:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 5046,
-                  "id": 5066,
+                  "functionReturnParameters": 9612,
+                  "id": 9632,
                   "nodeType": "Return",
-                  "src": "1688:17:9"
+                  "src": "1688:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5068,
+            "id": 9634,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5041,
+                "id": 9607,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5040,
+                  "id": 9606,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4925,
-                  "src": "1506:8:9",
+                  "referencedDeclaration": 9491,
+                  "src": "1506:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1506:8:9"
+                "src": "1506:8:11"
               },
               {
                 "arguments": null,
-                "id": 5043,
+                "id": 9609,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5042,
+                  "id": 9608,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1515:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1515:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1515:13:9"
+                "src": "1515:13:11"
               }
             ],
             "name": "RemoveValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5039,
+              "id": 9605,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5038,
+                  "id": 9604,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5068,
-                  "src": "1479:18:9",
+                  "scope": 9634,
+                  "src": "1479:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9849,10 +9849,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5037,
+                    "id": 9603,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1479:7:9",
+                    "src": "1479:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9862,20 +9862,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1478:20:9"
+              "src": "1478:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5046,
+              "id": 9612,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5045,
+                  "id": 9611,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5068,
-                  "src": "1538:7:9",
+                  "scope": 9634,
+                  "src": "1538:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9883,10 +9883,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5044,
+                    "id": 9610,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1538:7:9",
+                    "src": "1538:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9896,45 +9896,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1537:9:9"
+              "src": "1537:9:11"
             },
-            "scope": 5469,
-            "src": "1454:258:9",
+            "scope": 10035,
+            "src": "1454:258:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5079,
+              "id": 9645,
               "nodeType": "Block",
-              "src": "1792:46:9",
+              "src": "1792:46:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 5075,
+                      "id": 9641,
                       "name": "validators",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4963,
-                      "src": "1809:10:9",
+                      "referencedDeclaration": 9529,
+                      "src": "1809:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                         "typeString": "mapping(address => int8)"
                       }
                     },
-                    "id": 5077,
+                    "id": 9643,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5076,
+                      "id": 9642,
                       "name": "_validator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5070,
-                      "src": "1820:10:9",
+                      "referencedDeclaration": 9636,
+                      "src": "1820:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -9945,21 +9945,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1809:22:9",
+                    "src": "1809:22:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "functionReturnParameters": 5074,
-                  "id": 5078,
+                  "functionReturnParameters": 9640,
+                  "id": 9644,
                   "nodeType": "Return",
-                  "src": "1802:29:9"
+                  "src": "1802:29:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5080,
+            "id": 9646,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -9967,16 +9967,16 @@
             "name": "GetValidatorLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5071,
+              "id": 9637,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5070,
+                  "id": 9636,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5080,
-                  "src": "1745:18:9",
+                  "scope": 9646,
+                  "src": "1745:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9984,10 +9984,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5069,
+                    "id": 9635,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1745:7:9",
+                    "src": "1745:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9997,20 +9997,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1744:20:9"
+              "src": "1744:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5074,
+              "id": 9640,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5073,
+                  "id": 9639,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5080,
-                  "src": "1786:4:9",
+                  "scope": 9646,
+                  "src": "1786:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10018,10 +10018,10 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 5072,
+                    "id": 9638,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1786:4:9",
+                    "src": "1786:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
@@ -10031,19 +10031,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1785:6:9"
+              "src": "1785:6:11"
             },
-            "scope": 5469,
-            "src": "1718:120:9",
+            "scope": 10035,
+            "src": "1718:120:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5212,
+              "id": 9778,
               "nodeType": "Block",
-              "src": "1937:947:9",
+              "src": "1937:947:11",
               "statements": [
                 {
                   "condition": {
@@ -10052,19 +10052,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5093,
+                    "id": 9659,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5091,
+                      "id": 9657,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5084,
-                      "src": "1983:5:9",
+                      "referencedDeclaration": 9650,
+                      "src": "1983:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -10075,14 +10075,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31313030",
-                      "id": 5092,
+                      "id": 9658,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1992:4:9",
+                      "src": "1992:4:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1100_by_1",
@@ -10090,16 +10090,16 @@
                       },
                       "value": "1100"
                     },
-                    "src": "1983:13:9",
+                    "src": "1983:13:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 5121,
+                    "id": 9687,
                     "nodeType": "Block",
-                    "src": "2143:54:9",
+                    "src": "2143:54:11",
                     "statements": [
                       {
                         "expression": {
@@ -10111,19 +10111,19 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 5118,
+                              "id": 9684,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 5115,
+                                "id": 9681,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5082,
-                                "src": "2165:6:9",
+                                "referencedDeclaration": 9648,
+                                "src": "2165:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -10135,18 +10135,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5116,
+                                  "id": 9682,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "2175:3:9",
+                                  "referencedDeclaration": 11315,
+                                  "src": "2175:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 5117,
+                                "id": 9683,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10154,13 +10154,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "2175:10:9",
+                                "src": "2175:10:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "2165:20:9",
+                              "src": "2165:20:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -10174,21 +10174,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 5114,
+                            "id": 9680,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2157:7:9",
+                            "referencedDeclaration": 11318,
+                            "src": "2157:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 5119,
+                          "id": 9685,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10196,38 +10196,38 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2157:29:9",
+                          "src": "2157:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 5120,
+                        "id": 9686,
                         "nodeType": "ExpressionStatement",
-                        "src": "2157:29:9"
+                        "src": "2157:29:11"
                       }
                     ]
                   },
-                  "id": 5122,
+                  "id": 9688,
                   "nodeType": "IfStatement",
-                  "src": "1979:218:9",
+                  "src": "1979:218:11",
                   "trueBody": {
-                    "id": 5113,
+                    "id": 9679,
                     "nodeType": "Block",
-                    "src": "1998:139:9",
+                    "src": "1998:139:11",
                     "statements": [
                       {
                         "assignments": [
-                          5095
+                          9661
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 5095,
+                            "id": 9661,
                             "name": "attributeLevel",
                             "nodeType": "VariableDeclaration",
-                            "scope": 5213,
-                            "src": "2012:19:9",
+                            "scope": 9779,
+                            "src": "2012:19:11",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -10235,10 +10235,10 @@
                               "typeString": "int8"
                             },
                             "typeName": {
-                              "id": 5094,
+                              "id": 9660,
                               "name": "int8",
                               "nodeType": "ElementaryTypeName",
-                              "src": "2012:4:9",
+                              "src": "2012:4:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
@@ -10248,7 +10248,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 5103,
+                        "id": 9669,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -10258,7 +10258,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 5101,
+                              "id": 9667,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -10269,19 +10269,19 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 5099,
+                                "id": 9665,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "argumentTypes": null,
-                                  "id": 5097,
+                                  "id": 9663,
                                   "name": "_type",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5084,
-                                  "src": "2039:5:9",
+                                  "referencedDeclaration": 9650,
+                                  "src": "2039:5:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -10292,14 +10292,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "313030",
-                                  "id": 5098,
+                                  "id": 9664,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "2047:3:9",
+                                  "src": "2047:3:11",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_100_by_1",
@@ -10307,7 +10307,7 @@
                                   },
                                   "value": "100"
                                 },
-                                "src": "2039:11:9",
+                                "src": "2039:11:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -10318,14 +10318,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "3130",
-                                "id": 5100,
+                                "id": 9666,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "2053:2:9",
+                                "src": "2053:2:11",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_10_by_1",
@@ -10333,7 +10333,7 @@
                                 },
                                 "value": "10"
                               },
-                              "src": "2039:16:9",
+                              "src": "2039:16:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -10347,20 +10347,20 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 5096,
+                            "id": 9662,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "2034:4:9",
+                            "src": "2034:4:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_int8_$",
                               "typeString": "type(int8)"
                             },
                             "typeName": "int8"
                           },
-                          "id": 5102,
+                          "id": 9668,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10368,14 +10368,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2034:22:9",
+                          "src": "2034:22:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "2012:44:9"
+                        "src": "2012:44:11"
                       },
                       {
                         "expression": {
@@ -10387,19 +10387,19 @@
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
                               },
-                              "id": 5110,
+                              "id": 9676,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 5105,
+                                "id": 9671,
                                 "name": "attributeLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5095,
-                                "src": "2078:14:9",
+                                "referencedDeclaration": 9661,
+                                "src": "2078:14:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
                                   "typeString": "int8"
@@ -10414,18 +10414,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 5107,
+                                      "id": 9673,
                                       "name": "msg",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 7769,
-                                      "src": "2114:3:9",
+                                      "referencedDeclaration": 11315,
+                                      "src": "2114:3:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_magic_message",
                                         "typeString": "msg"
                                       }
                                     },
-                                    "id": 5108,
+                                    "id": 9674,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10433,7 +10433,7 @@
                                     "memberName": "sender",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "2114:10:9",
+                                    "src": "2114:10:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -10447,18 +10447,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 5106,
+                                  "id": 9672,
                                   "name": "GetValidatorLevel",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5080,
-                                  "src": "2096:17:9",
+                                  "referencedDeclaration": 9646,
+                                  "src": "2096:17:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                     "typeString": "function (address) view returns (int8)"
                                   }
                                 },
-                                "id": 5109,
+                                "id": 9675,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10466,13 +10466,13 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "2096:29:9",
+                                "src": "2096:29:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
                                   "typeString": "int8"
                                 }
                               },
-                              "src": "2078:47:9",
+                              "src": "2078:47:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -10486,21 +10486,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 5104,
+                            "id": 9670,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2070:7:9",
+                            "referencedDeclaration": 11318,
+                            "src": "2070:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 5111,
+                          "id": 9677,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10508,15 +10508,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2070:56:9",
+                          "src": "2070:56:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 5112,
+                        "id": 9678,
                         "nodeType": "ExpressionStatement",
-                        "src": "2070:56:9"
+                        "src": "2070:56:11"
                       }
                     ]
                   }
@@ -10531,7 +10531,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 5130,
+                        "id": 9696,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10541,12 +10541,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5125,
+                              "id": 9691,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5086,
-                              "src": "2254:6:9",
+                              "referencedDeclaration": 9652,
+                              "src": "2254:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
                                 "typeString": "bytes memory"
@@ -10560,18 +10560,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 5124,
+                            "id": 9690,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "2244:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "2244:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5126,
+                          "id": 9692,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10579,7 +10579,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2244:17:9",
+                          "src": "2244:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -10593,14 +10593,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 5128,
+                              "id": 9694,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "string",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "2275:2:9",
+                              "src": "2275:2:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -10616,18 +10616,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 5127,
+                            "id": 9693,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "2265:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "2265:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5129,
+                          "id": 9695,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10635,13 +10635,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2265:13:9",
+                          "src": "2265:13:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
                           }
                         },
-                        "src": "2244:34:9",
+                        "src": "2244:34:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10655,21 +10655,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5123,
+                      "id": 9689,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2236:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "2236:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5131,
+                    "id": 9697,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10677,28 +10677,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2236:43:9",
+                    "src": "2236:43:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5132,
+                  "id": 9698,
                   "nodeType": "ExpressionStatement",
-                  "src": "2236:43:9"
+                  "src": "2236:43:11"
                 },
                 {
                   "assignments": [
-                    5134
+                    9700
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5134,
+                      "id": 9700,
                       "name": "isMultiple",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5213,
-                      "src": "2290:15:9",
+                      "scope": 9779,
+                      "src": "2290:15:11",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -10706,10 +10706,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 5133,
+                        "id": 9699,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "2290:4:9",
+                        "src": "2290:4:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10719,14 +10719,14 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5140,
+                  "id": 9706,
                   "initialValue": {
                     "argumentTypes": null,
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5139,
+                    "id": 9705,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10737,19 +10737,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5137,
+                      "id": 9703,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 5135,
+                        "id": 9701,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5084,
-                        "src": "2308:5:9",
+                        "referencedDeclaration": 9650,
+                        "src": "2308:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10760,14 +10760,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31303030",
-                        "id": 5136,
+                        "id": 9702,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2316:4:9",
+                        "src": "2316:4:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000_by_1",
@@ -10775,7 +10775,7 @@
                         },
                         "value": "1000"
                       },
-                      "src": "2308:12:9",
+                      "src": "2308:12:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -10786,14 +10786,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "32",
-                      "id": 5138,
+                      "id": 9704,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2324:1:9",
+                      "src": "2324:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_2_by_1",
@@ -10801,19 +10801,19 @@
                       },
                       "value": "2"
                     },
-                    "src": "2308:17:9",
+                    "src": "2308:17:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2290:35:9"
+                  "src": "2290:35:11"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
-                    "id": 5142,
+                    "id": 9708,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10821,15 +10821,15 @@
                     "nodeType": "UnaryOperation",
                     "operator": "!",
                     "prefix": true,
-                    "src": "2339:11:9",
+                    "src": "2339:11:11",
                     "subExpression": {
                       "argumentTypes": null,
-                      "id": 5141,
+                      "id": 9707,
                       "name": "isMultiple",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5134,
-                      "src": "2340:10:9",
+                      "referencedDeclaration": 9700,
+                      "src": "2340:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -10841,13 +10841,13 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 5175,
+                  "id": 9741,
                   "nodeType": "IfStatement",
-                  "src": "2335:268:9",
+                  "src": "2335:268:11",
                   "trueBody": {
-                    "id": 5174,
+                    "id": 9740,
                     "nodeType": "Block",
-                    "src": "2352:251:9",
+                    "src": "2352:251:11",
                     "statements": [
                       {
                         "condition": {
@@ -10856,7 +10856,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 5149,
+                          "id": 9715,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10867,26 +10867,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 5143,
+                                "id": 9709,
                                 "name": "certificateCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4979,
-                                "src": "2370:16:9",
+                                "referencedDeclaration": 9545,
+                                "src": "2370:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => uint256))"
                                 }
                               },
-                              "id": 5145,
+                              "id": 9711,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 5144,
+                                "id": 9710,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5082,
-                                "src": "2387:6:9",
+                                "referencedDeclaration": 9648,
+                                "src": "2387:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -10897,21 +10897,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "2370:24:9",
+                              "src": "2370:24:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                                 "typeString": "mapping(uint256 => uint256)"
                               }
                             },
-                            "id": 5147,
+                            "id": 9713,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5146,
+                              "id": 9712,
                               "name": "_type",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5084,
-                              "src": "2395:5:9",
+                              "referencedDeclaration": 9650,
+                              "src": "2395:5:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -10922,7 +10922,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2370:31:9",
+                            "src": "2370:31:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -10933,14 +10933,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 5148,
+                            "id": 9714,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "2405:1:9",
+                            "src": "2405:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -10948,16 +10948,16 @@
                             },
                             "value": "0"
                           },
-                          "src": "2370:36:9",
+                          "src": "2370:36:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 5172,
+                          "id": 9738,
                           "nodeType": "Block",
-                          "src": "2487:106:9",
+                          "src": "2487:106:11",
                           "statements": [
                             {
                               "expression": {
@@ -10969,7 +10969,7 @@
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
                                     },
-                                    "id": 5169,
+                                    "id": 9735,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10982,12 +10982,12 @@
                                           "arguments": [
                                             {
                                               "argumentTypes": null,
-                                              "id": 5162,
+                                              "id": 9728,
                                               "name": "_owner",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 5082,
-                                              "src": "2541:6:9",
+                                              "referencedDeclaration": 9648,
+                                              "src": "2541:6:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
                                                 "typeString": "address"
@@ -10995,12 +10995,12 @@
                                             },
                                             {
                                               "argumentTypes": null,
-                                              "id": 5163,
+                                              "id": 9729,
                                               "name": "_type",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 5084,
-                                              "src": "2549:5:9",
+                                              "referencedDeclaration": 9650,
+                                              "src": "2549:5:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_uint256",
                                                 "typeString": "uint256"
@@ -11018,18 +11018,18 @@
                                                 "typeString": "uint256"
                                               }
                                             ],
-                                            "id": 5161,
+                                            "id": 9727,
                                             "name": "GetAttributeValue",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 5358,
-                                            "src": "2523:17:9",
+                                            "referencedDeclaration": 9924,
+                                            "src": "2523:17:11",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                               "typeString": "function (address,uint256) view returns (bytes memory)"
                                             }
                                           },
-                                          "id": 5164,
+                                          "id": 9730,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -11037,7 +11037,7 @@
                                           "lValueRequested": false,
                                           "names": [],
                                           "nodeType": "FunctionCall",
-                                          "src": "2523:32:9",
+                                          "src": "2523:32:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
                                             "typeString": "bytes memory"
@@ -11051,18 +11051,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 5160,
+                                        "id": 9726,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7763,
-                                        "src": "2513:9:9",
+                                        "referencedDeclaration": 11309,
+                                        "src": "2513:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 5165,
+                                      "id": 9731,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -11070,7 +11070,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "2513:43:9",
+                                      "src": "2513:43:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
@@ -11083,12 +11083,12 @@
                                       "arguments": [
                                         {
                                           "argumentTypes": null,
-                                          "id": 5167,
+                                          "id": 9733,
                                           "name": "_value",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 5086,
-                                          "src": "2570:6:9",
+                                          "referencedDeclaration": 9652,
+                                          "src": "2570:6:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
                                             "typeString": "bytes memory"
@@ -11102,18 +11102,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 5166,
+                                        "id": 9732,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 7763,
-                                        "src": "2560:9:9",
+                                        "referencedDeclaration": 11309,
+                                        "src": "2560:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 5168,
+                                      "id": 9734,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -11121,13 +11121,13 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "2560:17:9",
+                                      "src": "2560:17:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
                                       }
                                     },
-                                    "src": "2513:64:9",
+                                    "src": "2513:64:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -11141,21 +11141,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 5159,
+                                  "id": 9725,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    7772,
-                                    7773
+                                    11318,
+                                    11319
                                   ],
-                                  "referencedDeclaration": 7772,
-                                  "src": "2505:7:9",
+                                  "referencedDeclaration": 11318,
+                                  "src": "2505:7:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 5170,
+                                "id": 9736,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11163,30 +11163,30 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "2505:73:9",
+                                "src": "2505:73:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 5171,
+                              "id": 9737,
                               "nodeType": "ExpressionStatement",
-                              "src": "2505:73:9"
+                              "src": "2505:73:11"
                             }
                           ]
                         },
-                        "id": 5173,
+                        "id": 9739,
                         "nodeType": "IfStatement",
-                        "src": "2366:227:9",
+                        "src": "2366:227:11",
                         "trueBody": {
-                          "id": 5158,
+                          "id": 9724,
                           "nodeType": "Block",
-                          "src": "2408:73:9",
+                          "src": "2408:73:11",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5156,
+                                "id": 9722,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11197,26 +11197,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 5150,
+                                      "id": 9716,
                                       "name": "certificateValue",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4973,
-                                      "src": "2426:16:9",
+                                      "referencedDeclaration": 9539,
+                                      "src": "2426:16:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                         "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                       }
                                     },
-                                    "id": 5153,
+                                    "id": 9719,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 5151,
+                                      "id": 9717,
                                       "name": "_owner",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 5082,
-                                      "src": "2443:6:9",
+                                      "referencedDeclaration": 9648,
+                                      "src": "2443:6:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
                                         "typeString": "address"
@@ -11227,21 +11227,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "2426:24:9",
+                                    "src": "2426:24:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                                       "typeString": "mapping(uint256 => bytes storage ref)"
                                     }
                                   },
-                                  "id": 5154,
+                                  "id": 9720,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 5152,
+                                    "id": 9718,
                                     "name": "_type",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 5084,
-                                    "src": "2451:5:9",
+                                    "referencedDeclaration": 9650,
+                                    "src": "2451:5:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -11252,7 +11252,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "2426:31:9",
+                                  "src": "2426:31:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_storage",
                                     "typeString": "bytes storage ref"
@@ -11262,26 +11262,26 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 5155,
+                                  "id": 9721,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5086,
-                                  "src": "2460:6:9",
+                                  "referencedDeclaration": 9652,
+                                  "src": "2460:6:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_memory_ptr",
                                     "typeString": "bytes memory"
                                   }
                                 },
-                                "src": "2426:40:9",
+                                "src": "2426:40:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes_storage",
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 5157,
+                              "id": 9723,
                               "nodeType": "ExpressionStatement",
-                              "src": "2426:40:9"
+                              "src": "2426:40:11"
                             }
                           ]
                         }
@@ -11292,7 +11292,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5188,
+                    "id": 9754,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11303,26 +11303,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5176,
+                          "id": 9742,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "2613:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "2613:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5179,
+                        "id": 9745,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5177,
+                          "id": 9743,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5082,
-                          "src": "2630:6:9",
+                          "referencedDeclaration": 9648,
+                          "src": "2630:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -11333,21 +11333,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2613:24:9",
+                        "src": "2613:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5180,
+                      "id": 9746,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5178,
+                        "id": 9744,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5084,
-                        "src": "2638:5:9",
+                        "referencedDeclaration": 9650,
+                        "src": "2638:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11358,7 +11358,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "2613:31:9",
+                      "src": "2613:31:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11372,7 +11372,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5187,
+                      "id": 9753,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11383,26 +11383,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5181,
+                            "id": 9747,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4979,
-                            "src": "2647:16:9",
+                            "referencedDeclaration": 9545,
+                            "src": "2647:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 5183,
+                          "id": 9749,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5182,
+                            "id": 9748,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5082,
-                            "src": "2664:6:9",
+                            "referencedDeclaration": 9648,
+                            "src": "2664:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -11413,21 +11413,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "2647:24:9",
+                          "src": "2647:24:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 5185,
+                        "id": 9751,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5184,
+                          "id": 9750,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5084,
-                          "src": "2672:5:9",
+                          "referencedDeclaration": 9650,
+                          "src": "2672:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11438,7 +11438,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2647:31:9",
+                        "src": "2647:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11449,14 +11449,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5186,
+                        "id": 9752,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2681:1:9",
+                        "src": "2681:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -11464,38 +11464,38 @@
                         },
                         "value": "1"
                       },
-                      "src": "2647:35:9",
+                      "src": "2647:35:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2613:69:9",
+                    "src": "2613:69:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5189,
+                  "id": 9755,
                   "nodeType": "ExpressionStatement",
-                  "src": "2613:69:9"
+                  "src": "2613:69:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5194,
+                    "id": 9760,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5190,
+                      "id": 9756,
                       "name": "certificatesCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4959,
-                      "src": "2693:17:9",
+                      "referencedDeclaration": 9525,
+                      "src": "2693:17:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11509,19 +11509,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5193,
+                      "id": 9759,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 5191,
+                        "id": 9757,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2713:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2713:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11532,14 +11532,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5192,
+                        "id": 9758,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2733:1:9",
+                        "src": "2733:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -11547,26 +11547,26 @@
                         },
                         "value": "1"
                       },
-                      "src": "2713:21:9",
+                      "src": "2713:21:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2693:41:9",
+                    "src": "2693:41:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5195,
+                  "id": 9761,
                   "nodeType": "ExpressionStatement",
-                  "src": "2693:41:9"
+                  "src": "2693:41:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5206,
+                    "id": 9772,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11575,26 +11575,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5196,
+                        "id": 9762,
                         "name": "certificates",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4967,
-                        "src": "2744:12:9",
+                        "referencedDeclaration": 9533,
+                        "src": "2744:12:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                           "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                         }
                       },
-                      "id": 5198,
+                      "id": 9764,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5197,
+                        "id": 9763,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2757:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2757:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11605,9 +11605,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "2744:31:9",
+                      "src": "2744:31:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                         "typeString": "struct ProfileRegistry.Certificate storage ref"
                       }
                     },
@@ -11620,18 +11620,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5200,
+                            "id": 9766,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2790:3:9",
+                            "referencedDeclaration": 11315,
+                            "src": "2790:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 5201,
+                          "id": 9767,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -11639,7 +11639,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2790:10:9",
+                          "src": "2790:10:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -11647,12 +11647,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5202,
+                          "id": 9768,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5082,
-                          "src": "2802:6:9",
+                          "referencedDeclaration": 9648,
+                          "src": "2802:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -11660,12 +11660,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5203,
+                          "id": 9769,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5084,
-                          "src": "2810:5:9",
+                          "referencedDeclaration": 9650,
+                          "src": "2810:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11673,12 +11673,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 5204,
+                          "id": 9770,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5086,
-                          "src": "2817:6:9",
+                          "referencedDeclaration": 9652,
+                          "src": "2817:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -11704,18 +11704,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 5199,
+                        "id": 9765,
                         "name": "Certificate",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4940,
-                        "src": "2778:11:9",
+                        "referencedDeclaration": 9506,
+                        "src": "2778:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Certificate_$4940_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Certificate_$9506_storage_ptr_$",
                           "typeString": "type(struct ProfileRegistry.Certificate storage pointer)"
                         }
                       },
-                      "id": 5205,
+                      "id": 9771,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11723,21 +11723,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2778:46:9",
+                      "src": "2778:46:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_memory",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_memory",
                         "typeString": "struct ProfileRegistry.Certificate memory"
                       }
                     },
-                    "src": "2744:80:9",
+                    "src": "2744:80:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
-                  "id": 5207,
+                  "id": 9773,
                   "nodeType": "ExpressionStatement",
-                  "src": "2744:80:9"
+                  "src": "2744:80:11"
                 },
                 {
                   "eventCall": {
@@ -11745,12 +11745,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5209,
+                        "id": 9775,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4959,
-                        "src": "2859:17:9",
+                        "referencedDeclaration": 9525,
+                        "src": "2859:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11764,18 +11764,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5208,
+                      "id": 9774,
                       "name": "CertificateCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4952,
-                      "src": "2840:18:9",
+                      "referencedDeclaration": 9518,
+                      "src": "2840:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5210,
+                    "id": 9776,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11783,57 +11783,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2840:37:9",
+                    "src": "2840:37:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5211,
+                  "id": 9777,
                   "nodeType": "EmitStatement",
-                  "src": "2835:42:9"
+                  "src": "2835:42:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5213,
+            "id": 9779,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5089,
+                "id": 9655,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5088,
+                  "id": 9654,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "1923:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "1923:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1923:13:9"
+                "src": "1923:13:11"
               }
             ],
             "name": "CreateCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5087,
+              "id": 9653,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5082,
+                  "id": 9648,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1871:14:9",
+                  "scope": 9779,
+                  "src": "1871:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11841,10 +11841,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5081,
+                    "id": 9647,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1871:7:9",
+                    "src": "1871:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -11855,11 +11855,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5084,
+                  "id": 9650,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1887:13:9",
+                  "scope": 9779,
+                  "src": "1887:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11867,10 +11867,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5083,
+                    "id": 9649,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1887:7:9",
+                    "src": "1887:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -11881,11 +11881,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5086,
+                  "id": 9652,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5213,
-                  "src": "1902:12:9",
+                  "scope": 9779,
+                  "src": "1902:12:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11893,10 +11893,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5085,
+                    "id": 9651,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1902:5:9",
+                    "src": "1902:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -11906,54 +11906,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1870:45:9"
+              "src": "1870:45:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5090,
+              "id": 9656,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1937:0:9"
+              "src": "1937:0:11"
             },
-            "scope": 5469,
-            "src": "1844:1040:9",
+            "scope": 10035,
+            "src": "1844:1040:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5309,
+              "id": 9875,
               "nodeType": "Block",
-              "src": "2951:536:9",
+              "src": "2951:536:11",
               "statements": [
                 {
                   "assignments": [
-                    5221
+                    9787
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5221,
+                      "id": 9787,
                       "name": "crt",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5310,
-                      "src": "2961:22:9",
+                      "scope": 9876,
+                      "src": "2961:22:11",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                        "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                         "typeString": "struct ProfileRegistry.Certificate"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 5220,
+                        "id": 9786,
                         "name": "Certificate",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 4940,
-                        "src": "2961:11:9",
+                        "referencedDeclaration": 9506,
+                        "src": "2961:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$4940_storage_ptr",
+                          "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
                           "typeString": "struct ProfileRegistry.Certificate"
                         }
                       },
@@ -11961,31 +11961,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5225,
+                  "id": 9791,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 5222,
+                      "id": 9788,
                       "name": "certificates",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4967,
-                      "src": "2986:12:9",
+                      "referencedDeclaration": 9533,
+                      "src": "2986:12:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                         "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                       }
                     },
-                    "id": 5224,
+                    "id": 9790,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5223,
+                      "id": 9789,
                       "name": "_id",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5215,
-                      "src": "2999:3:9",
+                      "referencedDeclaration": 9781,
+                      "src": "2999:3:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11996,14 +11996,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2986:17:9",
+                    "src": "2986:17:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2961:42:9"
+                  "src": "2961:42:11"
                 },
                 {
                   "expression": {
@@ -12015,7 +12015,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 5245,
+                        "id": 9811,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12026,7 +12026,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 5237,
+                          "id": 9803,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12037,7 +12037,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 5231,
+                            "id": 9797,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12046,26 +12046,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5227,
+                                "id": 9793,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3022:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3022:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5228,
+                              "id": 9794,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "to",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4935,
-                              "src": "3022:6:9",
+                              "referencedDeclaration": 9501,
+                              "src": "3022:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12077,18 +12077,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5229,
+                                "id": 9795,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "3032:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "3032:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 5230,
+                              "id": 9796,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12096,13 +12096,13 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3032:10:9",
+                              "src": "3032:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3022:20:9",
+                            "src": "3022:20:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -12116,7 +12116,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 5236,
+                            "id": 9802,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12125,26 +12125,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5232,
+                                "id": 9798,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3046:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3046:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5233,
+                              "id": 9799,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "from",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4933,
-                              "src": "3046:8:9",
+                              "referencedDeclaration": 9499,
+                              "src": "3046:8:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12156,18 +12156,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5234,
+                                "id": 9800,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "3058:3:9",
+                                "referencedDeclaration": 11315,
+                                "src": "3058:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 5235,
+                              "id": 9801,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12175,19 +12175,19 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3058:10:9",
+                              "src": "3058:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3046:22:9",
+                            "src": "3046:22:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "3022:46:9",
+                          "src": "3022:46:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -12201,7 +12201,7 @@
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           },
-                          "id": 5244,
+                          "id": 9810,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12213,18 +12213,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5239,
+                                  "id": 9805,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3090:3:9",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3090:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 5240,
+                                "id": 9806,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -12232,7 +12232,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3090:10:9",
+                                "src": "3090:10:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -12246,18 +12246,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 5238,
+                              "id": 9804,
                               "name": "GetValidatorLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5080,
-                              "src": "3072:17:9",
+                              "referencedDeclaration": 9646,
+                              "src": "3072:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                 "typeString": "function (address) view returns (int8)"
                               }
                             },
-                            "id": 5241,
+                            "id": 9807,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12265,7 +12265,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3072:29:9",
+                            "src": "3072:29:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_int8",
                               "typeString": "int8"
@@ -12275,7 +12275,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 5243,
+                            "id": 9809,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -12283,18 +12283,18 @@
                             "nodeType": "UnaryOperation",
                             "operator": "-",
                             "prefix": true,
-                            "src": "3105:2:9",
+                            "src": "3105:2:11",
                             "subExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 5242,
+                              "id": 9808,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "3106:1:9",
+                              "src": "3106:1:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -12307,13 +12307,13 @@
                               "typeString": "int_const -1"
                             }
                           },
-                          "src": "3072:35:9",
+                          "src": "3072:35:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "3022:85:9",
+                        "src": "3022:85:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12327,21 +12327,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5226,
+                      "id": 9792,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "3014:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "3014:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5246,
+                    "id": 9812,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12349,15 +12349,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3014:94:9",
+                    "src": "3014:94:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5247,
+                  "id": 9813,
                   "nodeType": "ExpressionStatement",
-                  "src": "3014:94:9"
+                  "src": "3014:94:11"
                 },
                 {
                   "expression": {
@@ -12369,7 +12369,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 5256,
+                        "id": 9822,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12381,26 +12381,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5250,
+                                "id": 9816,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3136:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3136:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5251,
+                              "id": 9817,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4939,
-                              "src": "3136:9:9",
+                              "referencedDeclaration": 9505,
+                              "src": "3136:9:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory",
                                 "typeString": "bytes memory"
@@ -12414,18 +12414,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 5249,
+                            "id": 9815,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "3126:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "3126:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5252,
+                          "id": 9818,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12433,7 +12433,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3126:20:9",
+                          "src": "3126:20:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -12447,14 +12447,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 5254,
+                              "id": 9820,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "string",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "3160:2:9",
+                              "src": "3160:2:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -12470,18 +12470,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 5253,
+                            "id": 9819,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7763,
-                            "src": "3150:9:9",
+                            "referencedDeclaration": 11309,
+                            "src": "3150:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 5255,
+                          "id": 9821,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -12489,13 +12489,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3150:13:9",
+                          "src": "3150:13:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
                           }
                         },
-                        "src": "3126:37:9",
+                        "src": "3126:37:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12509,21 +12509,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5248,
+                      "id": 9814,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "3118:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "3118:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5257,
+                    "id": 9823,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12531,20 +12531,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3118:46:9",
+                    "src": "3118:46:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5258,
+                  "id": 9824,
                   "nodeType": "ExpressionStatement",
-                  "src": "3118:46:9"
+                  "src": "3118:46:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5275,
+                    "id": 9841,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12555,42 +12555,42 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5259,
+                          "id": 9825,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "3175:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "3175:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5264,
+                        "id": 9830,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5260,
+                            "id": 9826,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3192:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3192:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5261,
+                          "id": 9827,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4935,
-                          "src": "3192:6:9",
+                          "referencedDeclaration": 9501,
+                          "src": "3192:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -12601,37 +12601,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3175:24:9",
+                        "src": "3175:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5265,
+                      "id": 9831,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5262,
+                          "id": 9828,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5221,
-                          "src": "3200:3:9",
+                          "referencedDeclaration": 9787,
+                          "src": "3200:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 5263,
+                        "id": 9829,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3200:17:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3200:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12642,7 +12642,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3175:43:9",
+                      "src": "3175:43:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12656,7 +12656,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5274,
+                      "id": 9840,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12667,42 +12667,42 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5266,
+                            "id": 9832,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4979,
-                            "src": "3221:16:9",
+                            "referencedDeclaration": 9545,
+                            "src": "3221:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 5269,
+                          "id": 9835,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 5267,
+                              "id": 9833,
                               "name": "crt",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5221,
-                              "src": "3238:3:9",
+                              "referencedDeclaration": 9787,
+                              "src": "3238:3:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                 "typeString": "struct ProfileRegistry.Certificate memory"
                               }
                             },
-                            "id": 5268,
+                            "id": 9834,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "to",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 4935,
-                            "src": "3238:6:9",
+                            "referencedDeclaration": 9501,
+                            "src": "3238:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -12713,37 +12713,37 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3221:24:9",
+                          "src": "3221:24:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 5272,
+                        "id": 9838,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5270,
+                            "id": 9836,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3246:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3246:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5271,
+                          "id": 9837,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "attributeType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4937,
-                          "src": "3246:17:9",
+                          "referencedDeclaration": 9503,
+                          "src": "3246:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -12754,7 +12754,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3221:43:9",
+                        "src": "3221:43:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12765,14 +12765,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5273,
+                        "id": 9839,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "3267:1:9",
+                        "src": "3267:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -12780,21 +12780,21 @@
                         },
                         "value": "1"
                       },
-                      "src": "3221:47:9",
+                      "src": "3221:47:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3175:93:9",
+                    "src": "3175:93:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5276,
+                  "id": 9842,
                   "nodeType": "ExpressionStatement",
-                  "src": "3175:93:9"
+                  "src": "3175:93:11"
                 },
                 {
                   "condition": {
@@ -12803,7 +12803,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5285,
+                    "id": 9851,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12814,42 +12814,42 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5277,
+                          "id": 9843,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4979,
-                          "src": "3282:16:9",
+                          "referencedDeclaration": 9545,
+                          "src": "3282:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 5280,
+                        "id": 9846,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5278,
+                            "id": 9844,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5221,
-                            "src": "3299:3:9",
+                            "referencedDeclaration": 9787,
+                            "src": "3299:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 5279,
+                          "id": 9845,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 4935,
-                          "src": "3299:6:9",
+                          "referencedDeclaration": 9501,
+                          "src": "3299:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -12860,37 +12860,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3282:24:9",
+                        "src": "3282:24:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 5283,
+                      "id": 9849,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5281,
+                          "id": 9847,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5221,
-                          "src": "3307:3:9",
+                          "referencedDeclaration": 9787,
+                          "src": "3307:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 5282,
+                        "id": 9848,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3307:17:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3307:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12901,7 +12901,7 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3282:43:9",
+                      "src": "3282:43:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12912,14 +12912,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5284,
+                      "id": 9850,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3329:1:9",
+                      "src": "3329:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -12927,25 +12927,25 @@
                       },
                       "value": "0"
                     },
-                    "src": "3282:48:9",
+                    "src": "3282:48:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 5297,
+                  "id": 9863,
                   "nodeType": "IfStatement",
-                  "src": "3278:127:9",
+                  "src": "3278:127:11",
                   "trueBody": {
-                    "id": 5296,
+                    "id": 9862,
                     "nodeType": "Block",
-                    "src": "3332:73:9",
+                    "src": "3332:73:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5294,
+                          "id": 9860,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12956,42 +12956,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 5286,
+                                "id": 9852,
                                 "name": "certificateValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4973,
-                                "src": "3346:16:9",
+                                "referencedDeclaration": 9539,
+                                "src": "3346:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                 }
                               },
-                              "id": 5291,
+                              "id": 9857,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 5287,
+                                  "id": 9853,
                                   "name": "crt",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5221,
-                                  "src": "3363:3:9",
+                                  "referencedDeclaration": 9787,
+                                  "src": "3363:3:11",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                     "typeString": "struct ProfileRegistry.Certificate memory"
                                   }
                                 },
-                                "id": 5288,
+                                "id": 9854,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "to",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 4935,
-                                "src": "3363:6:9",
+                                "referencedDeclaration": 9501,
+                                "src": "3363:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -13002,37 +13002,37 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3346:24:9",
+                              "src": "3346:24:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                                 "typeString": "mapping(uint256 => bytes storage ref)"
                               }
                             },
-                            "id": 5292,
+                            "id": 9858,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5289,
+                                "id": 9855,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5221,
-                                "src": "3371:3:9",
+                                "referencedDeclaration": 9787,
+                                "src": "3371:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$4940_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 5290,
+                              "id": 9856,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "attributeType",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 4937,
-                              "src": "3371:17:9",
+                              "referencedDeclaration": 9503,
+                              "src": "3371:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -13043,7 +13043,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3346:43:9",
+                            "src": "3346:43:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bytes_storage",
                               "typeString": "bytes storage ref"
@@ -13054,14 +13054,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "",
-                            "id": 5293,
+                            "id": 9859,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "string",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3392:2:9",
+                            "src": "3392:2:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -13069,15 +13069,15 @@
                             },
                             "value": ""
                           },
-                          "src": "3346:48:9",
+                          "src": "3346:48:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_storage",
                             "typeString": "bytes storage ref"
                           }
                         },
-                        "id": 5295,
+                        "id": 9861,
                         "nodeType": "ExpressionStatement",
-                        "src": "3346:48:9"
+                        "src": "3346:48:11"
                       }
                     ]
                   }
@@ -13085,7 +13085,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5303,
+                    "id": 9869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13096,26 +13096,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 5298,
+                          "id": 9864,
                           "name": "certificates",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4967,
-                          "src": "3414:12:9",
+                          "referencedDeclaration": 9533,
+                          "src": "3414:12:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                             "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                           }
                         },
-                        "id": 5300,
+                        "id": 9866,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 5299,
+                          "id": 9865,
                           "name": "_id",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5215,
-                          "src": "3427:3:9",
+                          "referencedDeclaration": 9781,
+                          "src": "3427:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -13126,21 +13126,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3414:17:9",
+                        "src": "3414:17:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                          "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                           "typeString": "struct ProfileRegistry.Certificate storage ref"
                         }
                       },
-                      "id": 5301,
+                      "id": 9867,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "value",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 4939,
-                      "src": "3414:23:9",
+                      "referencedDeclaration": 9505,
+                      "src": "3414:23:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes_storage",
                         "typeString": "bytes storage ref"
@@ -13151,14 +13151,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "",
-                      "id": 5302,
+                      "id": 9868,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "string",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3440:2:9",
+                      "src": "3440:2:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -13166,15 +13166,15 @@
                       },
                       "value": ""
                     },
-                    "src": "3414:28:9",
+                    "src": "3414:28:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage",
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "id": 5304,
+                  "id": 9870,
                   "nodeType": "ExpressionStatement",
-                  "src": "3414:28:9"
+                  "src": "3414:28:11"
                 },
                 {
                   "eventCall": {
@@ -13182,12 +13182,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5306,
+                        "id": 9872,
                         "name": "_id",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5215,
-                        "src": "3476:3:9",
+                        "referencedDeclaration": 9781,
+                        "src": "3476:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13201,18 +13201,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5305,
+                      "id": 9871,
                       "name": "CertificateUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4956,
-                      "src": "3457:18:9",
+                      "referencedDeclaration": 9522,
+                      "src": "3457:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5307,
+                    "id": 9873,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13220,57 +13220,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3457:23:9",
+                    "src": "3457:23:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5308,
+                  "id": 9874,
                   "nodeType": "EmitStatement",
-                  "src": "3452:28:9"
+                  "src": "3452:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5310,
+            "id": 9876,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5218,
+                "id": 9784,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5217,
+                  "id": 9783,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7117,
-                  "src": "2937:13:9",
+                  "referencedDeclaration": 10663,
+                  "src": "2937:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2937:13:9"
+                "src": "2937:13:11"
               }
             ],
             "name": "RemoveCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5216,
+              "id": 9782,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5215,
+                  "id": 9781,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5310,
-                  "src": "2917:11:9",
+                  "scope": 9876,
+                  "src": "2917:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13278,10 +13278,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5214,
+                    "id": 9780,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2917:7:9",
+                    "src": "2917:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13291,26 +13291,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2916:13:9"
+              "src": "2916:13:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5219,
+              "id": 9785,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2951:0:9"
+              "src": "2951:0:11"
             },
-            "scope": 5469,
-            "src": "2890:597:9",
+            "scope": 10035,
+            "src": "2890:597:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5341,
+              "id": 9907,
               "nodeType": "Block",
-              "src": "3585:128:9",
+              "src": "3585:128:11",
               "statements": [
                 {
                   "expression": {
@@ -13322,26 +13322,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5323,
+                            "id": 9889,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3603:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3603:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5325,
+                          "id": 9891,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5324,
+                            "id": 9890,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3616:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3616:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13352,21 +13352,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3603:17:9",
+                          "src": "3603:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5326,
+                        "id": 9892,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "from",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4933,
-                        "src": "3603:22:9",
+                        "referencedDeclaration": 9499,
+                        "src": "3603:22:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13378,26 +13378,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5327,
+                            "id": 9893,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3627:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3627:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5329,
+                          "id": 9895,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5328,
+                            "id": 9894,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3640:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3640:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13408,21 +13408,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3627:17:9",
+                          "src": "3627:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5330,
+                        "id": 9896,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "to",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4935,
-                        "src": "3627:20:9",
+                        "referencedDeclaration": 9501,
+                        "src": "3627:20:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13434,26 +13434,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5331,
+                            "id": 9897,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3649:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3649:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5333,
+                          "id": 9899,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5332,
+                            "id": 9898,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3662:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3662:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13464,21 +13464,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3649:17:9",
+                          "src": "3649:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5334,
+                        "id": 9900,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4937,
-                        "src": "3649:31:9",
+                        "referencedDeclaration": 9503,
+                        "src": "3649:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13490,26 +13490,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 5335,
+                            "id": 9901,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4967,
-                            "src": "3682:12:9",
+                            "referencedDeclaration": 9533,
+                            "src": "3682:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$4940_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 5337,
+                          "id": 9903,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 5336,
+                            "id": 9902,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5312,
-                            "src": "3695:3:9",
+                            "referencedDeclaration": 9878,
+                            "src": "3695:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13520,49 +13520,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3682:17:9",
+                          "src": "3682:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$4940_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 5338,
+                        "id": 9904,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "value",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 4939,
-                        "src": "3682:23:9",
+                        "referencedDeclaration": 9505,
+                        "src": "3682:23:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage",
                           "typeString": "bytes storage ref"
                         }
                       }
                     ],
-                    "id": 5339,
+                    "id": 9905,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "3602:104:9",
+                    "src": "3602:104:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_address_$_t_address_$_t_uint256_$_t_bytes_storage_$",
                       "typeString": "tuple(address,address,uint256,bytes storage ref)"
                     }
                   },
-                  "functionReturnParameters": 5322,
-                  "id": 5340,
+                  "functionReturnParameters": 9888,
+                  "id": 9906,
                   "nodeType": "Return",
-                  "src": "3595:111:9"
+                  "src": "3595:111:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5342,
+            "id": 9908,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13570,16 +13570,16 @@
             "name": "GetCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5313,
+              "id": 9879,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5312,
+                  "id": 9878,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3517:11:9",
+                  "scope": 9908,
+                  "src": "3517:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13587,10 +13587,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5311,
+                    "id": 9877,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3517:7:9",
+                    "src": "3517:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13600,20 +13600,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3516:13:9"
+              "src": "3516:13:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5322,
+              "id": 9888,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5315,
+                  "id": 9881,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3551:7:9",
+                  "scope": 9908,
+                  "src": "3551:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13621,10 +13621,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5314,
+                    "id": 9880,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3551:7:9",
+                    "src": "3551:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13635,11 +13635,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5317,
+                  "id": 9883,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3560:7:9",
+                  "scope": 9908,
+                  "src": "3560:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13647,10 +13647,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5316,
+                    "id": 9882,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3560:7:9",
+                    "src": "3560:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13661,11 +13661,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5319,
+                  "id": 9885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3569:7:9",
+                  "scope": 9908,
+                  "src": "3569:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13673,10 +13673,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5318,
+                    "id": 9884,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3569:7:9",
+                    "src": "3569:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13687,11 +13687,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5321,
+                  "id": 9887,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5342,
-                  "src": "3578:5:9",
+                  "scope": 9908,
+                  "src": "3578:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13699,10 +13699,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5320,
+                    "id": 9886,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3578:5:9",
+                    "src": "3578:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -13712,19 +13712,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3550:34:9"
+              "src": "3550:34:11"
             },
-            "scope": 5469,
-            "src": "3493:220:9",
+            "scope": 10035,
+            "src": "3493:220:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5357,
+              "id": 9923,
               "nodeType": "Block",
-              "src": "3805:55:9",
+              "src": "3805:55:11",
               "statements": [
                 {
                   "expression": {
@@ -13733,26 +13733,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5351,
+                        "id": 9917,
                         "name": "certificateValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4973,
-                        "src": "3822:16:9",
+                        "referencedDeclaration": 9539,
+                        "src": "3822:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                           "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                         }
                       },
-                      "id": 5353,
+                      "id": 9919,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5352,
+                        "id": 9918,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5344,
-                        "src": "3839:6:9",
+                        "referencedDeclaration": 9910,
+                        "src": "3839:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13763,21 +13763,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3822:24:9",
+                      "src": "3822:24:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_uint256_$_t_bytes_storage_$",
                         "typeString": "mapping(uint256 => bytes storage ref)"
                       }
                     },
-                    "id": 5355,
+                    "id": 9921,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5354,
+                      "id": 9920,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5346,
-                      "src": "3847:5:9",
+                      "referencedDeclaration": 9912,
+                      "src": "3847:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13788,21 +13788,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3822:31:9",
+                    "src": "3822:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage",
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "functionReturnParameters": 5350,
-                  "id": 5356,
+                  "functionReturnParameters": 9916,
+                  "id": 9922,
                   "nodeType": "Return",
-                  "src": "3815:38:9"
+                  "src": "3815:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5358,
+            "id": 9924,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13810,16 +13810,16 @@
             "name": "GetAttributeValue",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5347,
+              "id": 9913,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5344,
+                  "id": 9910,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3746:14:9",
+                  "scope": 9924,
+                  "src": "3746:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13827,10 +13827,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5343,
+                    "id": 9909,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3746:7:9",
+                    "src": "3746:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13841,11 +13841,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5346,
+                  "id": 9912,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3762:13:9",
+                  "scope": 9924,
+                  "src": "3762:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13853,10 +13853,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5345,
+                    "id": 9911,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3762:7:9",
+                    "src": "3762:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13866,20 +13866,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3745:31:9"
+              "src": "3745:31:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5350,
+              "id": 9916,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5349,
+                  "id": 9915,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5358,
-                  "src": "3798:5:9",
+                  "scope": 9924,
+                  "src": "3798:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13887,10 +13887,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 5348,
+                    "id": 9914,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3798:5:9",
+                    "src": "3798:5:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -13900,19 +13900,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3797:7:9"
+              "src": "3797:7:11"
             },
-            "scope": 5469,
-            "src": "3719:141:9",
+            "scope": 10035,
+            "src": "3719:141:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5373,
+              "id": 9939,
               "nodeType": "Block",
-              "src": "3954:55:9",
+              "src": "3954:55:11",
               "statements": [
                 {
                   "expression": {
@@ -13921,26 +13921,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5367,
+                        "id": 9933,
                         "name": "certificateCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4979,
-                        "src": "3971:16:9",
+                        "referencedDeclaration": 9545,
+                        "src": "3971:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(uint256 => uint256))"
                         }
                       },
-                      "id": 5369,
+                      "id": 9935,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5368,
+                        "id": 9934,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5360,
-                        "src": "3988:6:9",
+                        "referencedDeclaration": 9926,
+                        "src": "3988:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -13951,21 +13951,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3971:24:9",
+                      "src": "3971:24:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
                         "typeString": "mapping(uint256 => uint256)"
                       }
                     },
-                    "id": 5371,
+                    "id": 9937,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 5370,
+                      "id": 9936,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5362,
-                      "src": "3996:5:9",
+                      "referencedDeclaration": 9928,
+                      "src": "3996:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13976,21 +13976,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3971:31:9",
+                    "src": "3971:31:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 5366,
-                  "id": 5372,
+                  "functionReturnParameters": 9932,
+                  "id": 9938,
                   "nodeType": "Return",
-                  "src": "3964:38:9"
+                  "src": "3964:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5374,
+            "id": 9940,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13998,16 +13998,16 @@
             "name": "GetAttributeCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5363,
+              "id": 9929,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5360,
+                  "id": 9926,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3893:14:9",
+                  "scope": 9940,
+                  "src": "3893:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14015,10 +14015,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5359,
+                    "id": 9925,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3893:7:9",
+                    "src": "3893:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14029,11 +14029,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5362,
+                  "id": 9928,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3909:13:9",
+                  "scope": 9940,
+                  "src": "3909:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14041,10 +14041,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5361,
+                    "id": 9927,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3909:7:9",
+                    "src": "3909:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14054,20 +14054,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3892:31:9"
+              "src": "3892:31:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5366,
+              "id": 9932,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5365,
+                  "id": 9931,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5374,
-                  "src": "3945:7:9",
+                  "scope": 9940,
+                  "src": "3945:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14075,10 +14075,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5364,
+                    "id": 9930,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3945:7:9",
+                    "src": "3945:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14088,19 +14088,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3944:9:9"
+              "src": "3944:9:11"
             },
-            "scope": 5469,
-            "src": "3866:143:9",
+            "scope": 10035,
+            "src": "3866:143:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5421,
+              "id": 9987,
               "nodeType": "Block",
-              "src": "4092:403:9",
+              "src": "4092:403:11",
               "statements": [
                 {
                   "condition": {
@@ -14109,7 +14109,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5387,
+                    "id": 9953,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14121,12 +14121,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 5382,
+                            "id": 9948,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5376,
-                            "src": "4124:6:9",
+                            "referencedDeclaration": 9942,
+                            "src": "4124:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14135,14 +14135,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "31343031",
-                            "id": 5383,
+                            "id": 9949,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4132:4:9",
+                            "src": "4132:4:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1401_by_1",
@@ -14162,18 +14162,18 @@
                               "typeString": "int_const 1401"
                             }
                           ],
-                          "id": 5381,
+                          "id": 9947,
                           "name": "GetAttributeValue",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5358,
-                          "src": "4106:17:9",
+                          "referencedDeclaration": 9924,
+                          "src": "4106:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                             "typeString": "function (address,uint256) view returns (bytes memory)"
                           }
                         },
-                        "id": 5384,
+                        "id": 9950,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14181,13 +14181,13 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "4106:31:9",
+                        "src": "4106:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_memory_ptr",
                           "typeString": "bytes memory"
                         }
                       },
-                      "id": 5385,
+                      "id": 9951,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14195,7 +14195,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4106:38:9",
+                      "src": "4106:38:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14206,14 +14206,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5386,
+                      "id": 9952,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4147:1:9",
+                      "src": "4147:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -14221,7 +14221,7 @@
                       },
                       "value": "0"
                     },
-                    "src": "4106:42:9",
+                    "src": "4106:42:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -14234,7 +14234,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 5398,
+                      "id": 9964,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14246,12 +14246,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5393,
+                              "id": 9959,
                               "name": "_owner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5376,
-                              "src": "4236:6:9",
+                              "referencedDeclaration": 9942,
+                              "src": "4236:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -14260,14 +14260,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "31333031",
-                              "id": 5394,
+                              "id": 9960,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4244:4:9",
+                              "src": "4244:4:11",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1301_by_1",
@@ -14287,18 +14287,18 @@
                                 "typeString": "int_const 1301"
                               }
                             ],
-                            "id": 5392,
+                            "id": 9958,
                             "name": "GetAttributeValue",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5358,
-                            "src": "4218:17:9",
+                            "referencedDeclaration": 9924,
+                            "src": "4218:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (address,uint256) view returns (bytes memory)"
                             }
                           },
-                          "id": 5395,
+                          "id": 9961,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14306,13 +14306,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4218:31:9",
+                          "src": "4218:31:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
                           }
                         },
-                        "id": 5396,
+                        "id": 9962,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14320,7 +14320,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4218:38:9",
+                        "src": "4218:38:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14331,14 +14331,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 5397,
+                        "id": 9963,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "4259:1:9",
+                        "src": "4259:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -14346,7 +14346,7 @@
                         },
                         "value": "0"
                       },
-                      "src": "4218:42:9",
+                      "src": "4218:42:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -14359,7 +14359,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5409,
+                        "id": 9975,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14371,12 +14371,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 5404,
+                                "id": 9970,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5376,
-                                "src": "4346:6:9",
+                                "referencedDeclaration": 9942,
+                                "src": "4346:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -14385,14 +14385,14 @@
                               {
                                 "argumentTypes": null,
                                 "hexValue": "31323031",
-                                "id": 5405,
+                                "id": 9971,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "4354:4:9",
+                                "src": "4354:4:11",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1201_by_1",
@@ -14412,18 +14412,18 @@
                                   "typeString": "int_const 1201"
                                 }
                               ],
-                              "id": 5403,
+                              "id": 9969,
                               "name": "GetAttributeValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5358,
-                              "src": "4328:17:9",
+                              "referencedDeclaration": 9924,
+                              "src": "4328:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                 "typeString": "function (address,uint256) view returns (bytes memory)"
                               }
                             },
-                            "id": 5406,
+                            "id": 9972,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14431,13 +14431,13 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "4328:31:9",
+                            "src": "4328:31:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bytes_memory_ptr",
                               "typeString": "bytes memory"
                             }
                           },
-                          "id": 5407,
+                          "id": 9973,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14445,7 +14445,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4328:38:9",
+                          "src": "4328:38:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14456,14 +14456,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5408,
+                          "id": 9974,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4369:1:9",
+                          "src": "4369:1:11",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -14471,34 +14471,34 @@
                           },
                           "value": "0"
                         },
-                        "src": "4328:42:9",
+                        "src": "4328:42:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
                       "falseBody": {
-                        "id": 5417,
+                        "id": 9983,
                         "nodeType": "Block",
-                        "src": "4434:55:9",
+                        "src": "4434:55:11",
                         "statements": [
                           {
                             "expression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5414,
+                                "id": 9980,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4931,
-                                "src": "4455:13:9",
+                                "referencedDeclaration": 9497,
+                                "src": "4455:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 5415,
+                              "id": 9981,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -14506,44 +14506,44 @@
                               "memberName": "ANONYMOUS",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "4455:23:9",
+                              "src": "4455:23:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 5380,
-                            "id": 5416,
+                            "functionReturnParameters": 9946,
+                            "id": 9982,
                             "nodeType": "Return",
-                            "src": "4448:30:9"
+                            "src": "4448:30:11"
                           }
                         ]
                       },
-                      "id": 5418,
+                      "id": 9984,
                       "nodeType": "IfStatement",
-                      "src": "4324:165:9",
+                      "src": "4324:165:11",
                       "trueBody": {
-                        "id": 5413,
+                        "id": 9979,
                         "nodeType": "Block",
-                        "src": "4372:56:9",
+                        "src": "4372:56:11",
                         "statements": [
                           {
                             "expression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 5410,
+                                "id": 9976,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4931,
-                                "src": "4393:13:9",
+                                "referencedDeclaration": 9497,
+                                "src": "4393:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 5411,
+                              "id": 9977,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -14551,45 +14551,45 @@
                               "memberName": "REGISTERED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "4393:24:9",
+                              "src": "4393:24:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 5380,
-                            "id": 5412,
+                            "functionReturnParameters": 9946,
+                            "id": 9978,
                             "nodeType": "Return",
-                            "src": "4386:31:9"
+                            "src": "4386:31:11"
                           }
                         ]
                       }
                     },
-                    "id": 5419,
+                    "id": 9985,
                     "nodeType": "IfStatement",
-                    "src": "4214:275:9",
+                    "src": "4214:275:11",
                     "trueBody": {
-                      "id": 5402,
+                      "id": 9968,
                       "nodeType": "Block",
-                      "src": "4262:56:9",
+                      "src": "4262:56:11",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 5399,
+                              "id": 9965,
                               "name": "IdentityLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4931,
-                              "src": "4283:13:9",
+                              "referencedDeclaration": 9497,
+                              "src": "4283:13:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                                 "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                               }
                             },
-                            "id": 5400,
+                            "id": 9966,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -14597,45 +14597,45 @@
                             "memberName": "IDENTIFIED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4283:24:9",
+                            "src": "4283:24:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                              "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                               "typeString": "enum ProfileRegistry.IdentityLevel"
                             }
                           },
-                          "functionReturnParameters": 5380,
-                          "id": 5401,
+                          "functionReturnParameters": 9946,
+                          "id": 9967,
                           "nodeType": "Return",
-                          "src": "4276:31:9"
+                          "src": "4276:31:11"
                         }
                       ]
                     }
                   },
-                  "id": 5420,
+                  "id": 9986,
                   "nodeType": "IfStatement",
-                  "src": "4102:387:9",
+                  "src": "4102:387:11",
                   "trueBody": {
-                    "id": 5391,
+                    "id": 9957,
                     "nodeType": "Block",
-                    "src": "4150:58:9",
+                    "src": "4150:58:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5388,
+                            "id": 9954,
                             "name": "IdentityLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4931,
-                            "src": "4171:13:9",
+                            "referencedDeclaration": 9497,
+                            "src": "4171:13:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$4931_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 5389,
+                          "id": 9955,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -14643,16 +14643,16 @@
                           "memberName": "PROFESSIONAL",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4171:26:9",
+                          "src": "4171:26:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "functionReturnParameters": 5380,
-                        "id": 5390,
+                        "functionReturnParameters": 9946,
+                        "id": 9956,
                         "nodeType": "Return",
-                        "src": "4164:33:9"
+                        "src": "4164:33:11"
                       }
                     ]
                   }
@@ -14660,7 +14660,7 @@
               ]
             },
             "documentation": null,
-            "id": 5422,
+            "id": 9988,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -14668,16 +14668,16 @@
             "name": "GetProfileLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5377,
+              "id": 9943,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5376,
+                  "id": 9942,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5422,
-                  "src": "4040:14:9",
+                  "scope": 9988,
+                  "src": "4040:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14685,10 +14685,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5375,
+                    "id": 9941,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4040:7:9",
+                    "src": "4040:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14698,35 +14698,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4039:16:9"
+              "src": "4039:16:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5380,
+              "id": 9946,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5379,
+                  "id": 9945,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5422,
-                  "src": "4077:13:9",
+                  "scope": 9988,
+                  "src": "4077:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 5378,
+                    "id": 9944,
                     "name": "IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 4931,
-                    "src": "4077:13:9",
+                    "referencedDeclaration": 9497,
+                    "src": "4077:13:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$4931",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -14734,24 +14734,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4076:15:9"
+              "src": "4076:15:11"
             },
-            "scope": 5469,
-            "src": "4015:480:9",
+            "scope": 10035,
+            "src": "4015:480:11",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5440,
+              "id": 10006,
               "nodeType": "Block",
-              "src": "4579:65:9",
+              "src": "4579:65:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5436,
+                    "id": 10002,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14760,26 +14760,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5431,
+                        "id": 9997,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "4589:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "4589:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5433,
+                      "id": 9999,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5432,
+                        "id": 9998,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5424,
-                        "src": "4600:10:9",
+                        "referencedDeclaration": 9990,
+                        "src": "4600:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -14790,7 +14790,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4589:22:9",
+                      "src": "4589:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -14800,7 +14800,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5435,
+                      "id": 10001,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -14808,18 +14808,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "-",
                       "prefix": true,
-                      "src": "4614:2:9",
+                      "src": "4614:2:11",
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 5434,
+                        "id": 10000,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "4615:1:9",
+                        "src": "4615:1:11",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -14832,28 +14832,28 @@
                         "typeString": "int_const -1"
                       }
                     },
-                    "src": "4589:27:9",
+                    "src": "4589:27:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5437,
+                  "id": 10003,
                   "nodeType": "ExpressionStatement",
-                  "src": "4589:27:9"
+                  "src": "4589:27:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5438,
+                    "id": 10004,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4633:4:9",
+                    "src": "4633:4:11",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -14861,52 +14861,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5430,
-                  "id": 5439,
+                  "functionReturnParameters": 9996,
+                  "id": 10005,
                   "nodeType": "Return",
-                  "src": "4626:11:9"
+                  "src": "4626:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5441,
+            "id": 10007,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5427,
+                "id": 9993,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5426,
+                  "id": 9992,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4554:9:9",
+                  "referencedDeclaration": 10830,
+                  "src": "4554:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4554:9:9"
+                "src": "4554:9:11"
               }
             ],
             "name": "AddSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5425,
+              "id": 9991,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5424,
+                  "id": 9990,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5441,
-                  "src": "4527:18:9",
+                  "scope": 10007,
+                  "src": "4527:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14914,10 +14914,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5423,
+                    "id": 9989,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4527:7:9",
+                    "src": "4527:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14927,20 +14927,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4526:20:9"
+              "src": "4526:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5430,
+              "id": 9996,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5429,
+                  "id": 9995,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5441,
-                  "src": "4573:4:9",
+                  "scope": 10007,
+                  "src": "4573:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14948,10 +14948,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5428,
+                    "id": 9994,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4573:4:9",
+                    "src": "4573:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -14961,19 +14961,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4572:6:9"
+              "src": "4572:6:11"
             },
-            "scope": 5469,
-            "src": "4501:143:9",
+            "scope": 10035,
+            "src": "4501:143:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5467,
+              "id": 10033,
               "nodeType": "Block",
-              "src": "4731:118:9",
+              "src": "4731:118:11",
               "statements": [
                 {
                   "expression": {
@@ -14985,7 +14985,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 5456,
+                        "id": 10022,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14995,12 +14995,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 5452,
+                              "id": 10018,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5443,
-                              "src": "4767:10:9",
+                              "referencedDeclaration": 10009,
+                              "src": "4767:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -15014,18 +15014,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 5451,
+                            "id": 10017,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5080,
-                            "src": "4749:17:9",
+                            "referencedDeclaration": 9646,
+                            "src": "4749:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 5453,
+                          "id": 10019,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15033,7 +15033,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4749:29:9",
+                          "src": "4749:29:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
@@ -15043,7 +15043,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5455,
+                          "id": 10021,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -15051,18 +15051,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "-",
                           "prefix": true,
-                          "src": "4782:2:9",
+                          "src": "4782:2:11",
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 5454,
+                            "id": 10020,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4783:1:9",
+                            "src": "4783:1:11",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_1_by_1",
@@ -15075,7 +15075,7 @@
                             "typeString": "int_const -1"
                           }
                         },
-                        "src": "4749:35:9",
+                        "src": "4749:35:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15089,21 +15089,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5450,
+                      "id": 10016,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4741:7:9",
+                      "referencedDeclaration": 11318,
+                      "src": "4741:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5457,
+                    "id": 10023,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15111,20 +15111,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4741:44:9",
+                    "src": "4741:44:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5458,
+                  "id": 10024,
                   "nodeType": "ExpressionStatement",
-                  "src": "4741:44:9"
+                  "src": "4741:44:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5463,
+                    "id": 10029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15133,26 +15133,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5459,
+                        "id": 10025,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4963,
-                        "src": "4795:10:9",
+                        "referencedDeclaration": 9529,
+                        "src": "4795:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 5461,
+                      "id": 10027,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 5460,
+                        "id": 10026,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5443,
-                        "src": "4806:10:9",
+                        "referencedDeclaration": 10009,
+                        "src": "4806:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -15163,7 +15163,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4795:22:9",
+                      "src": "4795:22:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
                         "typeString": "int8"
@@ -15174,14 +15174,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5462,
+                      "id": 10028,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4820:1:9",
+                      "src": "4820:1:11",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -15189,28 +15189,28 @@
                       },
                       "value": "0"
                     },
-                    "src": "4795:26:9",
+                    "src": "4795:26:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_int8",
                       "typeString": "int8"
                     }
                   },
-                  "id": 5464,
+                  "id": 10030,
                   "nodeType": "ExpressionStatement",
-                  "src": "4795:26:9"
+                  "src": "4795:26:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5465,
+                    "id": 10031,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4838:4:9",
+                    "src": "4838:4:11",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -15218,52 +15218,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5449,
-                  "id": 5466,
+                  "functionReturnParameters": 10015,
+                  "id": 10032,
                   "nodeType": "Return",
-                  "src": "4831:11:9"
+                  "src": "4831:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 5468,
+            "id": 10034,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5446,
+                "id": 10012,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5445,
+                  "id": 10011,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4706:9:9",
+                  "referencedDeclaration": 10830,
+                  "src": "4706:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4706:9:9"
+                "src": "4706:9:11"
               }
             ],
             "name": "RemoveSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5444,
+              "id": 10010,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5443,
+                  "id": 10009,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5468,
-                  "src": "4679:18:9",
+                  "scope": 10034,
+                  "src": "4679:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15271,10 +15271,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5442,
+                    "id": 10008,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4679:7:9",
+                    "src": "4679:7:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -15284,20 +15284,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4678:20:9"
+              "src": "4678:20:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5449,
+              "id": 10015,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5448,
+                  "id": 10014,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5468,
-                  "src": "4725:4:9",
+                  "scope": 10034,
+                  "src": "4725:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15305,10 +15305,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5447,
+                    "id": 10013,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4725:4:9",
+                    "src": "4725:4:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -15318,20 +15318,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4724:6:9"
+              "src": "4724:6:11"
             },
-            "scope": 5469,
-            "src": "4650:199:9",
+            "scope": 10035,
+            "src": "4650:199:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5470,
-        "src": "150:4701:9"
+        "scope": 10036,
+        "src": "150:4701:11"
       }
     ],
-    "src": "0:4852:9"
+    "src": "0:4852:11"
   },
   "compiler": {
     "name": "solc",
@@ -15436,5 +15436,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.362Z"
-}
+  "updatedAt": "2019-01-10T14:00:11.098Z"
+}
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SNM.json b/blockchain/source/migration_artifacts/contracts/SNM.json
index 05c546638..f77ff01cb 100644
--- a/blockchain/source/migration_artifacts/contracts/SNM.json
+++ b/blockchain/source/migration_artifacts/contracts/SNM.json
@@ -337,22 +337,22 @@
   ],
   "bytecode": "0x60c0604052600a60808190527f534f4e4d20746f6b656e0000000000000000000000000000000000000000000060a090815261003e91600491906100d8565b506040805180820190915260038082527f534e4d00000000000000000000000000000000000000000000000000000000006020909201918252610083916005916100d8565b50601260065534801561009557600080fd5b506003805433600160a060020a0319918216811790911681179091556b016f44a83aab6c233c000000600181905560009182526020829052604090912055610173565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061011957805160ff1916838001178555610146565b82800160010185558215610146579182015b8281111561014657825182559160200191906001019061012b565b50610152929150610156565b5090565b61017091905b80821115610152576000815560010161015c565b90565b610a1a806101826000396000f3006080604052600436106100cf5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100d4578063095ea7b31461015e57806318160ddd1461019657806323b872dd146101bd578063313ce567146101e757806366188463146101fc57806370a0823114610220578063715018a6146102415780638da5cb5b1461025857806395d89b4114610289578063a9059cbb1461029e578063d73dd623146102c2578063dd62ed3e146102e6578063f2fde38b1461030d575b600080fd5b3480156100e057600080fd5b506100e961032e565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561012357818101518382015260200161010b565b50505050905090810190601f1680156101505780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561016a57600080fd5b50610182600160a060020a03600435166024356103bc565b604080519115158252519081900360200190f35b3480156101a257600080fd5b506101ab610422565b60408051918252519081900360200190f35b3480156101c957600080fd5b50610182600160a060020a0360043581169060243516604435610428565b3480156101f357600080fd5b506101ab61059d565b34801561020857600080fd5b50610182600160a060020a03600435166024356105a3565b34801561022c57600080fd5b506101ab600160a060020a0360043516610692565b34801561024d57600080fd5b506102566106ad565b005b34801561026457600080fd5b5061026d61071b565b60408051600160a060020a039092168252519081900360200190f35b34801561029557600080fd5b506100e961072a565b3480156102aa57600080fd5b50610182600160a060020a0360043516602435610785565b3480156102ce57600080fd5b50610182600160a060020a0360043516602435610864565b3480156102f257600080fd5b506101ab600160a060020a03600435811690602435166108fd565b34801561031957600080fd5b50610256600160a060020a0360043516610928565b6004805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b820191906000526020600020905b81548152906001019060200180831161039757829003601f168201915b505050505081565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561044d57600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561047d57600080fd5b600160a060020a038316151561049257600080fd5b600160a060020a0384166000908152602081905260409020546104bb908363ffffffff61094b16565b600160a060020a0380861660009081526020819052604080822093909355908516815220546104f0908363ffffffff61095d16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610532908363ffffffff61094b16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b60065481565b336000908152600260209081526040808320600160a060020a03861684529091528120548083106105f757336000908152600260209081526040808320600160a060020a038816845290915281205561062c565b610607818463ffffffff61094b16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600354600160a060020a031633146106c457600080fd5b600354604051600160a060020a03909116907ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482090600090a26003805473ffffffffffffffffffffffffffffffffffffffff19169055565b600354600160a060020a031681565b6005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b336000908152602081905260408120548211156107a157600080fd5b600160a060020a03831615156107b657600080fd5b336000908152602081905260409020546107d6908363ffffffff61094b16565b3360009081526020819052604080822092909255600160a060020a03851681522054610808908363ffffffff61095d16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a0386168452909152812054610898908363ffffffff61095d16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b600354600160a060020a0316331461093f57600080fd5b61094881610970565b50565b60008282111561095757fe5b50900390565b8181018281101561096a57fe5b92915050565b600160a060020a038116151561098557600080fd5b600354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36003805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058206a932b0aad8a192d936ade582529b77bc96c8829cc8dd09fdc74a5cdc4dd9c260029",
   "deployedBytecode": "0x6080604052600436106100cf5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100d4578063095ea7b31461015e57806318160ddd1461019657806323b872dd146101bd578063313ce567146101e757806366188463146101fc57806370a0823114610220578063715018a6146102415780638da5cb5b1461025857806395d89b4114610289578063a9059cbb1461029e578063d73dd623146102c2578063dd62ed3e146102e6578063f2fde38b1461030d575b600080fd5b3480156100e057600080fd5b506100e961032e565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561012357818101518382015260200161010b565b50505050905090810190601f1680156101505780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561016a57600080fd5b50610182600160a060020a03600435166024356103bc565b604080519115158252519081900360200190f35b3480156101a257600080fd5b506101ab610422565b60408051918252519081900360200190f35b3480156101c957600080fd5b50610182600160a060020a0360043581169060243516604435610428565b3480156101f357600080fd5b506101ab61059d565b34801561020857600080fd5b50610182600160a060020a03600435166024356105a3565b34801561022c57600080fd5b506101ab600160a060020a0360043516610692565b34801561024d57600080fd5b506102566106ad565b005b34801561026457600080fd5b5061026d61071b565b60408051600160a060020a039092168252519081900360200190f35b34801561029557600080fd5b506100e961072a565b3480156102aa57600080fd5b50610182600160a060020a0360043516602435610785565b3480156102ce57600080fd5b50610182600160a060020a0360043516602435610864565b3480156102f257600080fd5b506101ab600160a060020a03600435811690602435166108fd565b34801561031957600080fd5b50610256600160a060020a0360043516610928565b6004805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b820191906000526020600020905b81548152906001019060200180831161039757829003601f168201915b505050505081565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561044d57600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561047d57600080fd5b600160a060020a038316151561049257600080fd5b600160a060020a0384166000908152602081905260409020546104bb908363ffffffff61094b16565b600160a060020a0380861660009081526020819052604080822093909355908516815220546104f0908363ffffffff61095d16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610532908363ffffffff61094b16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b60065481565b336000908152600260209081526040808320600160a060020a03861684529091528120548083106105f757336000908152600260209081526040808320600160a060020a038816845290915281205561062c565b610607818463ffffffff61094b16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600354600160a060020a031633146106c457600080fd5b600354604051600160a060020a03909116907ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482090600090a26003805473ffffffffffffffffffffffffffffffffffffffff19169055565b600354600160a060020a031681565b6005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b336000908152602081905260408120548211156107a157600080fd5b600160a060020a03831615156107b657600080fd5b336000908152602081905260409020546107d6908363ffffffff61094b16565b3360009081526020819052604080822092909255600160a060020a03851681522054610808908363ffffffff61095d16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a0386168452909152812054610898908363ffffffff61095d16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b600354600160a060020a0316331461093f57600080fd5b61094881610970565b50565b60008282111561095757fe5b50900390565b8181018281101561096a57fe5b92915050565b600160a060020a038116151561098557600080fd5b600354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36003805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058206a932b0aad8a192d936ade582529b77bc96c8829cc8dd09fdc74a5cdc4dd9c260029",
-  "sourceMap": "236:33:10:-;157:330;236:33;;157:330;236:33;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;276:28:10;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;334:2;311:25;;343:142;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:18;:18;;575:10;-1:-1:-1;;;;;;567:18:18;;;;;374::10;;;;;;;;417:16;-1:-1:-1;402:31:10;;;-1:-1:-1;443:20:10;;;;;;;;;;;:35;157:330;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;157:330:10;;;-1:-1:-1;157:330:10;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;",
-  "deployedSourceMap": "157:330:10:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;236:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;236:33:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;236:33:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:22;-1:-1:-1;;;;;1814:188:22;;;;;;;;;;;;;;;;;;;;;;;;;389:83:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:19;;;;;;;;;;;;;;;;;;;;726:470:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:22;-1:-1:-1;;;;;726:470:22;;;;;;;;;;;;311:25:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;311:25:10;;;;3679:432:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:22;-1:-1:-1;;;;;3679:432:22;;;;;;;1149:99:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:19;-1:-1:-1;;;;;1149:99:19;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;;;;;-1:-1:-1;;;;;238:20:18;;;;;;;;;;;;;;276:28:10;;8:9:-1;5:2;;;30:1;27;20:12;5:2;276:28:10;;;;626:321:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:19;-1:-1:-1;;;;;626:321:19;;;;;;;2926:296:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:22;-1:-1:-1;;;;;2926:296:22;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:22;-1:-1:-1;;;;;2321:153:22;;;;;;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;236:33:10;;;;;;;;;;;;;;;-1:-1:-1;;236:33:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1814:188:22:-;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:22;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:22;1814:188;;;;:::o;389:83:19:-;455:12;;389:83;:::o;726:470:22:-;-1:-1:-1;;;;;864:15:22;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:22;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:22;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:22;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:22;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:22;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:22;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:22;726:470;;;;;:::o;311:25:10:-;;;;:::o;3679:432:22:-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:22;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:22;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:22;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:22;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:22;;3679:432;-1:-1:-1;;;3679:432:22:o;1149:99:19:-;-1:-1:-1;;;;;1227:16:19;1205:7;1227:16;;;;;;;;;;;;1149:99::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;1077:5;;1058:25;1089:5;:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:18;;:::o;276:28:10:-;;;;;;;;;;;;;;;-1:-1:-1;;276:28:10;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;626:321:19;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:19;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:19;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:19;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:19;626:321;;;;:::o;2926:296:22:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:22;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:22;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:22;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:22;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1060:116:17:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:17;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o;1512:171:18:-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;1617:38;;1638:5;;1617:38;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o",
+  "sourceMap": "236:33:12:-;157:330;236:33;;157:330;236:33;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;334:2;311:25;;343:142;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;575:10;-1:-1:-1;;;;;;567:18:16;;;;;374::12;;;;;;;;417:16;-1:-1:-1;402:31:12;;;-1:-1:-1;443:20:12;;;;;;;;;;;:35;157:330;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;157:330:12;;;-1:-1:-1;157:330:12;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;",
+  "deployedSourceMap": "157:330:12:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;236:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:20;-1:-1:-1;;;;;1814:188:20;;;;;;;;;;;;;;;;;;;;;;;;;389:83:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;726:470:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:20;-1:-1:-1;;;;;726:470:20;;;;;;;;;;;;311:25:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;311:25:12;;;;3679:432:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:20;-1:-1:-1;;;;;3679:432:20;;;;;;;1149:99:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;-1:-1:-1;;;;;1149:99:17;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;276:28:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;276:28:12;;;;626:321:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;-1:-1:-1;;;;;626:321:17;;;;;;;2926:296:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:20;-1:-1:-1;;;;;2926:296:20;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:20;-1:-1:-1;;;;;2321:153:20;;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;236:33:12;;;;;;;;;;;;;;;-1:-1:-1;;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1814:188:20:-;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:20;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:20;1814:188;;;;:::o;389:83:17:-;455:12;;389:83;:::o;726:470:20:-;-1:-1:-1;;;;;864:15:20;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:20;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:20;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:20;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:20;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:20;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:20;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:20;726:470;;;;;:::o;311:25:12:-;;;;:::o;3679:432:20:-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:20;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:20;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:20;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:20;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:20;;3679:432;-1:-1:-1;;;3679:432:20:o;1149:99:17:-;-1:-1:-1;;;;;1227:16:17;1205:7;1227:16;;;;;;;;;;;;1149:99::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;1077:5;;1058:25;1089:5;:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;276:28:12:-;;;;;;;;;;;;;;;-1:-1:-1;;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;626:321:17;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:17;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:17;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:17;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;2926:296:20:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:20;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:20;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:20;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:20;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;1617:38;;1638:5;;1617:38;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/token/ERC20/StandardToken.sol\";\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract SNM is StandardToken, Ownable {\n\n    using SafeMath for uint256;\n\n    string public name = \"SONM token\";\n\n    string public symbol = \"SNM\";\n\n    uint public decimals = 18;\n\n    constructor() public {\n        owner = msg.sender;\n        totalSupply_ = 444 * 1e6 * 1e18;\n        balances[msg.sender] = totalSupply_;\n    }\n}\n",
   "sourcePath": "contracts/SNM.sol",
   "ast": {
     "absolutePath": "contracts/SNM.sol",
     "exportedSymbols": {
       "SNM": [
-        5514
+        10080
       ]
     },
-    "id": 5515,
+    "id": 10081,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 5471,
+        "id": 10037,
         "literals": [
           "solidity",
           "^",
@@ -360,27 +360,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:10"
+        "src": "0:24:12"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 5472,
+        "id": 10038,
         "nodeType": "ImportDirective",
-        "scope": 5515,
-        "sourceUnit": 7755,
-        "src": "27:67:10",
+        "scope": 10081,
+        "sourceUnit": 11301,
+        "src": "27:67:12",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 5473,
+        "id": 10039,
         "nodeType": "ImportDirective",
-        "scope": 5515,
-        "sourceUnit": 7337,
-        "src": "95:59:10",
+        "scope": 10081,
+        "sourceUnit": 10883,
+        "src": "95:59:12",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -390,82 +390,82 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5474,
+              "id": 10040,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7754,
-              "src": "173:13:10",
+              "referencedDeclaration": 11300,
+              "src": "173:13:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$7754",
+                "typeIdentifier": "t_contract$_StandardToken_$11300",
                 "typeString": "contract StandardToken"
               }
             },
-            "id": 5475,
+            "id": 10041,
             "nodeType": "InheritanceSpecifier",
-            "src": "173:13:10"
+            "src": "173:13:12"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5476,
+              "id": 10042,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "188:7:10",
+              "referencedDeclaration": 10882,
+              "src": "188:7:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 5477,
+            "id": 10043,
             "nodeType": "InheritanceSpecifier",
-            "src": "188:7:10"
+            "src": "188:7:12"
           }
         ],
         "contractDependencies": [
-          7336,
-          7432,
-          7475,
-          7507,
-          7754
+          10882,
+          10978,
+          11021,
+          11053,
+          11300
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5514,
+        "id": 10080,
         "linearizedBaseContracts": [
-          5514,
-          7336,
-          7754,
-          7432,
-          7475,
-          7507
+          10080,
+          10882,
+          11300,
+          10978,
+          11021,
+          11053
         ],
         "name": "SNM",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 5480,
+            "id": 10046,
             "libraryName": {
               "contractScope": null,
-              "id": 5478,
+              "id": 10044,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "209:8:10",
+              "referencedDeclaration": 10796,
+              "src": "209:8:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "203:27:10",
+            "src": "203:27:12",
             "typeName": {
-              "id": 5479,
+              "id": 10045,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "222:7:10",
+              "src": "222:7:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -474,11 +474,11 @@
           },
           {
             "constant": false,
-            "id": 5483,
+            "id": 10049,
             "name": "name",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "236:33:10",
+            "scope": 10080,
+            "src": "236:33:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -486,10 +486,10 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 5481,
+              "id": 10047,
               "name": "string",
               "nodeType": "ElementaryTypeName",
-              "src": "236:6:10",
+              "src": "236:6:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_string_storage_ptr",
                 "typeString": "string"
@@ -498,14 +498,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534f4e4d20746f6b656e",
-              "id": 5482,
+              "id": 10048,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "string",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "257:12:10",
+              "src": "257:12:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_stringliteral_29c57beeda69ead9e47e3ff12d48e183190e9bdbe12cd06a89c59741ae9769ff",
@@ -517,11 +517,11 @@
           },
           {
             "constant": false,
-            "id": 5486,
+            "id": 10052,
             "name": "symbol",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "276:28:10",
+            "scope": 10080,
+            "src": "276:28:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -529,10 +529,10 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 5484,
+              "id": 10050,
               "name": "string",
               "nodeType": "ElementaryTypeName",
-              "src": "276:6:10",
+              "src": "276:6:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_string_storage_ptr",
                 "typeString": "string"
@@ -541,14 +541,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534e4d",
-              "id": 5485,
+              "id": 10051,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "string",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "299:5:10",
+              "src": "299:5:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_stringliteral_c5f17fb1eefa72d2666826e7791974a50379207f2a966067d24a5bb76cfd3236",
@@ -560,11 +560,11 @@
           },
           {
             "constant": false,
-            "id": 5489,
+            "id": 10055,
             "name": "decimals",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "311:25:10",
+            "scope": 10080,
+            "src": "311:25:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -572,10 +572,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5487,
+              "id": 10053,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "311:4:10",
+              "src": "311:4:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -584,14 +584,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3138",
-              "id": 5488,
+              "id": 10054,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "334:2:10",
+              "src": "334:2:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_18_by_1",
@@ -603,26 +603,26 @@
           },
           {
             "body": {
-              "id": 5512,
+              "id": 10078,
               "nodeType": "Block",
-              "src": "364:121:10",
+              "src": "364:121:12",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5495,
+                    "id": 10061,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5492,
+                      "id": 10058,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "374:5:10",
+                      "referencedDeclaration": 10800,
+                      "src": "374:5:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -634,18 +634,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5493,
+                        "id": 10059,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "382:3:10",
+                        "referencedDeclaration": 11315,
+                        "src": "382:3:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 5494,
+                      "id": 10060,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -653,38 +653,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "382:10:10",
+                      "src": "382:10:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "374:18:10",
+                    "src": "374:18:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 5496,
+                  "id": 10062,
                   "nodeType": "ExpressionStatement",
-                  "src": "374:18:10"
+                  "src": "374:18:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5503,
+                    "id": 10069,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5497,
+                      "id": 10063,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7351,
-                      "src": "402:12:10",
+                      "referencedDeclaration": 10897,
+                      "src": "402:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -698,7 +698,7 @@
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       },
-                      "id": 5502,
+                      "id": 10068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -709,7 +709,7 @@
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
                         },
-                        "id": 5500,
+                        "id": 10066,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -717,14 +717,14 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "hexValue": "343434",
-                          "id": 5498,
+                          "id": 10064,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "417:3:10",
+                          "src": "417:3:12",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_444_by_1",
@@ -737,14 +737,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "316536",
-                          "id": 5499,
+                          "id": 10065,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "423:3:10",
+                          "src": "423:3:12",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1000000_by_1",
@@ -752,7 +752,7 @@
                           },
                           "value": "1e6"
                         },
-                        "src": "417:9:10",
+                        "src": "417:9:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
@@ -763,14 +763,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 5501,
+                        "id": 10067,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "429:4:10",
+                        "src": "429:4:12",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -778,26 +778,26 @@
                         },
                         "value": "1e18"
                       },
-                      "src": "417:16:10",
+                      "src": "417:16:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       }
                     },
-                    "src": "402:31:10",
+                    "src": "402:31:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5504,
+                  "id": 10070,
                   "nodeType": "ExpressionStatement",
-                  "src": "402:31:10"
+                  "src": "402:31:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5510,
+                    "id": 10076,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -806,34 +806,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5505,
+                        "id": 10071,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "443:8:10",
+                        "referencedDeclaration": 10895,
+                        "src": "443:8:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 5508,
+                      "id": 10074,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5506,
+                          "id": 10072,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "452:3:10",
+                          "referencedDeclaration": 11315,
+                          "src": "452:3:12",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 5507,
+                        "id": 10073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -841,7 +841,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "452:10:10",
+                        "src": "452:10:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -852,7 +852,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "443:20:10",
+                      "src": "443:20:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -862,31 +862,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5509,
+                      "id": 10075,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7351,
-                      "src": "466:12:10",
+                      "referencedDeclaration": 10897,
+                      "src": "466:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "443:35:10",
+                    "src": "443:35:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5511,
+                  "id": 10077,
                   "nodeType": "ExpressionStatement",
-                  "src": "443:35:10"
+                  "src": "443:35:12"
                 }
               ]
             },
             "documentation": null,
-            "id": 5513,
+            "id": 10079,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -894,43 +894,43 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5490,
+              "id": 10056,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "354:2:10"
+              "src": "354:2:12"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5491,
+              "id": 10057,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "364:0:10"
+              "src": "364:0:12"
             },
-            "scope": 5514,
-            "src": "343:142:10",
+            "scope": 10080,
+            "src": "343:142:12",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5515,
-        "src": "157:330:10"
+        "scope": 10081,
+        "src": "157:330:12"
       }
     ],
-    "src": "0:488:10"
+    "src": "0:488:12"
   },
   "legacyAST": {
     "absolutePath": "contracts/SNM.sol",
     "exportedSymbols": {
       "SNM": [
-        5514
+        10080
       ]
     },
-    "id": 5515,
+    "id": 10081,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 5471,
+        "id": 10037,
         "literals": [
           "solidity",
           "^",
@@ -938,27 +938,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:10"
+        "src": "0:24:12"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 5472,
+        "id": 10038,
         "nodeType": "ImportDirective",
-        "scope": 5515,
-        "sourceUnit": 7755,
-        "src": "27:67:10",
+        "scope": 10081,
+        "sourceUnit": 11301,
+        "src": "27:67:12",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 5473,
+        "id": 10039,
         "nodeType": "ImportDirective",
-        "scope": 5515,
-        "sourceUnit": 7337,
-        "src": "95:59:10",
+        "scope": 10081,
+        "sourceUnit": 10883,
+        "src": "95:59:12",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -968,82 +968,82 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5474,
+              "id": 10040,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7754,
-              "src": "173:13:10",
+              "referencedDeclaration": 11300,
+              "src": "173:13:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$7754",
+                "typeIdentifier": "t_contract$_StandardToken_$11300",
                 "typeString": "contract StandardToken"
               }
             },
-            "id": 5475,
+            "id": 10041,
             "nodeType": "InheritanceSpecifier",
-            "src": "173:13:10"
+            "src": "173:13:12"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5476,
+              "id": 10042,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "188:7:10",
+              "referencedDeclaration": 10882,
+              "src": "188:7:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 5477,
+            "id": 10043,
             "nodeType": "InheritanceSpecifier",
-            "src": "188:7:10"
+            "src": "188:7:12"
           }
         ],
         "contractDependencies": [
-          7336,
-          7432,
-          7475,
-          7507,
-          7754
+          10882,
+          10978,
+          11021,
+          11053,
+          11300
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5514,
+        "id": 10080,
         "linearizedBaseContracts": [
-          5514,
-          7336,
-          7754,
-          7432,
-          7475,
-          7507
+          10080,
+          10882,
+          11300,
+          10978,
+          11021,
+          11053
         ],
         "name": "SNM",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 5480,
+            "id": 10046,
             "libraryName": {
               "contractScope": null,
-              "id": 5478,
+              "id": 10044,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "209:8:10",
+              "referencedDeclaration": 10796,
+              "src": "209:8:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "203:27:10",
+            "src": "203:27:12",
             "typeName": {
-              "id": 5479,
+              "id": 10045,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "222:7:10",
+              "src": "222:7:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1052,11 +1052,11 @@
           },
           {
             "constant": false,
-            "id": 5483,
+            "id": 10049,
             "name": "name",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "236:33:10",
+            "scope": 10080,
+            "src": "236:33:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1064,10 +1064,10 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 5481,
+              "id": 10047,
               "name": "string",
               "nodeType": "ElementaryTypeName",
-              "src": "236:6:10",
+              "src": "236:6:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_string_storage_ptr",
                 "typeString": "string"
@@ -1076,14 +1076,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534f4e4d20746f6b656e",
-              "id": 5482,
+              "id": 10048,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "string",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "257:12:10",
+              "src": "257:12:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_stringliteral_29c57beeda69ead9e47e3ff12d48e183190e9bdbe12cd06a89c59741ae9769ff",
@@ -1095,11 +1095,11 @@
           },
           {
             "constant": false,
-            "id": 5486,
+            "id": 10052,
             "name": "symbol",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "276:28:10",
+            "scope": 10080,
+            "src": "276:28:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1107,10 +1107,10 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 5484,
+              "id": 10050,
               "name": "string",
               "nodeType": "ElementaryTypeName",
-              "src": "276:6:10",
+              "src": "276:6:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_string_storage_ptr",
                 "typeString": "string"
@@ -1119,14 +1119,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534e4d",
-              "id": 5485,
+              "id": 10051,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "string",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "299:5:10",
+              "src": "299:5:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_stringliteral_c5f17fb1eefa72d2666826e7791974a50379207f2a966067d24a5bb76cfd3236",
@@ -1138,11 +1138,11 @@
           },
           {
             "constant": false,
-            "id": 5489,
+            "id": 10055,
             "name": "decimals",
             "nodeType": "VariableDeclaration",
-            "scope": 5514,
-            "src": "311:25:10",
+            "scope": 10080,
+            "src": "311:25:12",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1150,10 +1150,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5487,
+              "id": 10053,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "311:4:10",
+              "src": "311:4:12",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1162,14 +1162,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3138",
-              "id": 5488,
+              "id": 10054,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "334:2:10",
+              "src": "334:2:12",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_18_by_1",
@@ -1181,26 +1181,26 @@
           },
           {
             "body": {
-              "id": 5512,
+              "id": 10078,
               "nodeType": "Block",
-              "src": "364:121:10",
+              "src": "364:121:12",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5495,
+                    "id": 10061,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5492,
+                      "id": 10058,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "374:5:10",
+                      "referencedDeclaration": 10800,
+                      "src": "374:5:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1212,18 +1212,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5493,
+                        "id": 10059,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "382:3:10",
+                        "referencedDeclaration": 11315,
+                        "src": "382:3:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 5494,
+                      "id": 10060,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1231,38 +1231,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "382:10:10",
+                      "src": "382:10:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "374:18:10",
+                    "src": "374:18:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 5496,
+                  "id": 10062,
                   "nodeType": "ExpressionStatement",
-                  "src": "374:18:10"
+                  "src": "374:18:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5503,
+                    "id": 10069,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5497,
+                      "id": 10063,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7351,
-                      "src": "402:12:10",
+                      "referencedDeclaration": 10897,
+                      "src": "402:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1276,7 +1276,7 @@
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       },
-                      "id": 5502,
+                      "id": 10068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1287,7 +1287,7 @@
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
                         },
-                        "id": 5500,
+                        "id": 10066,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1295,14 +1295,14 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "hexValue": "343434",
-                          "id": 5498,
+                          "id": 10064,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "417:3:10",
+                          "src": "417:3:12",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_444_by_1",
@@ -1315,14 +1315,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "316536",
-                          "id": 5499,
+                          "id": 10065,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "423:3:10",
+                          "src": "423:3:12",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1000000_by_1",
@@ -1330,7 +1330,7 @@
                           },
                           "value": "1e6"
                         },
-                        "src": "417:9:10",
+                        "src": "417:9:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
@@ -1341,14 +1341,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 5501,
+                        "id": 10067,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "429:4:10",
+                        "src": "429:4:12",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -1356,26 +1356,26 @@
                         },
                         "value": "1e18"
                       },
-                      "src": "417:16:10",
+                      "src": "417:16:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       }
                     },
-                    "src": "402:31:10",
+                    "src": "402:31:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5504,
+                  "id": 10070,
                   "nodeType": "ExpressionStatement",
-                  "src": "402:31:10"
+                  "src": "402:31:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5510,
+                    "id": 10076,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1384,34 +1384,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 5505,
+                        "id": 10071,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "443:8:10",
+                        "referencedDeclaration": 10895,
+                        "src": "443:8:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 5508,
+                      "id": 10074,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5506,
+                          "id": 10072,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "452:3:10",
+                          "referencedDeclaration": 11315,
+                          "src": "452:3:12",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 5507,
+                        "id": 10073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1419,7 +1419,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "452:10:10",
+                        "src": "452:10:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1430,7 +1430,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "443:20:10",
+                      "src": "443:20:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1440,31 +1440,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5509,
+                      "id": 10075,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7351,
-                      "src": "466:12:10",
+                      "referencedDeclaration": 10897,
+                      "src": "466:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "443:35:10",
+                    "src": "443:35:12",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5511,
+                  "id": 10077,
                   "nodeType": "ExpressionStatement",
-                  "src": "443:35:10"
+                  "src": "443:35:12"
                 }
               ]
             },
             "documentation": null,
-            "id": 5513,
+            "id": 10079,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1472,30 +1472,30 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5490,
+              "id": 10056,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "354:2:10"
+              "src": "354:2:12"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5491,
+              "id": 10057,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "364:0:10"
+              "src": "364:0:12"
             },
-            "scope": 5514,
-            "src": "343:142:10",
+            "scope": 10080,
+            "src": "343:142:12",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5515,
-        "src": "157:330:10"
+        "scope": 10081,
+        "src": "157:330:12"
       }
     ],
-    "src": "0:488:10"
+    "src": "0:488:12"
   },
   "compiler": {
     "name": "solc",
@@ -1584,5 +1584,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.329Z"
+  "updatedAt": "2019-01-10T14:00:11.059Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SafeMath.json b/blockchain/source/migration_artifacts/contracts/SafeMath.json
index df12f0d18..ff7c8ef38 100644
--- a/blockchain/source/migration_artifacts/contracts/SafeMath.json
+++ b/blockchain/source/migration_artifacts/contracts/SafeMath.json
@@ -3,22 +3,22 @@
   "abi": [],
   "bytecode": "0x604c602c600b82828239805160001a60731460008114601c57601e565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600080fd00a165627a7a723058208039be690fcb121eceb5677b72be9a3448b94fbe32d322db860abcab2a433c9c0029",
   "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fd00a165627a7a723058208039be690fcb121eceb5677b72be9a3448b94fbe32d322db860abcab2a433c9c0029",
-  "sourceMap": "117:1251:5:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24",
-  "deployedSourceMap": "117:1251:5:-;;;;;;;;",
+  "sourceMap": "117:1251:15:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24",
+  "deployedSourceMap": "117:1251:15:-;;;;;;;;",
   "source": "pragma solidity ^0.4.24;\n\n\n/**\n * @title SafeMath\n * @dev Math operations with safety checks that throw on error\n */\nlibrary SafeMath {\n\n  /**\n  * @dev Multiplies two numbers, throws on overflow.\n  */\n  function mul(uint256 _a, uint256 _b) internal pure returns (uint256 c) {\n    // Gas optimization: this is cheaper than asserting 'a' not being zero, but the\n    // benefit is lost if 'b' is also tested.\n    // See: https://github.com/OpenZeppelin/openzeppelin-solidity/pull/522\n    if (_a == 0) {\n      return 0;\n    }\n\n    c = _a * _b;\n    assert(c / _a == _b);\n    return c;\n  }\n\n  /**\n  * @dev Integer division of two numbers, truncating the quotient.\n  */\n  function div(uint256 _a, uint256 _b) internal pure returns (uint256) {\n    // assert(_b > 0); // Solidity automatically throws when dividing by 0\n    // uint256 c = _a / _b;\n    // assert(_a == _b * c + _a % _b); // There is no case in which this doesn't hold\n    return _a / _b;\n  }\n\n  /**\n  * @dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).\n  */\n  function sub(uint256 _a, uint256 _b) internal pure returns (uint256) {\n    assert(_b <= _a);\n    return _a - _b;\n  }\n\n  /**\n  * @dev Adds two numbers, throws on overflow.\n  */\n  function add(uint256 _a, uint256 _b) internal pure returns (uint256 c) {\n    c = _a + _b;\n    assert(c >= _a);\n    return c;\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
     "exportedSymbols": {
       "SafeMath": [
-        1317
+        10796
       ]
     },
-    "id": 1318,
+    "id": 10797,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 1225,
+        "id": 10704,
         "literals": [
           "solidity",
           "^",
@@ -26,7 +26,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:5"
+        "src": "0:24:15"
       },
       {
         "baseContracts": [],
@@ -34,18 +34,18 @@
         "contractKind": "library",
         "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error",
         "fullyImplemented": true,
-        "id": 1317,
+        "id": 10796,
         "linearizedBaseContracts": [
-          1317
+          10796
         ],
         "name": "SafeMath",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 1257,
+              "id": 10736,
               "nodeType": "Block",
-              "src": "274:309:5",
+              "src": "274:309:15",
               "statements": [
                 {
                   "condition": {
@@ -54,19 +54,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1236,
+                    "id": 10715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1234,
+                      "id": 10713,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1227,
-                      "src": "489:2:5",
+                      "referencedDeclaration": 10706,
+                      "src": "489:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77,14 +77,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1235,
+                      "id": 10714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "495:1:5",
+                      "src": "495:1:15",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -92,33 +92,33 @@
                       },
                       "value": "0"
                     },
-                    "src": "489:7:5",
+                    "src": "489:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1240,
+                  "id": 10719,
                   "nodeType": "IfStatement",
-                  "src": "485:36:5",
+                  "src": "485:36:15",
                   "trueBody": {
-                    "id": 1239,
+                    "id": 10718,
                     "nodeType": "Block",
-                    "src": "498:23:5",
+                    "src": "498:23:15",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1237,
+                          "id": 10716,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "513:1:5",
+                          "src": "513:1:15",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -126,10 +126,10 @@
                           },
                           "value": "0"
                         },
-                        "functionReturnParameters": 1233,
-                        "id": 1238,
+                        "functionReturnParameters": 10712,
+                        "id": 10717,
                         "nodeType": "Return",
-                        "src": "506:8:5"
+                        "src": "506:8:15"
                       }
                     ]
                   }
@@ -137,19 +137,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1245,
+                    "id": 10724,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1241,
+                      "id": 10720,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1232,
-                      "src": "527:1:5",
+                      "referencedDeclaration": 10711,
+                      "src": "527:1:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -163,19 +163,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1244,
+                      "id": 10723,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 1242,
+                        "id": 10721,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1227,
-                        "src": "531:2:5",
+                        "referencedDeclaration": 10706,
+                        "src": "531:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -185,32 +185,32 @@
                       "operator": "*",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 1243,
+                        "id": 10722,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1229,
-                        "src": "536:2:5",
+                        "referencedDeclaration": 10708,
+                        "src": "536:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "531:7:5",
+                      "src": "531:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "527:11:5",
+                    "src": "527:11:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1246,
+                  "id": 10725,
                   "nodeType": "ExpressionStatement",
-                  "src": "527:11:5"
+                  "src": "527:11:15"
                 },
                 {
                   "expression": {
@@ -222,7 +222,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1252,
+                        "id": 10731,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -233,19 +233,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 1250,
+                          "id": 10729,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 1248,
+                            "id": 10727,
                             "name": "c",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1232,
-                            "src": "551:1:5",
+                            "referencedDeclaration": 10711,
+                            "src": "551:1:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -255,18 +255,18 @@
                           "operator": "/",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 1249,
+                            "id": 10728,
                             "name": "_a",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1227,
-                            "src": "555:2:5",
+                            "referencedDeclaration": 10706,
+                            "src": "555:2:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "551:6:5",
+                          "src": "551:6:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -276,18 +276,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1251,
+                          "id": 10730,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1229,
-                          "src": "561:2:5",
+                          "referencedDeclaration": 10708,
+                          "src": "561:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "551:12:5",
+                        "src": "551:12:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -301,18 +301,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1247,
+                      "id": 10726,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "544:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "544:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1253,
+                    "id": 10732,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -320,39 +320,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "544:20:5",
+                    "src": "544:20:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1254,
+                  "id": 10733,
                   "nodeType": "ExpressionStatement",
-                  "src": "544:20:5"
+                  "src": "544:20:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1255,
+                    "id": 10734,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1232,
-                    "src": "577:1:5",
+                    "referencedDeclaration": 10711,
+                    "src": "577:1:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1233,
-                  "id": 1256,
+                  "functionReturnParameters": 10712,
+                  "id": 10735,
                   "nodeType": "Return",
-                  "src": "570:8:5"
+                  "src": "570:8:15"
                 }
               ]
             },
             "documentation": "@dev Multiplies two numbers, throws on overflow.",
-            "id": 1258,
+            "id": 10737,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -360,16 +360,16 @@
             "name": "mul",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1230,
+              "id": 10709,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1227,
+                  "id": 10706,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "216:10:5",
+                  "scope": 10737,
+                  "src": "216:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -377,10 +377,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1226,
+                    "id": 10705,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "216:7:5",
+                    "src": "216:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -391,11 +391,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1229,
+                  "id": 10708,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "228:10:5",
+                  "scope": 10737,
+                  "src": "228:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -403,10 +403,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1228,
+                    "id": 10707,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "228:7:5",
+                    "src": "228:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -416,20 +416,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "215:24:5"
+              "src": "215:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1233,
+              "id": 10712,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1232,
+                  "id": 10711,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "263:9:5",
+                  "scope": 10737,
+                  "src": "263:9:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -437,10 +437,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1231,
+                    "id": 10710,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "263:7:5",
+                    "src": "263:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -450,19 +450,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "262:11:5"
+              "src": "262:11:15"
             },
-            "scope": 1317,
-            "src": "203:380:5",
+            "scope": 10796,
+            "src": "203:380:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1271,
+              "id": 10750,
               "nodeType": "Block",
-              "src": "734:214:5",
+              "src": "734:214:15",
               "statements": [
                 {
                   "expression": {
@@ -471,19 +471,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1269,
+                    "id": 10748,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1267,
+                      "id": 10746,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1260,
-                      "src": "936:2:5",
+                      "referencedDeclaration": 10739,
+                      "src": "936:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -493,32 +493,32 @@
                     "operator": "/",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1268,
+                      "id": 10747,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1262,
-                      "src": "941:2:5",
+                      "referencedDeclaration": 10741,
+                      "src": "941:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "936:7:5",
+                    "src": "936:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1266,
-                  "id": 1270,
+                  "functionReturnParameters": 10745,
+                  "id": 10749,
                   "nodeType": "Return",
-                  "src": "929:14:5"
+                  "src": "929:14:15"
                 }
               ]
             },
             "documentation": "@dev Integer division of two numbers, truncating the quotient.",
-            "id": 1272,
+            "id": 10751,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -526,16 +526,16 @@
             "name": "div",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1263,
+              "id": 10742,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1260,
+                  "id": 10739,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "678:10:5",
+                  "scope": 10751,
+                  "src": "678:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -543,10 +543,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1259,
+                    "id": 10738,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "678:7:5",
+                    "src": "678:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -557,11 +557,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1262,
+                  "id": 10741,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "690:10:5",
+                  "scope": 10751,
+                  "src": "690:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -569,10 +569,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1261,
+                    "id": 10740,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "690:7:5",
+                    "src": "690:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -582,20 +582,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "677:24:5"
+              "src": "677:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1266,
+              "id": 10745,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1265,
+                  "id": 10744,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "725:7:5",
+                  "scope": 10751,
+                  "src": "725:7:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -603,10 +603,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1264,
+                    "id": 10743,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "725:7:5",
+                    "src": "725:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -616,19 +616,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "724:9:5"
+              "src": "724:9:15"
             },
-            "scope": 1317,
-            "src": "665:283:5",
+            "scope": 10796,
+            "src": "665:283:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1291,
+              "id": 10770,
               "nodeType": "Block",
-              "src": "1129:47:5",
+              "src": "1129:47:15",
               "statements": [
                 {
                   "expression": {
@@ -640,19 +640,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1284,
+                        "id": 10763,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1282,
+                          "id": 10761,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1276,
-                          "src": "1142:2:5",
+                          "referencedDeclaration": 10755,
+                          "src": "1142:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -662,18 +662,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1283,
+                          "id": 10762,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1274,
-                          "src": "1148:2:5",
+                          "referencedDeclaration": 10753,
+                          "src": "1148:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1142:8:5",
+                        "src": "1142:8:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -687,18 +687,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1281,
+                      "id": 10760,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "1135:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "1135:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1285,
+                    "id": 10764,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -706,15 +706,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1135:16:5",
+                    "src": "1135:16:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1286,
+                  "id": 10765,
                   "nodeType": "ExpressionStatement",
-                  "src": "1135:16:5"
+                  "src": "1135:16:15"
                 },
                 {
                   "expression": {
@@ -723,19 +723,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1289,
+                    "id": 10768,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1287,
+                      "id": 10766,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1274,
-                      "src": "1164:2:5",
+                      "referencedDeclaration": 10753,
+                      "src": "1164:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -745,32 +745,32 @@
                     "operator": "-",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1288,
+                      "id": 10767,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1276,
-                      "src": "1169:2:5",
+                      "referencedDeclaration": 10755,
+                      "src": "1169:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1164:7:5",
+                    "src": "1164:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1280,
-                  "id": 1290,
+                  "functionReturnParameters": 10759,
+                  "id": 10769,
                   "nodeType": "Return",
-                  "src": "1157:14:5"
+                  "src": "1157:14:15"
                 }
               ]
             },
             "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).",
-            "id": 1292,
+            "id": 10771,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -778,16 +778,16 @@
             "name": "sub",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1277,
+              "id": 10756,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1274,
+                  "id": 10753,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1073:10:5",
+                  "scope": 10771,
+                  "src": "1073:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -795,10 +795,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1273,
+                    "id": 10752,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1073:7:5",
+                    "src": "1073:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -809,11 +809,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1276,
+                  "id": 10755,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1085:10:5",
+                  "scope": 10771,
+                  "src": "1085:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -821,10 +821,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1275,
+                    "id": 10754,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1085:7:5",
+                    "src": "1085:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -834,20 +834,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1072:24:5"
+              "src": "1072:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1280,
+              "id": 10759,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1279,
+                  "id": 10758,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1120:7:5",
+                  "scope": 10771,
+                  "src": "1120:7:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -855,10 +855,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1278,
+                    "id": 10757,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1120:7:5",
+                    "src": "1120:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -868,36 +868,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1119:9:5"
+              "src": "1119:9:15"
             },
-            "scope": 1317,
-            "src": "1060:116:5",
+            "scope": 10796,
+            "src": "1060:116:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1315,
+              "id": 10794,
               "nodeType": "Block",
-              "src": "1309:57:5",
+              "src": "1309:57:15",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1305,
+                    "id": 10784,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1301,
+                      "id": 10780,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1299,
-                      "src": "1315:1:5",
+                      "referencedDeclaration": 10778,
+                      "src": "1315:1:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -911,19 +911,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1304,
+                      "id": 10783,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 1302,
+                        "id": 10781,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1294,
-                        "src": "1319:2:5",
+                        "referencedDeclaration": 10773,
+                        "src": "1319:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -933,32 +933,32 @@
                       "operator": "+",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 1303,
+                        "id": 10782,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1296,
-                        "src": "1324:2:5",
+                        "referencedDeclaration": 10775,
+                        "src": "1324:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "1319:7:5",
+                      "src": "1319:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1315:11:5",
+                    "src": "1315:11:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1306,
+                  "id": 10785,
                   "nodeType": "ExpressionStatement",
-                  "src": "1315:11:5"
+                  "src": "1315:11:15"
                 },
                 {
                   "expression": {
@@ -970,19 +970,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1310,
+                        "id": 10789,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1308,
+                          "id": 10787,
                           "name": "c",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1299,
-                          "src": "1339:1:5",
+                          "referencedDeclaration": 10778,
+                          "src": "1339:1:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -992,18 +992,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1309,
+                          "id": 10788,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1294,
-                          "src": "1344:2:5",
+                          "referencedDeclaration": 10773,
+                          "src": "1344:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1339:7:5",
+                        "src": "1339:7:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1017,18 +1017,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1307,
+                      "id": 10786,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "1332:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "1332:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1311,
+                    "id": 10790,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1036,39 +1036,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1332:15:5",
+                    "src": "1332:15:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1312,
+                  "id": 10791,
                   "nodeType": "ExpressionStatement",
-                  "src": "1332:15:5"
+                  "src": "1332:15:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1313,
+                    "id": 10792,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1299,
-                    "src": "1360:1:5",
+                    "referencedDeclaration": 10778,
+                    "src": "1360:1:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1300,
-                  "id": 1314,
+                  "functionReturnParameters": 10779,
+                  "id": 10793,
                   "nodeType": "Return",
-                  "src": "1353:8:5"
+                  "src": "1353:8:15"
                 }
               ]
             },
             "documentation": "@dev Adds two numbers, throws on overflow.",
-            "id": 1316,
+            "id": 10795,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1076,16 +1076,16 @@
             "name": "add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1297,
+              "id": 10776,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1294,
+                  "id": 10773,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1251:10:5",
+                  "scope": 10795,
+                  "src": "1251:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1093,10 +1093,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1293,
+                    "id": 10772,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1251:7:5",
+                    "src": "1251:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1107,11 +1107,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1296,
+                  "id": 10775,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1263:10:5",
+                  "scope": 10795,
+                  "src": "1263:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1119,10 +1119,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1295,
+                    "id": 10774,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1263:7:5",
+                    "src": "1263:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1132,20 +1132,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1250:24:5"
+              "src": "1250:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1300,
+              "id": 10779,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1299,
+                  "id": 10778,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1298:9:5",
+                  "scope": 10795,
+                  "src": "1298:9:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1153,10 +1153,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1298,
+                    "id": 10777,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1298:7:5",
+                    "src": "1298:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1166,33 +1166,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1297:11:5"
+              "src": "1297:11:15"
             },
-            "scope": 1317,
-            "src": "1238:128:5",
+            "scope": 10796,
+            "src": "1238:128:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 1318,
-        "src": "117:1251:5"
+        "scope": 10797,
+        "src": "117:1251:15"
       }
     ],
-    "src": "0:1369:5"
+    "src": "0:1369:15"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
     "exportedSymbols": {
       "SafeMath": [
-        1317
+        10796
       ]
     },
-    "id": 1318,
+    "id": 10797,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 1225,
+        "id": 10704,
         "literals": [
           "solidity",
           "^",
@@ -1200,7 +1200,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:5"
+        "src": "0:24:15"
       },
       {
         "baseContracts": [],
@@ -1208,18 +1208,18 @@
         "contractKind": "library",
         "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error",
         "fullyImplemented": true,
-        "id": 1317,
+        "id": 10796,
         "linearizedBaseContracts": [
-          1317
+          10796
         ],
         "name": "SafeMath",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 1257,
+              "id": 10736,
               "nodeType": "Block",
-              "src": "274:309:5",
+              "src": "274:309:15",
               "statements": [
                 {
                   "condition": {
@@ -1228,19 +1228,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1236,
+                    "id": 10715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1234,
+                      "id": 10713,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1227,
-                      "src": "489:2:5",
+                      "referencedDeclaration": 10706,
+                      "src": "489:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1251,14 +1251,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 1235,
+                      "id": 10714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "495:1:5",
+                      "src": "495:1:15",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -1266,33 +1266,33 @@
                       },
                       "value": "0"
                     },
-                    "src": "489:7:5",
+                    "src": "489:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 1240,
+                  "id": 10719,
                   "nodeType": "IfStatement",
-                  "src": "485:36:5",
+                  "src": "485:36:15",
                   "trueBody": {
-                    "id": 1239,
+                    "id": 10718,
                     "nodeType": "Block",
-                    "src": "498:23:5",
+                    "src": "498:23:15",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 1237,
+                          "id": 10716,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "513:1:5",
+                          "src": "513:1:15",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1300,10 +1300,10 @@
                           },
                           "value": "0"
                         },
-                        "functionReturnParameters": 1233,
-                        "id": 1238,
+                        "functionReturnParameters": 10712,
+                        "id": 10717,
                         "nodeType": "Return",
-                        "src": "506:8:5"
+                        "src": "506:8:15"
                       }
                     ]
                   }
@@ -1311,19 +1311,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1245,
+                    "id": 10724,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1241,
+                      "id": 10720,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1232,
-                      "src": "527:1:5",
+                      "referencedDeclaration": 10711,
+                      "src": "527:1:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1337,19 +1337,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1244,
+                      "id": 10723,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 1242,
+                        "id": 10721,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1227,
-                        "src": "531:2:5",
+                        "referencedDeclaration": 10706,
+                        "src": "531:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1359,32 +1359,32 @@
                       "operator": "*",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 1243,
+                        "id": 10722,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1229,
-                        "src": "536:2:5",
+                        "referencedDeclaration": 10708,
+                        "src": "536:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "531:7:5",
+                      "src": "531:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "527:11:5",
+                    "src": "527:11:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1246,
+                  "id": 10725,
                   "nodeType": "ExpressionStatement",
-                  "src": "527:11:5"
+                  "src": "527:11:15"
                 },
                 {
                   "expression": {
@@ -1396,7 +1396,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1252,
+                        "id": 10731,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1407,19 +1407,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 1250,
+                          "id": 10729,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 1248,
+                            "id": 10727,
                             "name": "c",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1232,
-                            "src": "551:1:5",
+                            "referencedDeclaration": 10711,
+                            "src": "551:1:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -1429,18 +1429,18 @@
                           "operator": "/",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 1249,
+                            "id": 10728,
                             "name": "_a",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1227,
-                            "src": "555:2:5",
+                            "referencedDeclaration": 10706,
+                            "src": "555:2:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "551:6:5",
+                          "src": "551:6:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1450,18 +1450,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1251,
+                          "id": 10730,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1229,
-                          "src": "561:2:5",
+                          "referencedDeclaration": 10708,
+                          "src": "561:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "551:12:5",
+                        "src": "551:12:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1475,18 +1475,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1247,
+                      "id": 10726,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "544:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "544:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1253,
+                    "id": 10732,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1494,39 +1494,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "544:20:5",
+                    "src": "544:20:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1254,
+                  "id": 10733,
                   "nodeType": "ExpressionStatement",
-                  "src": "544:20:5"
+                  "src": "544:20:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1255,
+                    "id": 10734,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1232,
-                    "src": "577:1:5",
+                    "referencedDeclaration": 10711,
+                    "src": "577:1:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1233,
-                  "id": 1256,
+                  "functionReturnParameters": 10712,
+                  "id": 10735,
                   "nodeType": "Return",
-                  "src": "570:8:5"
+                  "src": "570:8:15"
                 }
               ]
             },
             "documentation": "@dev Multiplies two numbers, throws on overflow.",
-            "id": 1258,
+            "id": 10737,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1534,16 +1534,16 @@
             "name": "mul",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1230,
+              "id": 10709,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1227,
+                  "id": 10706,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "216:10:5",
+                  "scope": 10737,
+                  "src": "216:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1551,10 +1551,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1226,
+                    "id": 10705,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "216:7:5",
+                    "src": "216:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1565,11 +1565,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1229,
+                  "id": 10708,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "228:10:5",
+                  "scope": 10737,
+                  "src": "228:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1577,10 +1577,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1228,
+                    "id": 10707,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "228:7:5",
+                    "src": "228:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1590,20 +1590,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "215:24:5"
+              "src": "215:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1233,
+              "id": 10712,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1232,
+                  "id": 10711,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1258,
-                  "src": "263:9:5",
+                  "scope": 10737,
+                  "src": "263:9:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1611,10 +1611,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1231,
+                    "id": 10710,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "263:7:5",
+                    "src": "263:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1624,19 +1624,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "262:11:5"
+              "src": "262:11:15"
             },
-            "scope": 1317,
-            "src": "203:380:5",
+            "scope": 10796,
+            "src": "203:380:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1271,
+              "id": 10750,
               "nodeType": "Block",
-              "src": "734:214:5",
+              "src": "734:214:15",
               "statements": [
                 {
                   "expression": {
@@ -1645,19 +1645,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1269,
+                    "id": 10748,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1267,
+                      "id": 10746,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1260,
-                      "src": "936:2:5",
+                      "referencedDeclaration": 10739,
+                      "src": "936:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1667,32 +1667,32 @@
                     "operator": "/",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1268,
+                      "id": 10747,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1262,
-                      "src": "941:2:5",
+                      "referencedDeclaration": 10741,
+                      "src": "941:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "936:7:5",
+                    "src": "936:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1266,
-                  "id": 1270,
+                  "functionReturnParameters": 10745,
+                  "id": 10749,
                   "nodeType": "Return",
-                  "src": "929:14:5"
+                  "src": "929:14:15"
                 }
               ]
             },
             "documentation": "@dev Integer division of two numbers, truncating the quotient.",
-            "id": 1272,
+            "id": 10751,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1700,16 +1700,16 @@
             "name": "div",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1263,
+              "id": 10742,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1260,
+                  "id": 10739,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "678:10:5",
+                  "scope": 10751,
+                  "src": "678:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1717,10 +1717,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1259,
+                    "id": 10738,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "678:7:5",
+                    "src": "678:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1731,11 +1731,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1262,
+                  "id": 10741,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "690:10:5",
+                  "scope": 10751,
+                  "src": "690:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1743,10 +1743,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1261,
+                    "id": 10740,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "690:7:5",
+                    "src": "690:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1756,20 +1756,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "677:24:5"
+              "src": "677:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1266,
+              "id": 10745,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1265,
+                  "id": 10744,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1272,
-                  "src": "725:7:5",
+                  "scope": 10751,
+                  "src": "725:7:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1777,10 +1777,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1264,
+                    "id": 10743,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "725:7:5",
+                    "src": "725:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1790,19 +1790,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "724:9:5"
+              "src": "724:9:15"
             },
-            "scope": 1317,
-            "src": "665:283:5",
+            "scope": 10796,
+            "src": "665:283:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1291,
+              "id": 10770,
               "nodeType": "Block",
-              "src": "1129:47:5",
+              "src": "1129:47:15",
               "statements": [
                 {
                   "expression": {
@@ -1814,19 +1814,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1284,
+                        "id": 10763,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1282,
+                          "id": 10761,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1276,
-                          "src": "1142:2:5",
+                          "referencedDeclaration": 10755,
+                          "src": "1142:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1836,18 +1836,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1283,
+                          "id": 10762,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1274,
-                          "src": "1148:2:5",
+                          "referencedDeclaration": 10753,
+                          "src": "1148:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1142:8:5",
+                        "src": "1142:8:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1861,18 +1861,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1281,
+                      "id": 10760,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "1135:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "1135:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1285,
+                    "id": 10764,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1880,15 +1880,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1135:16:5",
+                    "src": "1135:16:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1286,
+                  "id": 10765,
                   "nodeType": "ExpressionStatement",
-                  "src": "1135:16:5"
+                  "src": "1135:16:15"
                 },
                 {
                   "expression": {
@@ -1897,19 +1897,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 1289,
+                    "id": 10768,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 1287,
+                      "id": 10766,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1274,
-                      "src": "1164:2:5",
+                      "referencedDeclaration": 10753,
+                      "src": "1164:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1919,32 +1919,32 @@
                     "operator": "-",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 1288,
+                      "id": 10767,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1276,
-                      "src": "1169:2:5",
+                      "referencedDeclaration": 10755,
+                      "src": "1169:2:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1164:7:5",
+                    "src": "1164:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1280,
-                  "id": 1290,
+                  "functionReturnParameters": 10759,
+                  "id": 10769,
                   "nodeType": "Return",
-                  "src": "1157:14:5"
+                  "src": "1157:14:15"
                 }
               ]
             },
             "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).",
-            "id": 1292,
+            "id": 10771,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1952,16 +1952,16 @@
             "name": "sub",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1277,
+              "id": 10756,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1274,
+                  "id": 10753,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1073:10:5",
+                  "scope": 10771,
+                  "src": "1073:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1969,10 +1969,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1273,
+                    "id": 10752,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1073:7:5",
+                    "src": "1073:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1983,11 +1983,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1276,
+                  "id": 10755,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1085:10:5",
+                  "scope": 10771,
+                  "src": "1085:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1995,10 +1995,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1275,
+                    "id": 10754,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1085:7:5",
+                    "src": "1085:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2008,20 +2008,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1072:24:5"
+              "src": "1072:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1280,
+              "id": 10759,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1279,
+                  "id": 10758,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1292,
-                  "src": "1120:7:5",
+                  "scope": 10771,
+                  "src": "1120:7:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2029,10 +2029,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1278,
+                    "id": 10757,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1120:7:5",
+                    "src": "1120:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2042,36 +2042,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1119:9:5"
+              "src": "1119:9:15"
             },
-            "scope": 1317,
-            "src": "1060:116:5",
+            "scope": 10796,
+            "src": "1060:116:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 1315,
+              "id": 10794,
               "nodeType": "Block",
-              "src": "1309:57:5",
+              "src": "1309:57:15",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1305,
+                    "id": 10784,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1301,
+                      "id": 10780,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1299,
-                      "src": "1315:1:5",
+                      "referencedDeclaration": 10778,
+                      "src": "1315:1:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2085,19 +2085,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 1304,
+                      "id": 10783,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 1302,
+                        "id": 10781,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1294,
-                        "src": "1319:2:5",
+                        "referencedDeclaration": 10773,
+                        "src": "1319:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2107,32 +2107,32 @@
                       "operator": "+",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 1303,
+                        "id": 10782,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1296,
-                        "src": "1324:2:5",
+                        "referencedDeclaration": 10775,
+                        "src": "1324:2:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "1319:7:5",
+                      "src": "1319:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1315:11:5",
+                    "src": "1315:11:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 1306,
+                  "id": 10785,
                   "nodeType": "ExpressionStatement",
-                  "src": "1315:11:5"
+                  "src": "1315:11:15"
                 },
                 {
                   "expression": {
@@ -2144,19 +2144,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 1310,
+                        "id": 10789,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 1308,
+                          "id": 10787,
                           "name": "c",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1299,
-                          "src": "1339:1:5",
+                          "referencedDeclaration": 10778,
+                          "src": "1339:1:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2166,18 +2166,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 1309,
+                          "id": 10788,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1294,
-                          "src": "1344:2:5",
+                          "referencedDeclaration": 10773,
+                          "src": "1344:2:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1339:7:5",
+                        "src": "1339:7:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2191,18 +2191,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1307,
+                      "id": 10786,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1407,
-                      "src": "1332:6:5",
+                      "referencedDeclaration": 11304,
+                      "src": "1332:6:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1311,
+                    "id": 10790,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2210,39 +2210,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1332:15:5",
+                    "src": "1332:15:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1312,
+                  "id": 10791,
                   "nodeType": "ExpressionStatement",
-                  "src": "1332:15:5"
+                  "src": "1332:15:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1313,
+                    "id": 10792,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 1299,
-                    "src": "1360:1:5",
+                    "referencedDeclaration": 10778,
+                    "src": "1360:1:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 1300,
-                  "id": 1314,
+                  "functionReturnParameters": 10779,
+                  "id": 10793,
                   "nodeType": "Return",
-                  "src": "1353:8:5"
+                  "src": "1353:8:15"
                 }
               ]
             },
             "documentation": "@dev Adds two numbers, throws on overflow.",
-            "id": 1316,
+            "id": 10795,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2250,16 +2250,16 @@
             "name": "add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1297,
+              "id": 10776,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1294,
+                  "id": 10773,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1251:10:5",
+                  "scope": 10795,
+                  "src": "1251:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2267,10 +2267,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1293,
+                    "id": 10772,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1251:7:5",
+                    "src": "1251:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2281,11 +2281,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1296,
+                  "id": 10775,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1263:10:5",
+                  "scope": 10795,
+                  "src": "1263:10:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2293,10 +2293,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1295,
+                    "id": 10774,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1263:7:5",
+                    "src": "1263:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2306,20 +2306,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1250:24:5"
+              "src": "1250:24:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1300,
+              "id": 10779,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1299,
+                  "id": 10778,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1316,
-                  "src": "1298:9:5",
+                  "scope": 10795,
+                  "src": "1298:9:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2327,10 +2327,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 1298,
+                    "id": 10777,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1298:7:5",
+                    "src": "1298:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2340,20 +2340,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1297:11:5"
+              "src": "1297:11:15"
             },
-            "scope": 1317,
-            "src": "1238:128:5",
+            "scope": 10796,
+            "src": "1238:128:15",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 1318,
-        "src": "117:1251:5"
+        "scope": 10797,
+        "src": "117:1251:15"
       }
     ],
-    "src": "0:1369:5"
+    "src": "0:1369:15"
   },
   "compiler": {
     "name": "solc",
@@ -2361,5 +2361,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:23:22.497Z"
+  "updatedAt": "2019-01-10T13:57:39.953Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
index 6f6211243..cdd8b296b 100644
--- a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
+++ b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
@@ -493,24 +493,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405260006003556000600455600060055534801561001f57600080fd5b50604051604080610eea8339810160405280516020909101516000805460018054600160a060020a03909516600160a060020a0319958616179055831633908117909316909217909155600755610e6f8061007b6000396000f3006080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058203cff4e898fe0b069055c08319c3c3d2db6e51a57270c6d550f468526830d13e20029",
-  "deployedBytecode": "0x6080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058203cff4e898fe0b069055c08319c3c3d2db6e51a57270c6d550f468526830d13e20029",
-  "sourceMap": "157:5196:12:-;;;585:1;550:36;;621:1;593:29;;664:1;629:36;;754:170;8:9:-1;5:2;;;30:1;27;20:12;5:2;754:170:12;;;;;;;;;;;;;;;;;;;567:5:18;:18;;;822:29:12;;-1:-1:-1;;;;;822:29:12;;;-1:-1:-1;;;;;;822:29:12;;;;;;567:18:18;;575:10;567:18;;;861::12;;;;;;;;;889:12;:28;157:5196;;;;;;",
-  "deployedSourceMap": "157:5196:12:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4061:144;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4061:144:12;;;;;;2183:88;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2183:88:12;;;;;3721:93;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3721:93:12;;;;;;;;;;;;;;;;;;;;502:41;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;502:41:12;-1:-1:-1;;;;;502:41:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5113:237;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5113:237:12;;;;3967:88;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3967:88:12;;;;2643:956;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2643:956:12;-1:-1:-1;;;;;2643:956:12;;;;;;;;;3820:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3820:141:12;;;;;1001:111:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:18;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:18;;;;;;;;-1:-1:-1;;;;;238:20:18;;;;;;;;;;;;;;1489:172:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1489:172:12;-1:-1:-1;;;;;1489:172:12;;;;;;;672:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;672:48:12;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;672:48:12;;;;;;;;;;;;;;1667:311;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1667:311:12;-1:-1:-1;;;;;1667:311:12;;;;;3605:110;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3605:110:12;;;;;550:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;550:36:12;;;;629;;8:9:-1;5:2;;;30:1;27;20:12;5:2;629:36:12;;;;593:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;593:29:12;;;;2277:360;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2277:360:12;;;-1:-1:-1;;;;;2277:360:12;;;;;1984:193;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1984:193:12;-1:-1:-1;;;;;1984:193:12;;;;;1274:103:18;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:18;-1:-1:-1;;;;;1274:103:18;;;;;4061:144:12;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;4126:5:12;;;4141;;4148:17;;4126:40;;;;;;-1:-1:-1;;;;;4141:5:12;;;4126:40;;;;;;;;;;;;:5;;;;;:14;;:40;;;;;;;;;;;;;;;;;;;:5;:40;;;5:2:-1;;;;30:1;27;20:12;5:2;4126:40:12;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4126:40:12;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4126:40:12;4118:49;;;;;;;;4197:1;4177:17;:21;4061:144::o;2183:88::-;2231:33;2245:6;2253:10;2231:13;:33::i;:::-;2183:88;:::o;3721:93::-;3795:12;;3721:93;:::o;502:41::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;5113:237::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;5164:5:12;;;5179;;5186:30;;;;;;5210:4;5186:30;;;;;;-1:-1:-1;;;;;5164:5:12;;;;:14;;5179:5;;;5164;;5186:15;;:30;;;;;;;;;;;;;;;;5164:5;5186:30;;;5:2:-1;;;;30:1;27;20:12;5:2;5186:30:12;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5186:30:12;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5186:30:12;5164:53;;;;;;;;;;-1:-1:-1;;;;;5164:53:12;;;;;;;;;;;;;;;;;;;;5186:30;;5164:53;;;;;;;-1:-1:-1;5164:53:12;;;;5:2:-1;;;;30:1;27;20:12;5:2;5164:53:12;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5164:53:12;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5164:53:12;5156:62;;;;;;;;5233:24;;;5241:15;5233:24;;;;;;;;;;;;;5337:5;;-1:-1:-1;;;;;5337:5:12;5324:19;3967:88;4038:10;;3967:88;:::o;2643:956::-;2784:10;2865:14;2776:19;;;:7;:19;;;;;:26;;;;;2775:27;2767:36;;;;;;2829:10;2852:1;2821:19;;;:7;:19;;;;;:28;:32;2813:41;;;;;;-1:-1:-1;2882:33:12;;;;-1:-1:-1;;;;;2882:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2981:12:12;;;:4;2882:33;2981:12;;;;;:17;;;;;2980:18;2972:27;;;;;;3014:12;;;;:4;:12;;;;;:21;:26;3010:583;;;3094:30;3105:10;3117:6;3094:10;:30::i;:::-;3086:39;;;;;;;;3139:12;;;;:4;:12;;;;;;;;;3163:15;3139:39;;;3192:19;;;;:32;;-1:-1:-1;;3192:32:12;3214:10;3192:32;;;;;3243:49;;;;;;;3268:6;;3257:9;;-1:-1:-1;;;;;3243:49:12;;;;;;;;;;;;;3010:583;;;3331:12;;;;:4;:12;;;;;:19;;;;;;-1:-1:-1;;;;;3331:19:12;3354:10;3331:33;3323:42;;;;;;3411:12;;3387;;;;:4;:12;;;;;:21;3427:15;3387:36;;:55;;3379:64;;;;;;3465:5;;:27;;;;;;-1:-1:-1;;;;;3465:27:12;;;;;;;;;;;;;;;:5;;;;;:14;;:27;;;;;;;;;;;;;;:5;;:27;;;5:2:-1;;;;30:1;27;20:12;5:2;3465:27:12;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3465:27:12;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3465:27:12;3457:36;;;;;;;;3507:12;;;;:4;:12;;;;;;3527:4;3507:17;;;:24;;-1:-1:-1;;3507:24:12;;;;;;3550:32;3575:6;;3564:9;;-1:-1:-1;;;;;3550:32:12;;;;;;3010:583;2643:956;;;;:::o;3820:141::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;3891:10:12;:24;;;3925:29;;3904:11;;3925:29;;;;;3820:141;:::o;1001:111:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:18;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:18;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:18;;:::o;1489:172:12:-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1576:16:12;;;;;;:7;:16;;;;;;:34;;;1625:29;1604:6;;1576:16;1625:29;;;1489:172;;:::o;672:48::-;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;672:48:12;;:::o;1667:311::-;1773:10;1796:1;1765:19;;;:7;:19;;;;;:28;:32;1757:41;;;;;;-1:-1:-1;;;;;1864:16:12;;1892:1;1864:16;;;:7;:16;;;;;:25;:29;1856:38;;;;;;-1:-1:-1;;;;;1904:16:12;;;;;;:7;:16;;;;;;:23;;:30;;-1:-1:-1;;1904:30:12;1930:4;1904:30;;;1949:22;;;1904:16;1949:22;1667:311;:::o;3605:110::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;3680:12:12;:28;3605:110::o;550:36::-;;;;:::o;629:::-;;;;:::o;593:29::-;;;;:::o;2277:360::-;2367:10;;2358:19;;2350:28;;;;;;2396:5;;:44;;;;;;2415:10;2396:44;;;;2427:4;2396:44;;;;;;;;;;;;-1:-1:-1;;;;;2396:5:12;;;;:18;;:44;;;;;;;;;;;;;;;:5;;:44;;;5:2:-1;;;;30:1;27;20:12;5:2;2396:44:12;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2396:44:12;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2396:44:12;2388:53;;;;;;;;2471:17;;;2491:1;2471:21;2451:41;;2544:10;;2522:17;;:33;;;:21;:33;:::i;:::-;2502:17;:53;2618:10;;2607:22;;:6;;:22;:10;:22;:::i;:::-;2587:17;;2570:60;;-1:-1:-1;;;;;2570:60:12;;;;;;;;2277:360;;:::o;1984:193::-;719:5:18;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;2060:16:12;;2088:1;2060:16;;;:7;:16;;;;;:25;:29;2052:38;;;;;;-1:-1:-1;;;;;2100:16:12;;2126:5;2100:16;;;:7;:16;;;;;;:23;;:31;;-1:-1:-1;;2100:31:12;;;2146:24;;;2126:5;2146:24;1984:193;:::o;1274:103:18:-;719:5;;-1:-1:-1;;;;;719:5:18;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;4211:732:12:-;-1:-1:-1;;;;;4387:16:12;;4282:4;4387:16;;;:7;:16;;;;;:24;;;4377:7;:5;:7::i;:::-;:34;4373:144;;;-1:-1:-1;;;;;4427:16:12;;4457:1;4427:16;;;:7;:16;;;;;;;:27;:31;4499:7;:5;:7::i;:::-;-1:-1:-1;;;;;4472:16:12;;;;;;:7;:16;;;;;:24;;:34;4373:144;-1:-1:-1;;;;;4722:16:12;;;;;;:7;:16;;;;;;;;:27;;4682:36;;;:67;;;;:144;;-1:-1:-1;;;;;;4801:16:12;;;;;;:7;:16;;;;;;;;:25;;4761:27;;;:36;;:65;;4682:144;4678:237;;;-1:-1:-1;;;;;;4842:16:12;;;;;;:7;:16;;;;;;;;:27;:37;;;;;;-1:-1:-1;4893:11:12;;4678:237;-1:-1:-1;4931:5:12;4211:732;;;;;:::o;1238:128:17:-;1319:7;;;1339;;;;1332:15;;;1060:116;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:17;;;1060:116::o;1512:171:18:-;-1:-1:-1;;;;;1582:23:18;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:18;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:18;-1:-1:-1;;;;;1661:17:18;;;;;;;;;;1512:171::o;4949:158:12:-;5094:6;5076:15;:24;;4949:158::o",
-  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/token/ERC20/StandardToken.sol\";\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract SimpleGatekeeperWithLimit is Ownable {\n\n    using SafeMath for uint256;\n\n    StandardToken token;\n\n    struct Keeper {\n        uint256 dayLimit;\n        uint256 lastDay;\n        uint256 spentToday;\n        bool frozen;\n    }\n\n    struct TransactionState {\n        uint256 commitTS;\n        bool paid;\n        address keeper;\n    }\n\n    mapping(address => Keeper) public keepers;\n\n    uint256 public transactionAmount = 0;\n\n    uint256 public commission = 0;\n\n    uint256 public commissionBalance = 0;\n\n    mapping(bytes32 => TransactionState) public paid;\n\n    uint256 freezingTime;\n\n    constructor(address _token, uint256 _freezingTime) public {\n        token = StandardToken(_token);\n        owner = msg.sender;\n        freezingTime = _freezingTime;\n    }\n\n    event PayinTx(address indexed from, uint256 indexed txNumber, uint256 indexed value);\n    event CommitTx(address indexed from, uint256 indexed txNumber, uint256 indexed value, uint commitTimestamp);\n    event PayoutTx(address indexed from, uint256 indexed txNumber, uint256 indexed value);\n    event Suicide(uint block);\n\n    event LimitChanged(address indexed keeper, uint256 indexed dayLimit);\n    event KeeperFreezed(address indexed keeper);\n    event KeeperUnfreezed(address indexed keeper);\n\n    event CommissionChanged(uint256 indexed commission);\n\n    function ChangeKeeperLimit(address _keeper, uint256 _limit) public onlyOwner {\n        keepers[_keeper].dayLimit = _limit;\n        emit LimitChanged(_keeper, _limit);\n    }\n\n    function FreezeKeeper(address _keeper) public {\n        // check access of sender\n        require(keepers[msg.sender].dayLimit > 0);\n        // check that freezing keeper has limit\n        require(keepers[_keeper].dayLimit > 0);\n        keepers[_keeper].frozen = true;\n        emit KeeperFreezed(_keeper);\n    }\n\n    function UnfreezeKeeper(address _keeper) public onlyOwner {\n        require(keepers[_keeper].dayLimit > 0);\n        keepers[_keeper].frozen = false;\n        emit KeeperUnfreezed(_keeper);\n    }\n\n    function Payin(uint256 _value) public {\n        PayinTargeted(_value, msg.sender);\n    }\n\n    function PayinTargeted(uint256 _value, address _target) public {\n        require(_value > commission);\n        require(token.transferFrom(msg.sender, this, _value));\n        transactionAmount = transactionAmount + 1;\n        commissionBalance = commissionBalance.add(commission);\n        emit PayinTx(_target, transactionAmount,  _value.sub(commission));\n    }\n\n    function Payout(address _to, uint256 _value, uint256 _txNumber) public {\n        // check that keeper is not frozen\n        require(!keepers[msg.sender].frozen);\n        require(keepers[msg.sender].dayLimit > 0);\n\n        bytes32 txHash = keccak256(_to, _txNumber, _value);\n\n        // check that transaction is not paid\n        require(!paid[txHash].paid);\n\n        if (paid[txHash].commitTS == 0) {\n            // check daylimit\n            require(underLimit(msg.sender, _value));\n            paid[txHash].commitTS = block.timestamp;\n            paid[txHash].keeper = msg.sender;\n            emit CommitTx(_to, _txNumber, _value, block.timestamp);\n        } else {\n            require(paid[txHash].keeper == msg.sender);\n            require(paid[txHash].commitTS + freezingTime <= block.timestamp);\n            require(token.transfer(_to, _value));\n            paid[txHash].paid = true;\n            emit PayoutTx(_to, _txNumber, _value);\n        }\n    }\n\n    function SetFreezingTime(uint256 _freezingTime) public onlyOwner {\n        freezingTime = _freezingTime;\n    }\n\n    function GetFreezingTime() public view returns (uint256) {\n        return freezingTime;\n    }\n\n    function SetCommission(uint256 _commission) public onlyOwner {\n        commission = _commission;\n        CommissionChanged(commission);\n    }\n\n    function GetCommission() public view returns (uint256){\n        return commission;\n    }\n\n    function TransferCommission() public onlyOwner {\n        require(token.transfer(owner, commissionBalance));\n        commissionBalance = 0;\n    }\n\n    function underLimit(address _keeper, uint256 _value) internal returns (bool) {\n        // reset the spend limit if we're on a different day to last time.\n        if (today() > keepers[_keeper].lastDay) {\n            keepers[_keeper].spentToday = 0;\n            keepers[_keeper].lastDay = today();\n        }\n        // check to see if there's enough left - if so, subtract and return true.\n        // overflow protection                    // dailyLimit check\n        if (keepers[_keeper].spentToday + _value >= keepers[_keeper].spentToday &&\n        keepers[_keeper].spentToday + _value <= keepers[_keeper].dayLimit) {\n            keepers[_keeper].spentToday += _value;\n            return true;\n        }\n        return false;\n    }\n\n    function today() private view returns (uint256) {\n        // solium-disable-next-line security/no-block-members\n        return block.timestamp / 1 days;\n    }\n\n    function kill() public onlyOwner {\n        require(token.transfer(owner, token.balanceOf(address(this))));\n        emit Suicide(block.timestamp);\n        // solium-disable-line security/no-block-members\n        selfdestruct(owner);\n    }\n\n}\n",
+  "bytecode": "0x608060405260006003556000600455600060055534801561001f57600080fd5b50604051604080610eea8339810160405280516020909101516000805460018054600160a060020a03909516600160a060020a0319958616179055831633908117909316909217909155600755610e6f8061007b6000396000f3006080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058206440d33055cd2aea92a820944e0e59d41008475e74ef3e486562beb0827bf4d10029",
+  "deployedBytecode": "0x6080604052600436106101115763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306d8e8b1811461011657806328f727f01461012d57806336ab802e146101455780633bbd64bc1461016c57806341c0e1b5146101b557806358712633146101ca578063634235fc146101df5780636ea5803114610206578063715018a61461021e5780638da5cb5b14610233578063ad835c0b14610264578063add89bb214610288578063b38ad8e7146102c7578063cc38d7ca146102e8578063d942bffa14610300578063dcf1a9ef14610315578063e14891911461032a578063e3fcd18e1461033f578063e5837a7b14610363578063f2fde38b14610384575b600080fd5b34801561012257600080fd5b5061012b6103a5565b005b34801561013957600080fd5b5061012b600435610473565b34801561015157600080fd5b5061015a610480565b60408051918252519081900360200190f35b34801561017857600080fd5b5061018d600160a060020a0360043516610486565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b3480156101c157600080fd5b5061012b6104b2565b3480156101d657600080fd5b5061015a610647565b3480156101eb57600080fd5b5061012b600160a060020a036004351660243560443561064d565b34801561021257600080fd5b5061012b6004356108d5565b34801561022a57600080fd5b5061012b61091f565b34801561023f57600080fd5b5061024861098b565b60408051600160a060020a039092168252519081900360200190f35b34801561027057600080fd5b5061012b600160a060020a036004351660243561099a565b34801561029457600080fd5b506102a06004356109f8565b604080519384529115156020840152600160a060020a031682820152519081900360600190f35b3480156102d357600080fd5b5061012b600160a060020a0360043516610a24565b3480156102f457600080fd5b5061012b600435610ab0565b34801561030c57600080fd5b5061015a610acc565b34801561032157600080fd5b5061015a610ad2565b34801561033657600080fd5b5061015a610ad8565b34801561034b57600080fd5b5061012b600435600160a060020a0360243516610ade565b34801561036f57600080fd5b5061012b600160a060020a0360043516610c06565b34801561039057600080fd5b5061012b600160a060020a0360043516610c8c565b600054600160a060020a031633146103bc57600080fd5b60015460008054600554604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a039384166004820152602481019290925251919093169263a9059cbb9260448083019360209390929083900390910190829087803b15801561043557600080fd5b505af1158015610449573d6000803e3d6000fd5b505050506040513d602081101561045f57600080fd5b5051151561046c57600080fd5b6000600555565b61047d8133610ade565b50565b60075490565b600260208190526000918252604090912080546001820154928201546003909201549092919060ff1684565b600054600160a060020a031633146104c957600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561053d57600080fd5b505af1158015610551573d6000803e3d6000fd5b505050506040513d602081101561056757600080fd5b5051604080517c010000000000000000000000000000000000000000000000000000000063ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b1580156105cf57600080fd5b505af11580156105e3573d6000803e3d6000fd5b505050506040513d60208110156105f957600080fd5b5051151561060657600080fd5b6040805142815290517fa1ea9b09ea114021983e9ecf71cf2ffddfd80f5cb4f925e5bf24f9bdb5e55fde9181900360200190a1600054600160a060020a0316ff5b60045490565b3360009081526002602052604081206003015460ff161561066d57600080fd5b336000908152600260205260408120541161068757600080fd5b50604080516c01000000000000000000000000600160a060020a0386160281526014810183905260348101849052815190819003605401902060008181526006602052919091206001015460ff16156106df57600080fd5b600081815260066020526040902054151561078b576106fe3384610cac565b151561070957600080fd5b600081815260066020908152604091829020428082556001909101805474ffffffffffffffffffffffffffffffffffffffff00191633610100021790558251908152915185928592600160a060020a038916927f65546c3bc3a77ffc91667da85018004299542e28a511328cfb4b3f86974902ee9281900390910190a46108cf565b6000818152600660205260409020600101546101009004600160a060020a031633146107b657600080fd5b60075460008281526006602052604090205442910111156107d657600080fd5b600154604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a038781166004830152602482018790529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561084557600080fd5b505af1158015610859573d6000803e3d6000fd5b505050506040513d602081101561086f57600080fd5b5051151561087c57600080fd5b6000818152600660205260408082206001908101805460ff191690911790555184918491600160a060020a038816917f731af16374848c2c73a6154fd410cb421138e7db45c5a904e5a475c756faa8d991a45b50505050565b600054600160a060020a031633146108ec57600080fd5b600481905560405181907f839e4456845dbc05c7d8638cf0b0976161331b5f9163980d71d9a6444a326c6190600090a250565b600054600160a060020a0316331461093657600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a031633146109b157600080fd5b600160a060020a038216600081815260026020526040808220849055518392917fef9c668177207fb68ca5e3894a1efacebb659762b27a737fde58ceebc4f30ad391a35050565b6006602052600090815260409020805460019091015460ff8116906101009004600160a060020a031683565b3360009081526002602052604081205411610a3e57600080fd5b600160a060020a03811660009081526002602052604081205411610a6157600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19166001179055517fdf4868d2f39f6ab9f41b92c6917da5aec882c461ce7316bb62076865108502bd9190a250565b600054600160a060020a03163314610ac757600080fd5b600755565b60035481565b60055481565b60045481565b6004548211610aec57600080fd5b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015610b5f57600080fd5b505af1158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b50511515610b9657600080fd5b600380546001019055600454600554610bb49163ffffffff610d9e16565b600555600454610bcb90839063ffffffff610dab16565b600354604051600160a060020a038416907f14312725abbc46ad798bc078b2663e1fcbace97be0247cd177176f3b4df2538e90600090a45050565b600054600160a060020a03163314610c1d57600080fd5b600160a060020a03811660009081526002602052604081205411610c4057600080fd5b600160a060020a038116600081815260026020526040808220600301805460ff19169055517fbbe17a7427b5192903e1b3f0f2b6ef8b2a1af9b33e1079faf8f8383f2fb63b539190a250565b600054600160a060020a03163314610ca357600080fd5b61047d81610dbd565b600160a060020a038216600090815260026020526040812060010154610cd0610e3a565b1115610d1757600160a060020a038316600090815260026020819052604082200155610cfa610e3a565b600160a060020a0384166000908152600260205260409020600101555b600160a060020a0383166000908152600260208190526040909120015482810110801590610d655750600160a060020a03831660009081526002602081905260409091208054910154830111155b15610d945750600160a060020a0382166000908152600260208190526040909120018054820190556001610d98565b5060005b92915050565b81810182811015610d9857fe5b600082821115610db757fe5b50900390565b600160a060020a0381161515610dd257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b620151804204905600a165627a7a723058206440d33055cd2aea92a820944e0e59d41008475e74ef3e486562beb0827bf4d10029",
+  "sourceMap": "157:5197:13:-;;;585:1;550:36;;621:1;593:29;;664:1;629:36;;754:170;8:9:-1;5:2;;;30:1;27;20:12;5:2;754:170:13;;;;;;;;;;;;;;;;;;;567:5:16;:18;;;822:29:13;;-1:-1:-1;;;;;822:29:13;;;-1:-1:-1;;;;;;822:29:13;;;;;;567:18:16;;575:10;567:18;;;861::13;;;;;;;;;889:12;:28;157:5197;;;;;;",
+  "deployedSourceMap": "157:5197:13:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4062:144;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4062:144:13;;;;;;2183:88;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2183:88:13;;;;;3721:93;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3721:93:13;;;;;;;;;;;;;;;;;;;;502:41;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;502:41:13;-1:-1:-1;;;;;502:41:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5114:237;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5114:237:13;;;;3967:89;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3967:89:13;;;;2643:956;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2643:956:13;-1:-1:-1;;;;;2643:956:13;;;;;;;;;3820:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3820:141:13;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;1489:172:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1489:172:13;-1:-1:-1;;;;;1489:172:13;;;;;;;672:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;672:48:13;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;672:48:13;;;;;;;;;;;;;;1667:311;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1667:311:13;-1:-1:-1;;;;;1667:311:13;;;;;3605:110;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3605:110:13;;;;;550:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;550:36:13;;;;629;;8:9:-1;5:2;;;30:1;27;20:12;5:2;629:36:13;;;;593:29;;8:9:-1;5:2;;;30:1;27;20:12;5:2;593:29:13;;;;2277:360;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2277:360:13;;;-1:-1:-1;;;;;2277:360:13;;;;;1984:193;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1984:193:13;-1:-1:-1;;;;;1984:193:13;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;4062:144:13;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;4127:5:13;;;4142;;4149:17;;4127:40;;;;;;-1:-1:-1;;;;;4142:5:13;;;4127:40;;;;;;;;;;;;:5;;;;;:14;;:40;;;;;;;;;;;;;;;;;;;:5;:40;;;5:2:-1;;;;30:1;27;20:12;5:2;4127:40:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4127:40:13;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4127:40:13;4119:49;;;;;;;;4198:1;4178:17;:21;4062:144::o;2183:88::-;2231:33;2245:6;2253:10;2231:13;:33::i;:::-;2183:88;:::o;3721:93::-;3795:12;;3721:93;:::o;502:41::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;5114:237::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;5165:5:13;;;5180;;5187:30;;;;;;5211:4;5187:30;;;;;;-1:-1:-1;;;;;5165:5:13;;;;:14;;5180:5;;;5165;;5187:15;;:30;;;;;;;;;;;;;;;;5165:5;5187:30;;;5:2:-1;;;;30:1;27;20:12;5:2;5187:30:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5187:30:13;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5187:30:13;5165:53;;;;;;;;;;-1:-1:-1;;;;;5165:53:13;;;;;;;;;;;;;;;;;;;;5187:30;;5165:53;;;;;;;-1:-1:-1;5165:53:13;;;;5:2:-1;;;;30:1;27;20:12;5:2;5165:53:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5165:53:13;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5165:53:13;5157:62;;;;;;;;5234:24;;;5242:15;5234:24;;;;;;;;;;;;;5338:5;;-1:-1:-1;;;;;5338:5:13;5325:19;3967:89;4039:10;;3967:89;:::o;2643:956::-;2784:10;2865:14;2776:19;;;:7;:19;;;;;:26;;;;;2775:27;2767:36;;;;;;2829:10;2852:1;2821:19;;;:7;:19;;;;;:28;:32;2813:41;;;;;;-1:-1:-1;2882:33:13;;;;-1:-1:-1;;;;;2882:33:13;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2981:12:13;;;:4;2882:33;2981:12;;;;;:17;;;;;2980:18;2972:27;;;;;;3014:12;;;;:4;:12;;;;;:21;:26;3010:583;;;3094:30;3105:10;3117:6;3094:10;:30::i;:::-;3086:39;;;;;;;;3139:12;;;;:4;:12;;;;;;;;;3163:15;3139:39;;;3192:19;;;;:32;;-1:-1:-1;;3192:32:13;3214:10;3192:32;;;;;3243:49;;;;;;;3268:6;;3257:9;;-1:-1:-1;;;;;3243:49:13;;;;;;;;;;;;;3010:583;;;3331:12;;;;:4;:12;;;;;:19;;;;;;-1:-1:-1;;;;;3331:19:13;3354:10;3331:33;3323:42;;;;;;3411:12;;3387;;;;:4;:12;;;;;:21;3427:15;3387:36;;:55;;3379:64;;;;;;3465:5;;:27;;;;;;-1:-1:-1;;;;;3465:27:13;;;;;;;;;;;;;;;:5;;;;;:14;;:27;;;;;;;;;;;;;;:5;;:27;;;5:2:-1;;;;30:1;27;20:12;5:2;3465:27:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3465:27:13;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3465:27:13;3457:36;;;;;;;;3507:12;;;;:4;:12;;;;;;3527:4;3507:17;;;:24;;-1:-1:-1;;3507:24:13;;;;;;3550:32;3575:6;;3564:9;;-1:-1:-1;;;;;3550:32:13;;;;;;3010:583;2643:956;;;;:::o;3820:141::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;3891:10:13;:24;;;3925:29;;3904:11;;3925:29;;;;;3820:141;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;1489:172:13:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1576:16:13;;;;;;:7;:16;;;;;;:34;;;1625:29;1604:6;;1576:16;1625:29;;;1489:172;;:::o;672:48::-;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;672:48:13;;:::o;1667:311::-;1773:10;1796:1;1765:19;;;:7;:19;;;;;:28;:32;1757:41;;;;;;-1:-1:-1;;;;;1864:16:13;;1892:1;1864:16;;;:7;:16;;;;;:25;:29;1856:38;;;;;;-1:-1:-1;;;;;1904:16:13;;;;;;:7;:16;;;;;;:23;;:30;;-1:-1:-1;;1904:30:13;1930:4;1904:30;;;1949:22;;;1904:16;1949:22;1667:311;:::o;3605:110::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;3680:12:13;:28;3605:110::o;550:36::-;;;;:::o;629:::-;;;;:::o;593:29::-;;;;:::o;2277:360::-;2367:10;;2358:19;;2350:28;;;;;;2396:5;;:44;;;;;;2415:10;2396:44;;;;2427:4;2396:44;;;;;;;;;;;;-1:-1:-1;;;;;2396:5:13;;;;:18;;:44;;;;;;;;;;;;;;;:5;;:44;;;5:2:-1;;;;30:1;27;20:12;5:2;2396:44:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2396:44:13;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2396:44:13;2388:53;;;;;;;;2471:17;;;2491:1;2471:21;2451:41;;2544:10;;2522:17;;:33;;;:21;:33;:::i;:::-;2502:17;:53;2618:10;;2607:22;;:6;;:22;:10;:22;:::i;:::-;2587:17;;2570:60;;-1:-1:-1;;;;;2570:60:13;;;;;;;;2277:360;;:::o;1984:193::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;2060:16:13;;2088:1;2060:16;;;:7;:16;;;;;:25;:29;2052:38;;;;;;-1:-1:-1;;;;;2100:16:13;;2126:5;2100:16;;;:7;:16;;;;;;:23;;:31;;-1:-1:-1;;2100:31:13;;;2146:24;;;2126:5;2146:24;1984:193;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;4212:732:13:-;-1:-1:-1;;;;;4388:16:13;;4283:4;4388:16;;;:7;:16;;;;;:24;;;4378:7;:5;:7::i;:::-;:34;4374:144;;;-1:-1:-1;;;;;4428:16:13;;4458:1;4428:16;;;:7;:16;;;;;;;:27;:31;4500:7;:5;:7::i;:::-;-1:-1:-1;;;;;4473:16:13;;;;;;:7;:16;;;;;:24;;:34;4374:144;-1:-1:-1;;;;;4723:16:13;;;;;;:7;:16;;;;;;;;:27;;4683:36;;;:67;;;;:144;;-1:-1:-1;;;;;;4802:16:13;;;;;;:7;:16;;;;;;;;:25;;4762:27;;;:36;;:65;;4683:144;4679:237;;;-1:-1:-1;;;;;;4843:16:13;;;;;;:7;:16;;;;;;;;:27;:37;;;;;;-1:-1:-1;4894:11:13;;4679:237;-1:-1:-1;4932:5:13;4212:732;;;;;:::o;1238:128:15:-;1319:7;;;1339;;;;1332:15;;;1060:116;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o;4950:158:13:-;5095:6;5077:15;:24;;4950:158::o",
+  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/token/ERC20/StandardToken.sol\";\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract SimpleGatekeeperWithLimit is Ownable {\n\n    using SafeMath for uint256;\n\n    StandardToken token;\n\n    struct Keeper {\n        uint256 dayLimit;\n        uint256 lastDay;\n        uint256 spentToday;\n        bool frozen;\n    }\n\n    struct TransactionState {\n        uint256 commitTS;\n        bool paid;\n        address keeper;\n    }\n\n    mapping(address => Keeper) public keepers;\n\n    uint256 public transactionAmount = 0;\n\n    uint256 public commission = 0;\n\n    uint256 public commissionBalance = 0;\n\n    mapping(bytes32 => TransactionState) public paid;\n\n    uint256 freezingTime;\n\n    constructor(address _token, uint256 _freezingTime) public {\n        token = StandardToken(_token);\n        owner = msg.sender;\n        freezingTime = _freezingTime;\n    }\n\n    event PayinTx(address indexed from, uint256 indexed txNumber, uint256 indexed value);\n    event CommitTx(address indexed from, uint256 indexed txNumber, uint256 indexed value, uint commitTimestamp);\n    event PayoutTx(address indexed from, uint256 indexed txNumber, uint256 indexed value);\n    event Suicide(uint block);\n\n    event LimitChanged(address indexed keeper, uint256 indexed dayLimit);\n    event KeeperFreezed(address indexed keeper);\n    event KeeperUnfreezed(address indexed keeper);\n\n    event CommissionChanged(uint256 indexed commission);\n\n    function ChangeKeeperLimit(address _keeper, uint256 _limit) public onlyOwner {\n        keepers[_keeper].dayLimit = _limit;\n        emit LimitChanged(_keeper, _limit);\n    }\n\n    function FreezeKeeper(address _keeper) public {\n        // check access of sender\n        require(keepers[msg.sender].dayLimit > 0);\n        // check that freezing keeper has limit\n        require(keepers[_keeper].dayLimit > 0);\n        keepers[_keeper].frozen = true;\n        emit KeeperFreezed(_keeper);\n    }\n\n    function UnfreezeKeeper(address _keeper) public onlyOwner {\n        require(keepers[_keeper].dayLimit > 0);\n        keepers[_keeper].frozen = false;\n        emit KeeperUnfreezed(_keeper);\n    }\n\n    function Payin(uint256 _value) public {\n        PayinTargeted(_value, msg.sender);\n    }\n\n    function PayinTargeted(uint256 _value, address _target) public {\n        require(_value > commission);\n        require(token.transferFrom(msg.sender, this, _value));\n        transactionAmount = transactionAmount + 1;\n        commissionBalance = commissionBalance.add(commission);\n        emit PayinTx(_target, transactionAmount,  _value.sub(commission));\n    }\n\n    function Payout(address _to, uint256 _value, uint256 _txNumber) public {\n        // check that keeper is not frozen\n        require(!keepers[msg.sender].frozen);\n        require(keepers[msg.sender].dayLimit > 0);\n\n        bytes32 txHash = keccak256(_to, _txNumber, _value);\n\n        // check that transaction is not paid\n        require(!paid[txHash].paid);\n\n        if (paid[txHash].commitTS == 0) {\n            // check daylimit\n            require(underLimit(msg.sender, _value));\n            paid[txHash].commitTS = block.timestamp;\n            paid[txHash].keeper = msg.sender;\n            emit CommitTx(_to, _txNumber, _value, block.timestamp);\n        } else {\n            require(paid[txHash].keeper == msg.sender);\n            require(paid[txHash].commitTS + freezingTime <= block.timestamp);\n            require(token.transfer(_to, _value));\n            paid[txHash].paid = true;\n            emit PayoutTx(_to, _txNumber, _value);\n        }\n    }\n\n    function SetFreezingTime(uint256 _freezingTime) public onlyOwner {\n        freezingTime = _freezingTime;\n    }\n\n    function GetFreezingTime() public view returns (uint256) {\n        return freezingTime;\n    }\n\n    function SetCommission(uint256 _commission) public onlyOwner {\n        commission = _commission;\n        CommissionChanged(commission);\n    }\n\n    function GetCommission() public view returns (uint256) {\n        return commission;\n    }\n\n    function TransferCommission() public onlyOwner {\n        require(token.transfer(owner, commissionBalance));\n        commissionBalance = 0;\n    }\n\n    function underLimit(address _keeper, uint256 _value) internal returns (bool) {\n        // reset the spend limit if we're on a different day to last time.\n        if (today() > keepers[_keeper].lastDay) {\n            keepers[_keeper].spentToday = 0;\n            keepers[_keeper].lastDay = today();\n        }\n        // check to see if there's enough left - if so, subtract and return true.\n        // overflow protection                    // dailyLimit check\n        if (keepers[_keeper].spentToday + _value >= keepers[_keeper].spentToday &&\n        keepers[_keeper].spentToday + _value <= keepers[_keeper].dayLimit) {\n            keepers[_keeper].spentToday += _value;\n            return true;\n        }\n        return false;\n    }\n\n    function today() private view returns (uint256) {\n        // solium-disable-next-line security/no-block-members\n        return block.timestamp / 1 days;\n    }\n\n    function kill() public onlyOwner {\n        require(token.transfer(owner, token.balanceOf(address(this))));\n        emit Suicide(block.timestamp);\n        // solium-disable-line security/no-block-members\n        selfdestruct(owner);\n    }\n\n}\n",
   "sourcePath": "contracts/SimpleGatekeeperWithLimit.sol",
   "ast": {
     "absolutePath": "contracts/SimpleGatekeeperWithLimit.sol",
     "exportedSymbols": {
       "SimpleGatekeeperWithLimit": [
-        6488
+        10642
       ]
     },
-    "id": 6489,
+    "id": 10643,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 5928,
+        "id": 10082,
         "literals": [
           "solidity",
           "^",
@@ -518,27 +518,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:12"
+        "src": "0:24:13"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 5929,
+        "id": 10083,
         "nodeType": "ImportDirective",
-        "scope": 6489,
-        "sourceUnit": 7755,
-        "src": "27:67:12",
+        "scope": 10643,
+        "sourceUnit": 11301,
+        "src": "27:67:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 5930,
+        "id": 10084,
         "nodeType": "ImportDirective",
-        "scope": 6489,
-        "sourceUnit": 7337,
-        "src": "95:59:12",
+        "scope": 10643,
+        "sourceUnit": 10883,
+        "src": "95:59:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -548,56 +548,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5931,
+              "id": 10085,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "195:7:12",
+              "referencedDeclaration": 10882,
+              "src": "195:7:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 5932,
+            "id": 10086,
             "nodeType": "InheritanceSpecifier",
-            "src": "195:7:12"
+            "src": "195:7:13"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 6488,
+        "id": 10642,
         "linearizedBaseContracts": [
-          6488,
-          7336
+          10642,
+          10882
         ],
         "name": "SimpleGatekeeperWithLimit",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 5935,
+            "id": 10089,
             "libraryName": {
               "contractScope": null,
-              "id": 5933,
+              "id": 10087,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "216:8:12",
+              "referencedDeclaration": 10796,
+              "src": "216:8:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "210:27:12",
+            "src": "210:27:13",
             "typeName": {
-              "id": 5934,
+              "id": 10088,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "229:7:12",
+              "src": "229:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -606,26 +606,26 @@
           },
           {
             "constant": false,
-            "id": 5937,
+            "id": 10091,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "243:19:12",
+            "scope": 10642,
+            "src": "243:19:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_StandardToken_$7754",
+              "typeIdentifier": "t_contract$_StandardToken_$11300",
               "typeString": "contract StandardToken"
             },
             "typeName": {
               "contractScope": null,
-              "id": 5936,
+              "id": 10090,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7754,
-              "src": "243:13:12",
+              "referencedDeclaration": 11300,
+              "src": "243:13:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$7754",
+                "typeIdentifier": "t_contract$_StandardToken_$11300",
                 "typeString": "contract StandardToken"
               }
             },
@@ -634,15 +634,15 @@
           },
           {
             "canonicalName": "SimpleGatekeeperWithLimit.Keeper",
-            "id": 5946,
+            "id": 10100,
             "members": [
               {
                 "constant": false,
-                "id": 5939,
+                "id": 10093,
                 "name": "dayLimit",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "293:16:12",
+                "scope": 10100,
+                "src": "293:16:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -650,10 +650,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5938,
+                  "id": 10092,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "293:7:12",
+                  "src": "293:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -664,11 +664,11 @@
               },
               {
                 "constant": false,
-                "id": 5941,
+                "id": 10095,
                 "name": "lastDay",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "319:15:12",
+                "scope": 10100,
+                "src": "319:15:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -676,10 +676,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5940,
+                  "id": 10094,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "319:7:12",
+                  "src": "319:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -690,11 +690,11 @@
               },
               {
                 "constant": false,
-                "id": 5943,
+                "id": 10097,
                 "name": "spentToday",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "344:18:12",
+                "scope": 10100,
+                "src": "344:18:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -702,10 +702,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5942,
+                  "id": 10096,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "344:7:12",
+                  "src": "344:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -716,11 +716,11 @@
               },
               {
                 "constant": false,
-                "id": 5945,
+                "id": 10099,
                 "name": "frozen",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "372:11:12",
+                "scope": 10100,
+                "src": "372:11:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -728,10 +728,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 5944,
+                  "id": 10098,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "372:4:12",
+                  "src": "372:4:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -743,21 +743,21 @@
             ],
             "name": "Keeper",
             "nodeType": "StructDefinition",
-            "scope": 6488,
-            "src": "269:121:12",
+            "scope": 10642,
+            "src": "269:121:13",
             "visibility": "public"
           },
           {
             "canonicalName": "SimpleGatekeeperWithLimit.TransactionState",
-            "id": 5953,
+            "id": 10107,
             "members": [
               {
                 "constant": false,
-                "id": 5948,
+                "id": 10102,
                 "name": "commitTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "430:16:12",
+                "scope": 10107,
+                "src": "430:16:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -765,10 +765,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5947,
+                  "id": 10101,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "430:7:12",
+                  "src": "430:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -779,11 +779,11 @@
               },
               {
                 "constant": false,
-                "id": 5950,
+                "id": 10104,
                 "name": "paid",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "456:9:12",
+                "scope": 10107,
+                "src": "456:9:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -791,10 +791,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 5949,
+                  "id": 10103,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "456:4:12",
+                  "src": "456:4:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -805,11 +805,11 @@
               },
               {
                 "constant": false,
-                "id": 5952,
+                "id": 10106,
                 "name": "keeper",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "475:14:12",
+                "scope": 10107,
+                "src": "475:14:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -817,10 +817,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 5951,
+                  "id": 10105,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "475:7:12",
+                  "src": "475:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -832,50 +832,50 @@
             ],
             "name": "TransactionState",
             "nodeType": "StructDefinition",
-            "scope": 6488,
-            "src": "396:100:12",
+            "scope": 10642,
+            "src": "396:100:13",
             "visibility": "public"
           },
           {
             "constant": false,
-            "id": 5957,
+            "id": 10111,
             "name": "keepers",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "502:41:12",
+            "scope": 10642,
+            "src": "502:41:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper)"
             },
             "typeName": {
-              "id": 5956,
+              "id": 10110,
               "keyType": {
-                "id": 5954,
+                "id": 10108,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "510:7:12",
+                "src": "510:7:13",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "502:26:12",
+              "src": "502:26:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 5955,
+                "id": 10109,
                 "name": "Keeper",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 5946,
-                "src": "521:6:12",
+                "referencedDeclaration": 10100,
+                "src": "521:6:13",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Keeper_$5946_storage_ptr",
+                  "typeIdentifier": "t_struct$_Keeper_$10100_storage_ptr",
                   "typeString": "struct SimpleGatekeeperWithLimit.Keeper"
                 }
               }
@@ -885,11 +885,11 @@
           },
           {
             "constant": false,
-            "id": 5960,
+            "id": 10114,
             "name": "transactionAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "550:36:12",
+            "scope": 10642,
+            "src": "550:36:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -897,10 +897,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5958,
+              "id": 10112,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "550:7:12",
+              "src": "550:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -909,14 +909,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5959,
+              "id": 10113,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "585:1:12",
+              "src": "585:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -928,11 +928,11 @@
           },
           {
             "constant": false,
-            "id": 5963,
+            "id": 10117,
             "name": "commission",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "593:29:12",
+            "scope": 10642,
+            "src": "593:29:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -940,10 +940,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5961,
+              "id": 10115,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "593:7:12",
+              "src": "593:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -952,14 +952,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5962,
+              "id": 10116,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "621:1:12",
+              "src": "621:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -971,11 +971,11 @@
           },
           {
             "constant": false,
-            "id": 5966,
+            "id": 10120,
             "name": "commissionBalance",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "629:36:12",
+            "scope": 10642,
+            "src": "629:36:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -983,10 +983,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5964,
+              "id": 10118,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "629:7:12",
+              "src": "629:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -995,14 +995,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5965,
+              "id": 10119,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "664:1:12",
+              "src": "664:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -1014,44 +1014,44 @@
           },
           {
             "constant": false,
-            "id": 5970,
+            "id": 10124,
             "name": "paid",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "672:48:12",
+            "scope": 10642,
+            "src": "672:48:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+              "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
               "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState)"
             },
             "typeName": {
-              "id": 5969,
+              "id": 10123,
               "keyType": {
-                "id": 5967,
+                "id": 10121,
                 "name": "bytes32",
                 "nodeType": "ElementaryTypeName",
-                "src": "680:7:12",
+                "src": "680:7:13",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bytes32",
                   "typeString": "bytes32"
                 }
               },
               "nodeType": "Mapping",
-              "src": "672:36:12",
+              "src": "672:36:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                 "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 5968,
+                "id": 10122,
                 "name": "TransactionState",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 5953,
-                "src": "691:16:12",
+                "referencedDeclaration": 10107,
+                "src": "691:16:13",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_TransactionState_$5953_storage_ptr",
+                  "typeIdentifier": "t_struct$_TransactionState_$10107_storage_ptr",
                   "typeString": "struct SimpleGatekeeperWithLimit.TransactionState"
                 }
               }
@@ -1061,11 +1061,11 @@
           },
           {
             "constant": false,
-            "id": 5972,
+            "id": 10126,
             "name": "freezingTime",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "727:20:12",
+            "scope": 10642,
+            "src": "727:20:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1073,10 +1073,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5971,
+              "id": 10125,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "727:7:12",
+              "src": "727:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1087,28 +1087,28 @@
           },
           {
             "body": {
-              "id": 5994,
+              "id": 10148,
               "nodeType": "Block",
-              "src": "812:112:12",
+              "src": "812:112:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5983,
+                    "id": 10137,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5979,
+                      "id": 10133,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5937,
-                      "src": "822:5:12",
+                      "referencedDeclaration": 10091,
+                      "src": "822:5:13",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_StandardToken_$7754",
+                        "typeIdentifier": "t_contract$_StandardToken_$11300",
                         "typeString": "contract StandardToken"
                       }
                     },
@@ -1119,12 +1119,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5981,
+                          "id": 10135,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5974,
-                          "src": "844:6:12",
+                          "referencedDeclaration": 10128,
+                          "src": "844:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1138,18 +1138,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5980,
+                        "id": 10134,
                         "name": "StandardToken",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7754,
-                        "src": "830:13:12",
+                        "referencedDeclaration": 11300,
+                        "src": "830:13:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_StandardToken_$7754_$",
+                          "typeIdentifier": "t_type$_t_contract$_StandardToken_$11300_$",
                           "typeString": "type(contract StandardToken)"
                         }
                       },
-                      "id": 5982,
+                      "id": 10136,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1157,38 +1157,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "830:21:12",
+                      "src": "830:21:13",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_StandardToken_$7754",
+                        "typeIdentifier": "t_contract$_StandardToken_$11300",
                         "typeString": "contract StandardToken"
                       }
                     },
-                    "src": "822:29:12",
+                    "src": "822:29:13",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_StandardToken_$7754",
+                      "typeIdentifier": "t_contract$_StandardToken_$11300",
                       "typeString": "contract StandardToken"
                     }
                   },
-                  "id": 5984,
+                  "id": 10138,
                   "nodeType": "ExpressionStatement",
-                  "src": "822:29:12"
+                  "src": "822:29:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5988,
+                    "id": 10142,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5985,
+                      "id": 10139,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "861:5:12",
+                      "referencedDeclaration": 10800,
+                      "src": "861:5:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1200,18 +1200,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5986,
+                        "id": 10140,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "869:3:12",
+                        "referencedDeclaration": 11315,
+                        "src": "869:3:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 5987,
+                      "id": 10141,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1219,38 +1219,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "869:10:12",
+                      "src": "869:10:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "861:18:12",
+                    "src": "861:18:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 5989,
+                  "id": 10143,
                   "nodeType": "ExpressionStatement",
-                  "src": "861:18:12"
+                  "src": "861:18:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5992,
+                    "id": 10146,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5990,
+                      "id": 10144,
                       "name": "freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5972,
-                      "src": "889:12:12",
+                      "referencedDeclaration": 10126,
+                      "src": "889:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1260,31 +1260,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5991,
+                      "id": 10145,
                       "name": "_freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5976,
-                      "src": "904:13:12",
+                      "referencedDeclaration": 10130,
+                      "src": "904:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "889:28:12",
+                    "src": "889:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5993,
+                  "id": 10147,
                   "nodeType": "ExpressionStatement",
-                  "src": "889:28:12"
+                  "src": "889:28:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 5995,
+            "id": 10149,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1292,16 +1292,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5977,
+              "id": 10131,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5974,
+                  "id": 10128,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5995,
-                  "src": "766:14:12",
+                  "scope": 10149,
+                  "src": "766:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1309,10 +1309,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5973,
+                    "id": 10127,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "766:7:12",
+                    "src": "766:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1323,11 +1323,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5976,
+                  "id": 10130,
                   "name": "_freezingTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5995,
-                  "src": "782:21:12",
+                  "scope": 10149,
+                  "src": "782:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1335,10 +1335,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5975,
+                    "id": 10129,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "782:7:12",
+                    "src": "782:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1348,17 +1348,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "765:39:12"
+              "src": "765:39:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5978,
+              "id": 10132,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "812:0:12"
+              "src": "812:0:13"
             },
-            "scope": 6488,
-            "src": "754:170:12",
+            "scope": 10642,
+            "src": "754:170:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -1366,21 +1366,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6003,
+            "id": 10157,
             "name": "PayinTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6002,
+              "id": 10156,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5997,
+                  "id": 10151,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "944:20:12",
+                  "scope": 10157,
+                  "src": "944:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1388,10 +1388,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5996,
+                    "id": 10150,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "944:7:12",
+                    "src": "944:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1402,12 +1402,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 5999,
+                  "id": 10153,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "966:24:12",
+                  "scope": 10157,
+                  "src": "966:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1415,10 +1415,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5998,
+                    "id": 10152,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "966:7:12",
+                    "src": "966:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1429,12 +1429,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6001,
+                  "id": 10155,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "992:21:12",
+                  "scope": 10157,
+                  "src": "992:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1442,10 +1442,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6000,
+                    "id": 10154,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "992:7:12",
+                    "src": "992:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1455,28 +1455,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "943:71:12"
+              "src": "943:71:13"
             },
-            "src": "930:85:12"
+            "src": "930:85:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6013,
+            "id": 10167,
             "name": "CommitTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6012,
+              "id": 10166,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6005,
+                  "id": 10159,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1035:20:12",
+                  "scope": 10167,
+                  "src": "1035:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1484,10 +1484,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6004,
+                    "id": 10158,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1035:7:12",
+                    "src": "1035:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1498,12 +1498,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6007,
+                  "id": 10161,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1057:24:12",
+                  "scope": 10167,
+                  "src": "1057:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1511,10 +1511,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6006,
+                    "id": 10160,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1057:7:12",
+                    "src": "1057:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1525,12 +1525,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6009,
+                  "id": 10163,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1083:21:12",
+                  "scope": 10167,
+                  "src": "1083:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1538,10 +1538,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6008,
+                    "id": 10162,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1083:7:12",
+                    "src": "1083:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1552,12 +1552,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6011,
+                  "id": 10165,
                   "indexed": false,
                   "name": "commitTimestamp",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1106:20:12",
+                  "scope": 10167,
+                  "src": "1106:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1565,10 +1565,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6010,
+                    "id": 10164,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1106:4:12",
+                    "src": "1106:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1578,28 +1578,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1034:93:12"
+              "src": "1034:93:13"
             },
-            "src": "1020:108:12"
+            "src": "1020:108:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6021,
+            "id": 10175,
             "name": "PayoutTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6020,
+              "id": 10174,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6015,
+                  "id": 10169,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1148:20:12",
+                  "scope": 10175,
+                  "src": "1148:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1607,10 +1607,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6014,
+                    "id": 10168,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1148:7:12",
+                    "src": "1148:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1621,12 +1621,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6017,
+                  "id": 10171,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1170:24:12",
+                  "scope": 10175,
+                  "src": "1170:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1634,10 +1634,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6016,
+                    "id": 10170,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1170:7:12",
+                    "src": "1170:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1648,12 +1648,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6019,
+                  "id": 10173,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1196:21:12",
+                  "scope": 10175,
+                  "src": "1196:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1661,10 +1661,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6018,
+                    "id": 10172,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1196:7:12",
+                    "src": "1196:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1674,28 +1674,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1147:71:12"
+              "src": "1147:71:13"
             },
-            "src": "1133:86:12"
+            "src": "1133:86:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6025,
+            "id": 10179,
             "name": "Suicide",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6024,
+              "id": 10178,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6023,
+                  "id": 10177,
                   "indexed": false,
                   "name": "block",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6025,
-                  "src": "1238:10:12",
+                  "scope": 10179,
+                  "src": "1238:10:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1703,10 +1703,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6022,
+                    "id": 10176,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1238:4:12",
+                    "src": "1238:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1716,28 +1716,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1237:12:12"
+              "src": "1237:12:13"
             },
-            "src": "1224:26:12"
+            "src": "1224:26:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6031,
+            "id": 10185,
             "name": "LimitChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6030,
+              "id": 10184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6027,
+                  "id": 10181,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6031,
-                  "src": "1275:22:12",
+                  "scope": 10185,
+                  "src": "1275:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1745,10 +1745,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6026,
+                    "id": 10180,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1275:7:12",
+                    "src": "1275:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1759,12 +1759,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6029,
+                  "id": 10183,
                   "indexed": true,
                   "name": "dayLimit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6031,
-                  "src": "1299:24:12",
+                  "scope": 10185,
+                  "src": "1299:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1772,10 +1772,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6028,
+                    "id": 10182,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1299:7:12",
+                    "src": "1299:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1785,28 +1785,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1274:50:12"
+              "src": "1274:50:13"
             },
-            "src": "1256:69:12"
+            "src": "1256:69:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6035,
+            "id": 10189,
             "name": "KeeperFreezed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6034,
+              "id": 10188,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6033,
+                  "id": 10187,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6035,
-                  "src": "1350:22:12",
+                  "scope": 10189,
+                  "src": "1350:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1814,10 +1814,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6032,
+                    "id": 10186,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1350:7:12",
+                    "src": "1350:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1827,28 +1827,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1349:24:12"
+              "src": "1349:24:13"
             },
-            "src": "1330:44:12"
+            "src": "1330:44:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6039,
+            "id": 10193,
             "name": "KeeperUnfreezed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6038,
+              "id": 10192,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6037,
+                  "id": 10191,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6039,
-                  "src": "1401:22:12",
+                  "scope": 10193,
+                  "src": "1401:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1856,10 +1856,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6036,
+                    "id": 10190,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1401:7:12",
+                    "src": "1401:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1869,28 +1869,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1400:24:12"
+              "src": "1400:24:13"
             },
-            "src": "1379:46:12"
+            "src": "1379:46:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6043,
+            "id": 10197,
             "name": "CommissionChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6042,
+              "id": 10196,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6041,
+                  "id": 10195,
                   "indexed": true,
                   "name": "commission",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6043,
-                  "src": "1455:26:12",
+                  "scope": 10197,
+                  "src": "1455:26:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1898,10 +1898,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6040,
+                    "id": 10194,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1455:7:12",
+                    "src": "1455:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1911,20 +1911,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1454:28:12"
+              "src": "1454:28:13"
             },
-            "src": "1431:52:12"
+            "src": "1431:52:13"
           },
           {
             "body": {
-              "id": 6064,
+              "id": 10218,
               "nodeType": "Block",
-              "src": "1566:95:12",
+              "src": "1566:95:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6057,
+                    "id": 10211,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1935,26 +1935,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6052,
+                          "id": 10206,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "1576:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "1576:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6054,
+                        "id": 10208,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6053,
+                          "id": 10207,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6045,
-                          "src": "1584:7:12",
+                          "referencedDeclaration": 10199,
+                          "src": "1584:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1965,21 +1965,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1576:16:12",
+                        "src": "1576:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6055,
+                      "id": 10209,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dayLimit",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5939,
-                      "src": "1576:25:12",
+                      "referencedDeclaration": 10093,
+                      "src": "1576:25:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1989,26 +1989,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6056,
+                      "id": 10210,
                       "name": "_limit",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6047,
-                      "src": "1604:6:12",
+                      "referencedDeclaration": 10201,
+                      "src": "1604:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1576:34:12",
+                    "src": "1576:34:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6058,
+                  "id": 10212,
                   "nodeType": "ExpressionStatement",
-                  "src": "1576:34:12"
+                  "src": "1576:34:13"
                 },
                 {
                   "eventCall": {
@@ -2016,12 +2016,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6060,
+                        "id": 10214,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6045,
-                        "src": "1638:7:12",
+                        "referencedDeclaration": 10199,
+                        "src": "1638:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2029,12 +2029,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6061,
+                        "id": 10215,
                         "name": "_limit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6047,
-                        "src": "1647:6:12",
+                        "referencedDeclaration": 10201,
+                        "src": "1647:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2052,18 +2052,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6059,
+                      "id": 10213,
                       "name": "LimitChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6031,
-                      "src": "1625:12:12",
+                      "referencedDeclaration": 10185,
+                      "src": "1625:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 6062,
+                    "id": 10216,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2071,57 +2071,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1625:29:12",
+                    "src": "1625:29:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6063,
+                  "id": 10217,
                   "nodeType": "EmitStatement",
-                  "src": "1620:34:12"
+                  "src": "1620:34:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6065,
+            "id": 10219,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6050,
+                "id": 10204,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6049,
+                  "id": 10203,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1556:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "1556:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1556:9:12"
+                "src": "1556:9:13"
               }
             ],
             "name": "ChangeKeeperLimit",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6048,
+              "id": 10202,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6045,
+                  "id": 10199,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6065,
-                  "src": "1516:15:12",
+                  "scope": 10219,
+                  "src": "1516:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2129,10 +2129,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6044,
+                    "id": 10198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1516:7:12",
+                    "src": "1516:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2143,11 +2143,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6047,
+                  "id": 10201,
                   "name": "_limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6065,
-                  "src": "1533:14:12",
+                  "scope": 10219,
+                  "src": "1533:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2155,10 +2155,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6046,
+                    "id": 10200,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1533:7:12",
+                    "src": "1533:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2168,26 +2168,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1515:33:12"
+              "src": "1515:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6051,
+              "id": 10205,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1566:0:12"
+              "src": "1566:0:13"
             },
-            "scope": 6488,
-            "src": "1489:172:12",
+            "scope": 10642,
+            "src": "1489:172:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6100,
+              "id": 10254,
               "nodeType": "Block",
-              "src": "1713:265:12",
+              "src": "1713:265:13",
               "statements": [
                 {
                   "expression": {
@@ -2199,7 +2199,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6077,
+                        "id": 10231,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2210,34 +2210,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6071,
+                              "id": 10225,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "1765:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "1765:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6074,
+                            "id": 10228,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6072,
+                                "id": 10226,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "1773:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "1773:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6073,
+                              "id": 10227,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -2245,7 +2245,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1773:10:12",
+                              "src": "1773:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2256,21 +2256,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1765:19:12",
+                            "src": "1765:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6075,
+                          "id": 10229,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "1765:28:12",
+                          "referencedDeclaration": 10093,
+                          "src": "1765:28:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2281,14 +2281,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6076,
+                          "id": 10230,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1796:1:12",
+                          "src": "1796:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2296,7 +2296,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1765:32:12",
+                        "src": "1765:32:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2310,21 +2310,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6070,
+                      "id": 10224,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1757:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "1757:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6078,
+                    "id": 10232,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2332,15 +2332,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1757:41:12",
+                    "src": "1757:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6079,
+                  "id": 10233,
                   "nodeType": "ExpressionStatement",
-                  "src": "1757:41:12"
+                  "src": "1757:41:13"
                 },
                 {
                   "expression": {
@@ -2352,7 +2352,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6086,
+                        "id": 10240,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2363,26 +2363,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6081,
+                              "id": 10235,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "1864:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "1864:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6083,
+                            "id": 10237,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6082,
+                              "id": 10236,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6067,
-                              "src": "1872:7:12",
+                              "referencedDeclaration": 10221,
+                              "src": "1872:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2393,21 +2393,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1864:16:12",
+                            "src": "1864:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6084,
+                          "id": 10238,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "1864:25:12",
+                          "referencedDeclaration": 10093,
+                          "src": "1864:25:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2418,14 +2418,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6085,
+                          "id": 10239,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1892:1:12",
+                          "src": "1892:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2433,7 +2433,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1864:29:12",
+                        "src": "1864:29:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2447,21 +2447,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6080,
+                      "id": 10234,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1856:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "1856:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6087,
+                    "id": 10241,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2469,20 +2469,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1856:38:12",
+                    "src": "1856:38:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6088,
+                  "id": 10242,
                   "nodeType": "ExpressionStatement",
-                  "src": "1856:38:12"
+                  "src": "1856:38:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6094,
+                    "id": 10248,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2493,26 +2493,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6089,
+                          "id": 10243,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "1904:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "1904:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6091,
+                        "id": 10245,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6090,
+                          "id": 10244,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6067,
-                          "src": "1912:7:12",
+                          "referencedDeclaration": 10221,
+                          "src": "1912:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2523,21 +2523,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1904:16:12",
+                        "src": "1904:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6092,
+                      "id": 10246,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "frozen",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5945,
-                      "src": "1904:23:12",
+                      "referencedDeclaration": 10099,
+                      "src": "1904:23:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2548,14 +2548,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 6093,
+                      "id": 10247,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1930:4:12",
+                      "src": "1930:4:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2563,15 +2563,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "1904:30:12",
+                    "src": "1904:30:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 6095,
+                  "id": 10249,
                   "nodeType": "ExpressionStatement",
-                  "src": "1904:30:12"
+                  "src": "1904:30:13"
                 },
                 {
                   "eventCall": {
@@ -2579,12 +2579,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6097,
+                        "id": 10251,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6067,
-                        "src": "1963:7:12",
+                        "referencedDeclaration": 10221,
+                        "src": "1963:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2598,18 +2598,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6096,
+                      "id": 10250,
                       "name": "KeeperFreezed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6035,
-                      "src": "1949:13:12",
+                      "referencedDeclaration": 10189,
+                      "src": "1949:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6098,
+                    "id": 10252,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2617,20 +2617,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1949:22:12",
+                    "src": "1949:22:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6099,
+                  "id": 10253,
                   "nodeType": "EmitStatement",
-                  "src": "1944:27:12"
+                  "src": "1944:27:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6101,
+            "id": 10255,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2638,16 +2638,16 @@
             "name": "FreezeKeeper",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6068,
+              "id": 10222,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6067,
+                  "id": 10221,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6101,
-                  "src": "1689:15:12",
+                  "scope": 10255,
+                  "src": "1689:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2655,10 +2655,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6066,
+                    "id": 10220,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1689:7:12",
+                    "src": "1689:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2668,26 +2668,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1688:17:12"
+              "src": "1688:17:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6069,
+              "id": 10223,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1713:0:12"
+              "src": "1713:0:13"
             },
-            "scope": 6488,
-            "src": "1667:311:12",
+            "scope": 10642,
+            "src": "1667:311:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6128,
+              "id": 10282,
               "nodeType": "Block",
-              "src": "2042:135:12",
+              "src": "2042:135:13",
               "statements": [
                 {
                   "expression": {
@@ -2699,7 +2699,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6114,
+                        "id": 10268,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2710,26 +2710,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6109,
+                              "id": 10263,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2060:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2060:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6111,
+                            "id": 10265,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6110,
+                              "id": 10264,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6103,
-                              "src": "2068:7:12",
+                              "referencedDeclaration": 10257,
+                              "src": "2068:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2740,21 +2740,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2060:16:12",
+                            "src": "2060:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6112,
+                          "id": 10266,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "2060:25:12",
+                          "referencedDeclaration": 10093,
+                          "src": "2060:25:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2765,14 +2765,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6113,
+                          "id": 10267,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2088:1:12",
+                          "src": "2088:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2780,7 +2780,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2060:29:12",
+                        "src": "2060:29:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2794,21 +2794,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6108,
+                      "id": 10262,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2052:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2052:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6115,
+                    "id": 10269,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2816,20 +2816,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2052:38:12",
+                    "src": "2052:38:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6116,
+                  "id": 10270,
                   "nodeType": "ExpressionStatement",
-                  "src": "2052:38:12"
+                  "src": "2052:38:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6122,
+                    "id": 10276,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2840,26 +2840,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6117,
+                          "id": 10271,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "2100:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "2100:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6119,
+                        "id": 10273,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6118,
+                          "id": 10272,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6103,
-                          "src": "2108:7:12",
+                          "referencedDeclaration": 10257,
+                          "src": "2108:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2870,21 +2870,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2100:16:12",
+                        "src": "2100:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6120,
+                      "id": 10274,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "frozen",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5945,
-                      "src": "2100:23:12",
+                      "referencedDeclaration": 10099,
+                      "src": "2100:23:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2895,14 +2895,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 6121,
+                      "id": 10275,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2126:5:12",
+                      "src": "2126:5:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2910,15 +2910,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "2100:31:12",
+                    "src": "2100:31:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 6123,
+                  "id": 10277,
                   "nodeType": "ExpressionStatement",
-                  "src": "2100:31:12"
+                  "src": "2100:31:13"
                 },
                 {
                   "eventCall": {
@@ -2926,12 +2926,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6125,
+                        "id": 10279,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6103,
-                        "src": "2162:7:12",
+                        "referencedDeclaration": 10257,
+                        "src": "2162:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2945,18 +2945,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6124,
+                      "id": 10278,
                       "name": "KeeperUnfreezed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6039,
-                      "src": "2146:15:12",
+                      "referencedDeclaration": 10193,
+                      "src": "2146:15:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6126,
+                    "id": 10280,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2964,57 +2964,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2146:24:12",
+                    "src": "2146:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6127,
+                  "id": 10281,
                   "nodeType": "EmitStatement",
-                  "src": "2141:29:12"
+                  "src": "2141:29:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6129,
+            "id": 10283,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6106,
+                "id": 10260,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6105,
+                  "id": 10259,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "2032:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "2032:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2032:9:12"
+                "src": "2032:9:13"
               }
             ],
             "name": "UnfreezeKeeper",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6104,
+              "id": 10258,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6103,
+                  "id": 10257,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6129,
-                  "src": "2008:15:12",
+                  "scope": 10283,
+                  "src": "2008:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3022,10 +3022,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6102,
+                    "id": 10256,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2008:7:12",
+                    "src": "2008:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3035,26 +3035,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2007:17:12"
+              "src": "2007:17:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6107,
+              "id": 10261,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2042:0:12"
+              "src": "2042:0:13"
             },
-            "scope": 6488,
-            "src": "1984:193:12",
+            "scope": 10642,
+            "src": "1984:193:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6140,
+              "id": 10294,
               "nodeType": "Block",
-              "src": "2221:50:12",
+              "src": "2221:50:13",
               "statements": [
                 {
                   "expression": {
@@ -3062,12 +3062,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6135,
+                        "id": 10289,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6131,
-                        "src": "2245:6:12",
+                        "referencedDeclaration": 10285,
+                        "src": "2245:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3077,18 +3077,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6136,
+                          "id": 10290,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "2253:3:12",
+                          "referencedDeclaration": 11315,
+                          "src": "2253:3:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 6137,
+                        "id": 10291,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3096,7 +3096,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "2253:10:12",
+                        "src": "2253:10:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3114,18 +3114,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6134,
+                      "id": 10288,
                       "name": "PayinTargeted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6187,
-                      "src": "2231:13:12",
+                      "referencedDeclaration": 10341,
+                      "src": "2231:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_address_$returns$__$",
                         "typeString": "function (uint256,address)"
                       }
                     },
-                    "id": 6138,
+                    "id": 10292,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3133,20 +3133,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2231:33:12",
+                    "src": "2231:33:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6139,
+                  "id": 10293,
                   "nodeType": "ExpressionStatement",
-                  "src": "2231:33:12"
+                  "src": "2231:33:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6141,
+            "id": 10295,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3154,16 +3154,16 @@
             "name": "Payin",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6132,
+              "id": 10286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6131,
+                  "id": 10285,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6141,
-                  "src": "2198:14:12",
+                  "scope": 10295,
+                  "src": "2198:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3171,10 +3171,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6130,
+                    "id": 10284,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2198:7:12",
+                    "src": "2198:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3184,26 +3184,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2197:16:12"
+              "src": "2197:16:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6133,
+              "id": 10287,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2221:0:12"
+              "src": "2221:0:13"
             },
-            "scope": 6488,
-            "src": "2183:88:12",
+            "scope": 10642,
+            "src": "2183:88:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6186,
+              "id": 10340,
               "nodeType": "Block",
-              "src": "2340:297:12",
+              "src": "2340:297:13",
               "statements": [
                 {
                   "expression": {
@@ -3215,19 +3215,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6151,
+                        "id": 10305,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 6149,
+                          "id": 10303,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6143,
-                          "src": "2358:6:12",
+                          "referencedDeclaration": 10297,
+                          "src": "2358:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3237,18 +3237,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6150,
+                          "id": 10304,
                           "name": "commission",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5963,
-                          "src": "2367:10:12",
+                          "referencedDeclaration": 10117,
+                          "src": "2367:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "2358:19:12",
+                        "src": "2358:19:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3262,21 +3262,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6148,
+                      "id": 10302,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2350:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2350:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6152,
+                    "id": 10306,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3284,15 +3284,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2350:28:12",
+                    "src": "2350:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6153,
+                  "id": 10307,
                   "nodeType": "ExpressionStatement",
-                  "src": "2350:28:12"
+                  "src": "2350:28:13"
                 },
                 {
                   "expression": {
@@ -3305,18 +3305,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6157,
+                              "id": 10311,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "2415:3:12",
+                              "referencedDeclaration": 11315,
+                              "src": "2415:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 6158,
+                            "id": 10312,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3324,7 +3324,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "2415:10:12",
+                            "src": "2415:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3332,25 +3332,25 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6159,
+                            "id": 10313,
                             "name": "this",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7800,
-                            "src": "2427:4:12",
+                            "referencedDeclaration": 11348,
+                            "src": "2427:4:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                               "typeString": "contract SimpleGatekeeperWithLimit"
                             }
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6160,
+                            "id": 10314,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6143,
-                            "src": "2433:6:12",
+                            "referencedDeclaration": 10297,
+                            "src": "2433:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3364,7 +3364,7 @@
                               "typeString": "address"
                             },
                             {
-                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                               "typeString": "contract SimpleGatekeeperWithLimit"
                             },
                             {
@@ -3374,32 +3374,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6155,
+                            "id": 10309,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "2396:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "2396:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6156,
+                          "id": 10310,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transferFrom",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7607,
-                          "src": "2396:18:12",
+                          "referencedDeclaration": 11153,
+                          "src": "2396:18:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6161,
+                        "id": 10315,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3407,7 +3407,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "2396:44:12",
+                        "src": "2396:44:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3421,21 +3421,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6154,
+                      "id": 10308,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2388:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2388:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6162,
+                    "id": 10316,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3443,32 +3443,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2388:53:12",
+                    "src": "2388:53:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6163,
+                  "id": 10317,
                   "nodeType": "ExpressionStatement",
-                  "src": "2388:53:12"
+                  "src": "2388:53:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6168,
+                    "id": 10322,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6164,
+                      "id": 10318,
                       "name": "transactionAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5960,
-                      "src": "2451:17:12",
+                      "referencedDeclaration": 10114,
+                      "src": "2451:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3482,19 +3482,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6167,
+                      "id": 10321,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 6165,
+                        "id": 10319,
                         "name": "transactionAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5960,
-                        "src": "2471:17:12",
+                        "referencedDeclaration": 10114,
+                        "src": "2471:17:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3505,14 +3505,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 6166,
+                        "id": 10320,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2491:1:12",
+                        "src": "2491:1:13",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -3520,38 +3520,38 @@
                         },
                         "value": "1"
                       },
-                      "src": "2471:21:12",
+                      "src": "2471:21:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2451:41:12",
+                    "src": "2451:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6169,
+                  "id": 10323,
                   "nodeType": "ExpressionStatement",
-                  "src": "2451:41:12"
+                  "src": "2451:41:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6175,
+                    "id": 10329,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6170,
+                      "id": 10324,
                       "name": "commissionBalance",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5966,
-                      "src": "2502:17:12",
+                      "referencedDeclaration": 10120,
+                      "src": "2502:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3564,12 +3564,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 6173,
+                          "id": 10327,
                           "name": "commission",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5963,
-                          "src": "2544:10:12",
+                          "referencedDeclaration": 10117,
+                          "src": "2544:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3585,32 +3585,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6171,
+                          "id": 10325,
                           "name": "commissionBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5966,
-                          "src": "2522:17:12",
+                          "referencedDeclaration": 10120,
+                          "src": "2522:17:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6172,
+                        "id": 10326,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "2522:21:12",
+                        "referencedDeclaration": 10795,
+                        "src": "2522:21:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 6174,
+                      "id": 10328,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3618,21 +3618,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2522:33:12",
+                      "src": "2522:33:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2502:53:12",
+                    "src": "2502:53:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6176,
+                  "id": 10330,
                   "nodeType": "ExpressionStatement",
-                  "src": "2502:53:12"
+                  "src": "2502:53:13"
                 },
                 {
                   "eventCall": {
@@ -3640,12 +3640,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6178,
+                        "id": 10332,
                         "name": "_target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6145,
-                        "src": "2578:7:12",
+                        "referencedDeclaration": 10299,
+                        "src": "2578:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3653,12 +3653,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6179,
+                        "id": 10333,
                         "name": "transactionAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5960,
-                        "src": "2587:17:12",
+                        "referencedDeclaration": 10114,
+                        "src": "2587:17:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3669,12 +3669,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6182,
+                            "id": 10336,
                             "name": "commission",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5963,
-                            "src": "2618:10:12",
+                            "referencedDeclaration": 10117,
+                            "src": "2618:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3690,32 +3690,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6180,
+                            "id": 10334,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6143,
-                            "src": "2607:6:12",
+                            "referencedDeclaration": 10297,
+                            "src": "2607:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 6181,
+                          "id": 10335,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "sub",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7225,
-                          "src": "2607:10:12",
+                          "referencedDeclaration": 10771,
+                          "src": "2607:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 6183,
+                        "id": 10337,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3723,7 +3723,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "2607:22:12",
+                        "src": "2607:22:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3745,18 +3745,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6177,
+                      "id": 10331,
                       "name": "PayinTx",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6003,
-                      "src": "2570:7:12",
+                      "referencedDeclaration": 10157,
+                      "src": "2570:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256,uint256)"
                       }
                     },
-                    "id": 6184,
+                    "id": 10338,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3764,20 +3764,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2570:60:12",
+                    "src": "2570:60:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6185,
+                  "id": 10339,
                   "nodeType": "EmitStatement",
-                  "src": "2565:65:12"
+                  "src": "2565:65:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6187,
+            "id": 10341,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3785,16 +3785,16 @@
             "name": "PayinTargeted",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6146,
+              "id": 10300,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6143,
+                  "id": 10297,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6187,
-                  "src": "2300:14:12",
+                  "scope": 10341,
+                  "src": "2300:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3802,10 +3802,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6142,
+                    "id": 10296,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2300:7:12",
+                    "src": "2300:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3816,11 +3816,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6145,
+                  "id": 10299,
                   "name": "_target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6187,
-                  "src": "2316:15:12",
+                  "scope": 10341,
+                  "src": "2316:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3828,10 +3828,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6144,
+                    "id": 10298,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2316:7:12",
+                    "src": "2316:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3841,26 +3841,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2299:33:12"
+              "src": "2299:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6147,
+              "id": 10301,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2340:0:12"
+              "src": "2340:0:13"
             },
-            "scope": 6488,
-            "src": "2277:360:12",
+            "scope": 10642,
+            "src": "2277:360:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6315,
+              "id": 10469,
               "nodeType": "Block",
-              "src": "2714:885:12",
+              "src": "2714:885:13",
               "statements": [
                 {
                   "expression": {
@@ -3868,7 +3868,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6202,
+                        "id": 10356,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3876,41 +3876,41 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2775:27:12",
+                        "src": "2775:27:13",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6197,
+                              "id": 10351,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2776:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2776:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6200,
+                            "id": 10354,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6198,
+                                "id": 10352,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "2784:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "2784:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6199,
+                              "id": 10353,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -3918,7 +3918,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "2784:10:12",
+                              "src": "2784:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3929,21 +3929,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2776:19:12",
+                            "src": "2776:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6201,
+                          "id": 10355,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "frozen",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5945,
-                          "src": "2776:26:12",
+                          "referencedDeclaration": 10099,
+                          "src": "2776:26:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -3962,21 +3962,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6196,
+                      "id": 10350,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2767:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2767:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6203,
+                    "id": 10357,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3984,15 +3984,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2767:36:12",
+                    "src": "2767:36:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6204,
+                  "id": 10358,
                   "nodeType": "ExpressionStatement",
-                  "src": "2767:36:12"
+                  "src": "2767:36:13"
                 },
                 {
                   "expression": {
@@ -4004,7 +4004,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6212,
+                        "id": 10366,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4015,34 +4015,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6206,
+                              "id": 10360,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2821:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2821:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6209,
+                            "id": 10363,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6207,
+                                "id": 10361,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "2829:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "2829:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6208,
+                              "id": 10362,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4050,7 +4050,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "2829:10:12",
+                              "src": "2829:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4061,21 +4061,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2821:19:12",
+                            "src": "2821:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6210,
+                          "id": 10364,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "2821:28:12",
+                          "referencedDeclaration": 10093,
+                          "src": "2821:28:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4086,14 +4086,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6211,
+                          "id": 10365,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2852:1:12",
+                          "src": "2852:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -4101,7 +4101,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2821:32:12",
+                        "src": "2821:32:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4115,21 +4115,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6205,
+                      "id": 10359,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2813:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2813:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6213,
+                    "id": 10367,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4137,28 +4137,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2813:41:12",
+                    "src": "2813:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6214,
+                  "id": 10368,
                   "nodeType": "ExpressionStatement",
-                  "src": "2813:41:12"
+                  "src": "2813:41:13"
                 },
                 {
                   "assignments": [
-                    6216
+                    10370
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 6216,
+                      "id": 10370,
                       "name": "txHash",
                       "nodeType": "VariableDeclaration",
-                      "scope": 6316,
-                      "src": "2865:14:12",
+                      "scope": 10470,
+                      "src": "2865:14:13",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -4166,10 +4166,10 @@
                         "typeString": "bytes32"
                       },
                       "typeName": {
-                        "id": 6215,
+                        "id": 10369,
                         "name": "bytes32",
                         "nodeType": "ElementaryTypeName",
-                        "src": "2865:7:12",
+                        "src": "2865:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -4179,18 +4179,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 6222,
+                  "id": 10376,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6218,
+                        "id": 10372,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6189,
-                        "src": "2892:3:12",
+                        "referencedDeclaration": 10343,
+                        "src": "2892:3:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4198,12 +4198,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6219,
+                        "id": 10373,
                         "name": "_txNumber",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6193,
-                        "src": "2897:9:12",
+                        "referencedDeclaration": 10347,
+                        "src": "2897:9:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4211,12 +4211,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6220,
+                        "id": 10374,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6191,
-                        "src": "2908:6:12",
+                        "referencedDeclaration": 10345,
+                        "src": "2908:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4238,18 +4238,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6217,
+                      "id": 10371,
                       "name": "keccak256",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7763,
-                      "src": "2882:9:12",
+                      "referencedDeclaration": 11309,
+                      "src": "2882:9:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                         "typeString": "function () pure returns (bytes32)"
                       }
                     },
-                    "id": 6221,
+                    "id": 10375,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4257,14 +4257,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2882:33:12",
+                    "src": "2882:33:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2865:50:12"
+                  "src": "2865:50:13"
                 },
                 {
                   "expression": {
@@ -4272,7 +4272,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6228,
+                        "id": 10382,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4280,33 +4280,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2980:18:12",
+                        "src": "2980:18:13",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6224,
+                              "id": 10378,
                               "name": "paid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5970,
-                              "src": "2981:4:12",
+                              "referencedDeclaration": 10124,
+                              "src": "2981:4:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                 "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                               }
                             },
-                            "id": 6226,
+                            "id": 10380,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6225,
+                              "id": 10379,
                               "name": "txHash",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6216,
-                              "src": "2986:6:12",
+                              "referencedDeclaration": 10370,
+                              "src": "2986:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes32",
                                 "typeString": "bytes32"
@@ -4317,21 +4317,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2981:12:12",
+                            "src": "2981:12:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                              "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                             }
                           },
-                          "id": 6227,
+                          "id": 10381,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "paid",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5950,
-                          "src": "2981:17:12",
+                          "referencedDeclaration": 10104,
+                          "src": "2981:17:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4350,21 +4350,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6223,
+                      "id": 10377,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2972:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2972:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6229,
+                    "id": 10383,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4372,15 +4372,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2972:27:12",
+                    "src": "2972:27:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6230,
+                  "id": 10384,
                   "nodeType": "ExpressionStatement",
-                  "src": "2972:27:12"
+                  "src": "2972:27:13"
                 },
                 {
                   "condition": {
@@ -4389,7 +4389,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6236,
+                    "id": 10390,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4400,26 +4400,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6231,
+                          "id": 10385,
                           "name": "paid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5970,
-                          "src": "3014:4:12",
+                          "referencedDeclaration": 10124,
+                          "src": "3014:4:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                            "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                             "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                           }
                         },
-                        "id": 6233,
+                        "id": 10387,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6232,
+                          "id": 10386,
                           "name": "txHash",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6216,
-                          "src": "3019:6:12",
+                          "referencedDeclaration": 10370,
+                          "src": "3019:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -4430,21 +4430,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3014:12:12",
+                        "src": "3014:12:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                          "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                         }
                       },
-                      "id": 6234,
+                      "id": 10388,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "commitTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5948,
-                      "src": "3014:21:12",
+                      "referencedDeclaration": 10102,
+                      "src": "3014:21:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4455,14 +4455,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 6235,
+                      "id": 10389,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3039:1:12",
+                      "src": "3039:1:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -4470,16 +4470,16 @@
                       },
                       "value": "0"
                     },
-                    "src": "3014:26:12",
+                    "src": "3014:26:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 6313,
+                    "id": 10467,
                     "nodeType": "Block",
-                    "src": "3309:284:12",
+                    "src": "3309:284:13",
                     "statements": [
                       {
                         "expression": {
@@ -4491,7 +4491,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 6277,
+                              "id": 10431,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4502,26 +4502,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 6271,
+                                    "id": 10425,
                                     "name": "paid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 5970,
-                                    "src": "3331:4:12",
+                                    "referencedDeclaration": 10124,
+                                    "src": "3331:4:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                       "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                     }
                                   },
-                                  "id": 6273,
+                                  "id": 10427,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 6272,
+                                    "id": 10426,
                                     "name": "txHash",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 6216,
-                                    "src": "3336:6:12",
+                                    "referencedDeclaration": 10370,
+                                    "src": "3336:6:13",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
@@ -4532,21 +4532,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "3331:12:12",
+                                  "src": "3331:12:13",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                    "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                     "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                                   }
                                 },
-                                "id": 6274,
+                                "id": 10428,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "keeper",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 5952,
-                                "src": "3331:19:12",
+                                "referencedDeclaration": 10106,
+                                "src": "3331:19:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -4558,18 +4558,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6275,
+                                  "id": 10429,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3354:3:12",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3354:3:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 6276,
+                                "id": 10430,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4577,13 +4577,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3354:10:12",
+                                "src": "3354:10:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "3331:33:12",
+                              "src": "3331:33:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -4597,21 +4597,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6270,
+                            "id": 10424,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3323:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3323:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6278,
+                          "id": 10432,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4619,15 +4619,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3323:42:12",
+                          "src": "3323:42:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6279,
+                        "id": 10433,
                         "nodeType": "ExpressionStatement",
-                        "src": "3323:42:12"
+                        "src": "3323:42:13"
                       },
                       {
                         "expression": {
@@ -4639,7 +4639,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 6289,
+                              "id": 10443,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4650,7 +4650,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 6286,
+                                "id": 10440,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4661,26 +4661,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 6281,
+                                      "id": 10435,
                                       "name": "paid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 5970,
-                                      "src": "3387:4:12",
+                                      "referencedDeclaration": 10124,
+                                      "src": "3387:4:13",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                         "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                       }
                                     },
-                                    "id": 6283,
+                                    "id": 10437,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 6282,
+                                      "id": 10436,
                                       "name": "txHash",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 6216,
-                                      "src": "3392:6:12",
+                                      "referencedDeclaration": 10370,
+                                      "src": "3392:6:13",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
@@ -4691,21 +4691,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "3387:12:12",
+                                    "src": "3387:12:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                      "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                       "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                                     }
                                   },
-                                  "id": 6284,
+                                  "id": 10438,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "commitTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 5948,
-                                  "src": "3387:21:12",
+                                  "referencedDeclaration": 10102,
+                                  "src": "3387:21:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -4715,18 +4715,18 @@
                                 "operator": "+",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 6285,
+                                  "id": 10439,
                                   "name": "freezingTime",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5972,
-                                  "src": "3411:12:12",
+                                  "referencedDeclaration": 10126,
+                                  "src": "3411:12:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "3387:36:12",
+                                "src": "3387:36:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -4738,18 +4738,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6287,
+                                  "id": 10441,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7759,
-                                  "src": "3427:5:12",
+                                  "referencedDeclaration": 11305,
+                                  "src": "3427:5:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 6288,
+                                "id": 10442,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4757,13 +4757,13 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3427:15:12",
+                                "src": "3427:15:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "3387:55:12",
+                              "src": "3387:55:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -4777,21 +4777,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6280,
+                            "id": 10434,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3379:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3379:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6290,
+                          "id": 10444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4799,15 +4799,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3379:64:12",
+                          "src": "3379:64:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6291,
+                        "id": 10445,
                         "nodeType": "ExpressionStatement",
-                        "src": "3379:64:12"
+                        "src": "3379:64:13"
                       },
                       {
                         "expression": {
@@ -4818,12 +4818,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 6295,
+                                  "id": 10449,
                                   "name": "_to",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6189,
-                                  "src": "3480:3:12",
+                                  "referencedDeclaration": 10343,
+                                  "src": "3480:3:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -4831,12 +4831,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 6296,
+                                  "id": 10450,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6191,
-                                  "src": "3485:6:12",
+                                  "referencedDeclaration": 10345,
+                                  "src": "3485:6:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -4856,32 +4856,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6293,
+                                  "id": 10447,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5937,
-                                  "src": "3465:5:12",
+                                  "referencedDeclaration": 10091,
+                                  "src": "3465:5:13",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_StandardToken_$7754",
+                                    "typeIdentifier": "t_contract$_StandardToken_$11300",
                                     "typeString": "contract StandardToken"
                                   }
                                 },
-                                "id": 6294,
+                                "id": 10448,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transfer",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 7419,
-                                "src": "3465:14:12",
+                                "referencedDeclaration": 10965,
+                                "src": "3465:14:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 6297,
+                              "id": 10451,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4889,7 +4889,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "3465:27:12",
+                              "src": "3465:27:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -4903,21 +4903,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6292,
+                            "id": 10446,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3457:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3457:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6298,
+                          "id": 10452,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4925,20 +4925,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3457:36:12",
+                          "src": "3457:36:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6299,
+                        "id": 10453,
                         "nodeType": "ExpressionStatement",
-                        "src": "3457:36:12"
+                        "src": "3457:36:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6305,
+                          "id": 10459,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4949,26 +4949,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6300,
+                                "id": 10454,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3507:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3507:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6302,
+                              "id": 10456,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6301,
+                                "id": 10455,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3512:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3512:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -4979,21 +4979,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3507:12:12",
+                              "src": "3507:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6303,
+                            "id": 10457,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "paid",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5950,
-                            "src": "3507:17:12",
+                            "referencedDeclaration": 10104,
+                            "src": "3507:17:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -5004,14 +5004,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 6304,
+                            "id": 10458,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3527:4:12",
+                            "src": "3527:4:13",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -5019,15 +5019,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "3507:24:12",
+                          "src": "3507:24:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 6306,
+                        "id": 10460,
                         "nodeType": "ExpressionStatement",
-                        "src": "3507:24:12"
+                        "src": "3507:24:13"
                       },
                       {
                         "eventCall": {
@@ -5035,12 +5035,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 6308,
+                              "id": 10462,
                               "name": "_to",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6189,
-                              "src": "3559:3:12",
+                              "referencedDeclaration": 10343,
+                              "src": "3559:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -5048,12 +5048,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6309,
+                              "id": 10463,
                               "name": "_txNumber",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6193,
-                              "src": "3564:9:12",
+                              "referencedDeclaration": 10347,
+                              "src": "3564:9:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5061,12 +5061,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6310,
+                              "id": 10464,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6191,
-                              "src": "3575:6:12",
+                              "referencedDeclaration": 10345,
+                              "src": "3575:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5088,18 +5088,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 6307,
+                            "id": 10461,
                             "name": "PayoutTx",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6021,
-                            "src": "3550:8:12",
+                            "referencedDeclaration": 10175,
+                            "src": "3550:8:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$__$",
                               "typeString": "function (address,uint256,uint256)"
                             }
                           },
-                          "id": 6311,
+                          "id": 10465,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5107,25 +5107,25 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3550:32:12",
+                          "src": "3550:32:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6312,
+                        "id": 10466,
                         "nodeType": "EmitStatement",
-                        "src": "3545:37:12"
+                        "src": "3545:37:13"
                       }
                     ]
                   },
-                  "id": 6314,
+                  "id": 10468,
                   "nodeType": "IfStatement",
-                  "src": "3010:583:12",
+                  "src": "3010:583:13",
                   "trueBody": {
-                    "id": 6269,
+                    "id": 10423,
                     "nodeType": "Block",
-                    "src": "3042:261:12",
+                    "src": "3042:261:13",
                     "statements": [
                       {
                         "expression": {
@@ -5138,18 +5138,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 6239,
+                                    "id": 10393,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "3105:3:12",
+                                    "referencedDeclaration": 11315,
+                                    "src": "3105:3:13",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 6240,
+                                  "id": 10394,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5157,7 +5157,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3105:10:12",
+                                  "src": "3105:10:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -5165,12 +5165,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 6241,
+                                  "id": 10395,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6191,
-                                  "src": "3117:6:12",
+                                  "referencedDeclaration": 10345,
+                                  "src": "3117:6:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -5188,18 +5188,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 6238,
+                                "id": 10392,
                                 "name": "underLimit",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6448,
-                                "src": "3094:10:12",
+                                "referencedDeclaration": 10602,
+                                "src": "3094:10:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,uint256) returns (bool)"
                                 }
                               },
-                              "id": 6242,
+                              "id": 10396,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5207,7 +5207,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "3094:30:12",
+                              "src": "3094:30:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -5221,21 +5221,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6237,
+                            "id": 10391,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3086:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3086:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6243,
+                          "id": 10397,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5243,20 +5243,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3086:39:12",
+                          "src": "3086:39:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6244,
+                        "id": 10398,
                         "nodeType": "ExpressionStatement",
-                        "src": "3086:39:12"
+                        "src": "3086:39:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6251,
+                          "id": 10405,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5267,26 +5267,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6245,
+                                "id": 10399,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3139:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3139:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6247,
+                              "id": 10401,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6246,
+                                "id": 10400,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3144:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3144:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -5297,21 +5297,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3139:12:12",
+                              "src": "3139:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6248,
+                            "id": 10402,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "commitTS",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5948,
-                            "src": "3139:21:12",
+                            "referencedDeclaration": 10102,
+                            "src": "3139:21:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -5323,18 +5323,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6249,
+                              "id": 10403,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "3163:5:12",
+                              "referencedDeclaration": 11305,
+                              "src": "3163:5:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 6250,
+                            "id": 10404,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -5342,26 +5342,26 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3163:15:12",
+                            "src": "3163:15:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3139:39:12",
+                          "src": "3139:39:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6252,
+                        "id": 10406,
                         "nodeType": "ExpressionStatement",
-                        "src": "3139:39:12"
+                        "src": "3139:39:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6259,
+                          "id": 10413,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5372,26 +5372,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6253,
+                                "id": 10407,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3192:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3192:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6255,
+                              "id": 10409,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6254,
+                                "id": 10408,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3197:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3197:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -5402,21 +5402,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3192:12:12",
+                              "src": "3192:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6256,
+                            "id": 10410,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "keeper",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5952,
-                            "src": "3192:19:12",
+                            "referencedDeclaration": 10106,
+                            "src": "3192:19:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5428,18 +5428,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6257,
+                              "id": 10411,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "3214:3:12",
+                              "referencedDeclaration": 11315,
+                              "src": "3214:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 6258,
+                            "id": 10412,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -5447,21 +5447,21 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3214:10:12",
+                            "src": "3214:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "3192:32:12",
+                          "src": "3192:32:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 6260,
+                        "id": 10414,
                         "nodeType": "ExpressionStatement",
-                        "src": "3192:32:12"
+                        "src": "3192:32:13"
                       },
                       {
                         "eventCall": {
@@ -5469,12 +5469,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 6262,
+                              "id": 10416,
                               "name": "_to",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6189,
-                              "src": "3252:3:12",
+                              "referencedDeclaration": 10343,
+                              "src": "3252:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -5482,12 +5482,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6263,
+                              "id": 10417,
                               "name": "_txNumber",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6193,
-                              "src": "3257:9:12",
+                              "referencedDeclaration": 10347,
+                              "src": "3257:9:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5495,12 +5495,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6264,
+                              "id": 10418,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6191,
-                              "src": "3268:6:12",
+                              "referencedDeclaration": 10345,
+                              "src": "3268:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5510,18 +5510,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6265,
+                                "id": 10419,
                                 "name": "block",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7759,
-                                "src": "3276:5:12",
+                                "referencedDeclaration": 11305,
+                                "src": "3276:5:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_block",
                                   "typeString": "block"
                                 }
                               },
-                              "id": 6266,
+                              "id": 10420,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5529,7 +5529,7 @@
                               "memberName": "timestamp",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3276:15:12",
+                              "src": "3276:15:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5555,18 +5555,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 6261,
+                            "id": 10415,
                             "name": "CommitTx",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6013,
-                            "src": "3243:8:12",
+                            "referencedDeclaration": 10167,
+                            "src": "3243:8:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$",
                               "typeString": "function (address,uint256,uint256,uint256)"
                             }
                           },
-                          "id": 6267,
+                          "id": 10421,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5574,15 +5574,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3243:49:12",
+                          "src": "3243:49:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6268,
+                        "id": 10422,
                         "nodeType": "EmitStatement",
-                        "src": "3238:54:12"
+                        "src": "3238:54:13"
                       }
                     ]
                   }
@@ -5590,7 +5590,7 @@
               ]
             },
             "documentation": null,
-            "id": 6316,
+            "id": 10470,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -5598,16 +5598,16 @@
             "name": "Payout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6194,
+              "id": 10348,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6189,
+                  "id": 10343,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2659:11:12",
+                  "scope": 10470,
+                  "src": "2659:11:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5615,10 +5615,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6188,
+                    "id": 10342,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2659:7:12",
+                    "src": "2659:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5629,11 +5629,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6191,
+                  "id": 10345,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2672:14:12",
+                  "scope": 10470,
+                  "src": "2672:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5641,10 +5641,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6190,
+                    "id": 10344,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2672:7:12",
+                    "src": "2672:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5655,11 +5655,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6193,
+                  "id": 10347,
                   "name": "_txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2688:17:12",
+                  "scope": 10470,
+                  "src": "2688:17:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5667,10 +5667,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6192,
+                    "id": 10346,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2688:7:12",
+                    "src": "2688:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5680,43 +5680,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2658:48:12"
+              "src": "2658:48:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6195,
+              "id": 10349,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2714:0:12"
+              "src": "2714:0:13"
             },
-            "scope": 6488,
-            "src": "2643:956:12",
+            "scope": 10642,
+            "src": "2643:956:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6327,
+              "id": 10481,
               "nodeType": "Block",
-              "src": "3670:45:12",
+              "src": "3670:45:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6325,
+                    "id": 10479,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6323,
+                      "id": 10477,
                       "name": "freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5972,
-                      "src": "3680:12:12",
+                      "referencedDeclaration": 10126,
+                      "src": "3680:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5726,68 +5726,68 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6324,
+                      "id": 10478,
                       "name": "_freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6318,
-                      "src": "3695:13:12",
+                      "referencedDeclaration": 10472,
+                      "src": "3695:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3680:28:12",
+                    "src": "3680:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6326,
+                  "id": 10480,
                   "nodeType": "ExpressionStatement",
-                  "src": "3680:28:12"
+                  "src": "3680:28:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6328,
+            "id": 10482,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6321,
+                "id": 10475,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6320,
+                  "id": 10474,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "3660:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "3660:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3660:9:12"
+                "src": "3660:9:13"
               }
             ],
             "name": "SetFreezingTime",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6319,
+              "id": 10473,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6318,
+                  "id": 10472,
                   "name": "_freezingTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6328,
-                  "src": "3630:21:12",
+                  "scope": 10482,
+                  "src": "3630:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5795,10 +5795,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6317,
+                    "id": 10471,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3630:7:12",
+                    "src": "3630:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5808,50 +5808,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3629:23:12"
+              "src": "3629:23:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6322,
+              "id": 10476,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3670:0:12"
+              "src": "3670:0:13"
             },
-            "scope": 6488,
-            "src": "3605:110:12",
+            "scope": 10642,
+            "src": "3605:110:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6335,
+              "id": 10489,
               "nodeType": "Block",
-              "src": "3778:36:12",
+              "src": "3778:36:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6333,
+                    "id": 10487,
                     "name": "freezingTime",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5972,
-                    "src": "3795:12:12",
+                    "referencedDeclaration": 10126,
+                    "src": "3795:12:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6332,
-                  "id": 6334,
+                  "functionReturnParameters": 10486,
+                  "id": 10488,
                   "nodeType": "Return",
-                  "src": "3788:19:12"
+                  "src": "3788:19:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6336,
+            "id": 10490,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -5859,23 +5859,23 @@
             "name": "GetFreezingTime",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6329,
+              "id": 10483,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3745:2:12"
+              "src": "3745:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6332,
+              "id": 10486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6331,
+                  "id": 10485,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6336,
-                  "src": "3769:7:12",
+                  "scope": 10490,
+                  "src": "3769:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5883,10 +5883,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6330,
+                    "id": 10484,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3769:7:12",
+                    "src": "3769:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5896,36 +5896,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3768:9:12"
+              "src": "3768:9:13"
             },
-            "scope": 6488,
-            "src": "3721:93:12",
+            "scope": 10642,
+            "src": "3721:93:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6351,
+              "id": 10505,
               "nodeType": "Block",
-              "src": "3881:80:12",
+              "src": "3881:80:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6345,
+                    "id": 10499,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6343,
+                      "id": 10497,
                       "name": "commission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5963,
-                      "src": "3891:10:12",
+                      "referencedDeclaration": 10117,
+                      "src": "3891:10:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5935,26 +5935,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6344,
+                      "id": 10498,
                       "name": "_commission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6338,
-                      "src": "3904:11:12",
+                      "referencedDeclaration": 10492,
+                      "src": "3904:11:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3891:24:12",
+                    "src": "3891:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6346,
+                  "id": 10500,
                   "nodeType": "ExpressionStatement",
-                  "src": "3891:24:12"
+                  "src": "3891:24:13"
                 },
                 {
                   "expression": {
@@ -5962,12 +5962,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6348,
+                        "id": 10502,
                         "name": "commission",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5963,
-                        "src": "3943:10:12",
+                        "referencedDeclaration": 10117,
+                        "src": "3943:10:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5981,18 +5981,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6347,
+                      "id": 10501,
                       "name": "CommissionChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6043,
-                      "src": "3925:17:12",
+                      "referencedDeclaration": 10197,
+                      "src": "3925:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 6349,
+                    "id": 10503,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6000,57 +6000,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3925:29:12",
+                    "src": "3925:29:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6350,
+                  "id": 10504,
                   "nodeType": "ExpressionStatement",
-                  "src": "3925:29:12"
+                  "src": "3925:29:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6352,
+            "id": 10506,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6341,
+                "id": 10495,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6340,
+                  "id": 10494,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "3871:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "3871:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3871:9:12"
+                "src": "3871:9:13"
               }
             ],
             "name": "SetCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6339,
+              "id": 10493,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6338,
+                  "id": 10492,
                   "name": "_commission",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6352,
-                  "src": "3843:19:12",
+                  "scope": 10506,
+                  "src": "3843:19:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6058,10 +6058,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6337,
+                    "id": 10491,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3843:7:12",
+                    "src": "3843:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6071,50 +6071,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3842:21:12"
+              "src": "3842:21:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6342,
+              "id": 10496,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3881:0:12"
+              "src": "3881:0:13"
             },
-            "scope": 6488,
-            "src": "3820:141:12",
+            "scope": 10642,
+            "src": "3820:141:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6359,
+              "id": 10513,
               "nodeType": "Block",
-              "src": "4021:34:12",
+              "src": "4022:34:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6357,
+                    "id": 10511,
                     "name": "commission",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5963,
-                    "src": "4038:10:12",
+                    "referencedDeclaration": 10117,
+                    "src": "4039:10:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6356,
-                  "id": 6358,
+                  "functionReturnParameters": 10510,
+                  "id": 10512,
                   "nodeType": "Return",
-                  "src": "4031:17:12"
+                  "src": "4032:17:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6360,
+            "id": 10514,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6122,23 +6122,23 @@
             "name": "GetCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6353,
+              "id": 10507,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3989:2:12"
+              "src": "3989:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6356,
+              "id": 10510,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6355,
+                  "id": 10509,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6360,
-                  "src": "4013:7:12",
+                  "scope": 10514,
+                  "src": "4013:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6146,10 +6146,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6354,
+                    "id": 10508,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4013:7:12",
+                    "src": "4013:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6159,19 +6159,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4012:9:12"
+              "src": "4012:9:13"
             },
-            "scope": 6488,
-            "src": "3967:88:12",
+            "scope": 10642,
+            "src": "3967:89:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6377,
+              "id": 10531,
               "nodeType": "Block",
-              "src": "4108:97:12",
+              "src": "4109:97:13",
               "statements": [
                 {
                   "expression": {
@@ -6182,12 +6182,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6368,
+                            "id": 10522,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "4141:5:12",
+                            "referencedDeclaration": 10800,
+                            "src": "4142:5:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -6195,12 +6195,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6369,
+                            "id": 10523,
                             "name": "commissionBalance",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5966,
-                            "src": "4148:17:12",
+                            "referencedDeclaration": 10120,
+                            "src": "4149:17:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6220,32 +6220,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6366,
+                            "id": 10520,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "4126:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "4127:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6367,
+                          "id": 10521,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "4126:14:12",
+                          "referencedDeclaration": 10965,
+                          "src": "4127:14:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6370,
+                        "id": 10524,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6253,7 +6253,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "4126:40:12",
+                        "src": "4127:40:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6267,21 +6267,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6365,
+                      "id": 10519,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4118:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "4119:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6371,
+                    "id": 10525,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6289,32 +6289,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4118:49:12",
+                    "src": "4119:49:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6372,
+                  "id": 10526,
                   "nodeType": "ExpressionStatement",
-                  "src": "4118:49:12"
+                  "src": "4119:49:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6375,
+                    "id": 10529,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6373,
+                      "id": 10527,
                       "name": "commissionBalance",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5966,
-                      "src": "4177:17:12",
+                      "referencedDeclaration": 10120,
+                      "src": "4178:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6325,14 +6325,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 6374,
+                      "id": 10528,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4197:1:12",
+                      "src": "4198:1:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -6340,70 +6340,70 @@
                       },
                       "value": "0"
                     },
-                    "src": "4177:21:12",
+                    "src": "4178:21:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6376,
+                  "id": 10530,
                   "nodeType": "ExpressionStatement",
-                  "src": "4177:21:12"
+                  "src": "4178:21:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6378,
+            "id": 10532,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6363,
+                "id": 10517,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6362,
+                  "id": 10516,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4098:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "4099:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4098:9:12"
+                "src": "4099:9:13"
               }
             ],
             "name": "TransferCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6361,
+              "id": 10515,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4088:2:12"
+              "src": "4089:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6364,
+              "id": 10518,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4108:0:12"
+              "src": "4109:0:13"
             },
-            "scope": 6488,
-            "src": "4061:144:12",
+            "scope": 10642,
+            "src": "4062:144:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6447,
+              "id": 10601,
               "nodeType": "Block",
-              "src": "4288:655:12",
+              "src": "4289:655:13",
               "statements": [
                 {
                   "condition": {
@@ -6412,7 +6412,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6393,
+                    "id": 10547,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6422,18 +6422,18 @@
                       "arguments": [],
                       "expression": {
                         "argumentTypes": [],
-                        "id": 6387,
+                        "id": 10541,
                         "name": "today",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6459,
-                        "src": "4377:5:12",
+                        "referencedDeclaration": 10613,
+                        "src": "4378:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                           "typeString": "function () view returns (uint256)"
                         }
                       },
-                      "id": 6388,
+                      "id": 10542,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6441,7 +6441,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4377:7:12",
+                      "src": "4378:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6455,26 +6455,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6389,
+                          "id": 10543,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "4387:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "4388:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6391,
+                        "id": 10545,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6390,
+                          "id": 10544,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6380,
-                          "src": "4395:7:12",
+                          "referencedDeclaration": 10534,
+                          "src": "4396:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6485,45 +6485,45 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4387:16:12",
+                        "src": "4388:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6392,
+                      "id": 10546,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "lastDay",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5941,
-                      "src": "4387:24:12",
+                      "referencedDeclaration": 10095,
+                      "src": "4388:24:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4377:34:12",
+                    "src": "4378:34:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 6410,
+                  "id": 10564,
                   "nodeType": "IfStatement",
-                  "src": "4373:144:12",
+                  "src": "4374:144:13",
                   "trueBody": {
-                    "id": 6409,
+                    "id": 10563,
                     "nodeType": "Block",
-                    "src": "4413:104:12",
+                    "src": "4414:104:13",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6399,
+                          "id": 10553,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6534,26 +6534,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6394,
+                                "id": 10548,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4427:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4428:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6396,
+                              "id": 10550,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6395,
+                                "id": 10549,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4435:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4436:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6564,21 +6564,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4427:16:12",
+                              "src": "4428:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6397,
+                            "id": 10551,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "spentToday",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5943,
-                            "src": "4427:27:12",
+                            "referencedDeclaration": 10097,
+                            "src": "4428:27:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6589,14 +6589,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 6398,
+                            "id": 10552,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4457:1:12",
+                            "src": "4458:1:13",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -6604,20 +6604,20 @@
                             },
                             "value": "0"
                           },
-                          "src": "4427:31:12",
+                          "src": "4428:31:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6400,
+                        "id": 10554,
                         "nodeType": "ExpressionStatement",
-                        "src": "4427:31:12"
+                        "src": "4428:31:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6407,
+                          "id": 10561,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6628,26 +6628,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6401,
+                                "id": 10555,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4472:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4473:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6403,
+                              "id": 10557,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6402,
+                                "id": 10556,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4480:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4481:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6658,21 +6658,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4472:16:12",
+                              "src": "4473:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6404,
+                            "id": 10558,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "lastDay",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5941,
-                            "src": "4472:24:12",
+                            "referencedDeclaration": 10095,
+                            "src": "4473:24:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6685,18 +6685,18 @@
                             "arguments": [],
                             "expression": {
                               "argumentTypes": [],
-                              "id": 6405,
+                              "id": 10559,
                               "name": "today",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6459,
-                              "src": "4499:5:12",
+                              "referencedDeclaration": 10613,
+                              "src": "4500:5:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                                 "typeString": "function () view returns (uint256)"
                               }
                             },
-                            "id": 6406,
+                            "id": 10560,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6704,21 +6704,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "4499:7:12",
+                            "src": "4500:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "4472:34:12",
+                          "src": "4473:34:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6408,
+                        "id": 10562,
                         "nodeType": "ExpressionStatement",
-                        "src": "4472:34:12"
+                        "src": "4473:34:13"
                       }
                     ]
                   }
@@ -6730,7 +6730,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 6433,
+                    "id": 10587,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6741,7 +6741,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6421,
+                      "id": 10575,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6752,7 +6752,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6416,
+                        "id": 10570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6763,26 +6763,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6411,
+                              "id": 10565,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "4682:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "4683:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6413,
+                            "id": 10567,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6412,
+                              "id": 10566,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6380,
-                              "src": "4690:7:12",
+                              "referencedDeclaration": 10534,
+                              "src": "4691:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6793,21 +6793,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "4682:16:12",
+                            "src": "4683:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6414,
+                          "id": 10568,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "spentToday",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5943,
-                          "src": "4682:27:12",
+                          "referencedDeclaration": 10097,
+                          "src": "4683:27:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6817,18 +6817,18 @@
                         "operator": "+",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6415,
+                          "id": 10569,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6382,
-                          "src": "4712:6:12",
+                          "referencedDeclaration": 10536,
+                          "src": "4713:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4682:36:12",
+                        "src": "4683:36:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6842,26 +6842,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 6417,
+                            "id": 10571,
                             "name": "keepers",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5957,
-                            "src": "4722:7:12",
+                            "referencedDeclaration": 10111,
+                            "src": "4723:7:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                             }
                           },
-                          "id": 6419,
+                          "id": 10573,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 6418,
+                            "id": 10572,
                             "name": "_keeper",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6380,
-                            "src": "4730:7:12",
+                            "referencedDeclaration": 10534,
+                            "src": "4731:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -6872,27 +6872,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4722:16:12",
+                          "src": "4723:16:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                            "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                             "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                           }
                         },
-                        "id": 6420,
+                        "id": 10574,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "spentToday",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 5943,
-                        "src": "4722:27:12",
+                        "referencedDeclaration": 10097,
+                        "src": "4723:27:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "4682:67:12",
+                      "src": "4683:67:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -6906,7 +6906,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6432,
+                      "id": 10586,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6917,7 +6917,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6427,
+                        "id": 10581,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6928,26 +6928,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6422,
+                              "id": 10576,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "4761:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "4762:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6424,
+                            "id": 10578,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6423,
+                              "id": 10577,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6380,
-                              "src": "4769:7:12",
+                              "referencedDeclaration": 10534,
+                              "src": "4770:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6958,21 +6958,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "4761:16:12",
+                            "src": "4762:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6425,
+                          "id": 10579,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "spentToday",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5943,
-                          "src": "4761:27:12",
+                          "referencedDeclaration": 10097,
+                          "src": "4762:27:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6982,18 +6982,18 @@
                         "operator": "+",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6426,
+                          "id": 10580,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6382,
-                          "src": "4791:6:12",
+                          "referencedDeclaration": 10536,
+                          "src": "4792:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4761:36:12",
+                        "src": "4762:36:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7007,26 +7007,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 6428,
+                            "id": 10582,
                             "name": "keepers",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5957,
-                            "src": "4801:7:12",
+                            "referencedDeclaration": 10111,
+                            "src": "4802:7:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                             }
                           },
-                          "id": 6430,
+                          "id": 10584,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 6429,
+                            "id": 10583,
                             "name": "_keeper",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6380,
-                            "src": "4809:7:12",
+                            "referencedDeclaration": 10534,
+                            "src": "4810:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -7037,51 +7037,51 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4801:16:12",
+                          "src": "4802:16:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                            "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                             "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                           }
                         },
-                        "id": 6431,
+                        "id": 10585,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dayLimit",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 5939,
-                        "src": "4801:25:12",
+                        "referencedDeclaration": 10093,
+                        "src": "4802:25:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "4761:65:12",
+                      "src": "4762:65:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "4682:144:12",
+                    "src": "4683:144:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 6444,
+                  "id": 10598,
                   "nodeType": "IfStatement",
-                  "src": "4678:237:12",
+                  "src": "4679:237:13",
                   "trueBody": {
-                    "id": 6443,
+                    "id": 10597,
                     "nodeType": "Block",
-                    "src": "4828:87:12",
+                    "src": "4829:87:13",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6439,
+                          "id": 10593,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7092,26 +7092,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6434,
+                                "id": 10588,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4842:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4843:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6436,
+                              "id": 10590,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6435,
+                                "id": 10589,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4850:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4851:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -7122,21 +7122,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4842:16:12",
+                              "src": "4843:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6437,
+                            "id": 10591,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "spentToday",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5943,
-                            "src": "4842:27:12",
+                            "referencedDeclaration": 10097,
+                            "src": "4843:27:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -7146,39 +7146,39 @@
                           "operator": "+=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 6438,
+                            "id": 10592,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6382,
-                            "src": "4873:6:12",
+                            "referencedDeclaration": 10536,
+                            "src": "4874:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "4842:37:12",
+                          "src": "4843:37:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6440,
+                        "id": 10594,
                         "nodeType": "ExpressionStatement",
-                        "src": "4842:37:12"
+                        "src": "4843:37:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 6441,
+                          "id": 10595,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4900:4:12",
+                          "src": "4901:4:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -7186,10 +7186,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 6386,
-                        "id": 6442,
+                        "functionReturnParameters": 10540,
+                        "id": 10596,
                         "nodeType": "Return",
-                        "src": "4893:11:12"
+                        "src": "4894:11:13"
                       }
                     ]
                   }
@@ -7198,14 +7198,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "66616c7365",
-                    "id": 6445,
+                    "id": 10599,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4931:5:12",
+                    "src": "4932:5:13",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -7213,15 +7213,15 @@
                     },
                     "value": "false"
                   },
-                  "functionReturnParameters": 6386,
-                  "id": 6446,
+                  "functionReturnParameters": 10540,
+                  "id": 10600,
                   "nodeType": "Return",
-                  "src": "4924:12:12"
+                  "src": "4925:12:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6448,
+            "id": 10602,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -7229,16 +7229,16 @@
             "name": "underLimit",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6383,
+              "id": 10537,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6380,
+                  "id": 10534,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4231:15:12",
+                  "scope": 10602,
+                  "src": "4232:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7246,10 +7246,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6379,
+                    "id": 10533,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4231:7:12",
+                    "src": "4232:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -7260,11 +7260,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6382,
+                  "id": 10536,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4248:14:12",
+                  "scope": 10602,
+                  "src": "4249:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7272,10 +7272,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6381,
+                    "id": 10535,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4248:7:12",
+                    "src": "4249:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7285,20 +7285,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4230:33:12"
+              "src": "4231:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6386,
+              "id": 10540,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6385,
+                  "id": 10539,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4282:4:12",
+                  "scope": 10602,
+                  "src": "4283:4:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7306,10 +7306,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 6384,
+                    "id": 10538,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4282:4:12",
+                    "src": "4283:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -7319,19 +7319,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4281:6:12"
+              "src": "4282:6:13"
             },
-            "scope": 6488,
-            "src": "4211:732:12",
+            "scope": 10642,
+            "src": "4212:732:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 6458,
+              "id": 10612,
               "nodeType": "Block",
-              "src": "4997:110:12",
+              "src": "4998:110:13",
               "statements": [
                 {
                   "expression": {
@@ -7340,7 +7340,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6456,
+                    "id": 10610,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7349,18 +7349,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 6453,
+                        "id": 10607,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "5076:5:12",
+                        "referencedDeclaration": 11305,
+                        "src": "5077:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 6454,
+                      "id": 10608,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -7368,7 +7368,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5076:15:12",
+                      "src": "5077:15:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -7379,14 +7379,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 6455,
+                      "id": 10609,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "5094:6:12",
+                      "src": "5095:6:13",
                       "subdenomination": "days",
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_86400_by_1",
@@ -7394,21 +7394,21 @@
                       },
                       "value": "1"
                     },
-                    "src": "5076:24:12",
+                    "src": "5077:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6452,
-                  "id": 6457,
+                  "functionReturnParameters": 10606,
+                  "id": 10611,
                   "nodeType": "Return",
-                  "src": "5069:31:12"
+                  "src": "5070:31:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6459,
+            "id": 10613,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -7416,23 +7416,23 @@
             "name": "today",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6449,
+              "id": 10603,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4963:2:12"
+              "src": "4964:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6452,
+              "id": 10606,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6451,
+                  "id": 10605,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6459,
-                  "src": "4988:7:12",
+                  "scope": 10613,
+                  "src": "4989:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7440,10 +7440,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6450,
+                    "id": 10604,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4988:7:12",
+                    "src": "4989:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7453,19 +7453,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4987:9:12"
+              "src": "4988:9:13"
             },
-            "scope": 6488,
-            "src": "4949:158:12",
+            "scope": 10642,
+            "src": "4950:158:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "private"
           },
           {
             "body": {
-              "id": 6486,
+              "id": 10640,
               "nodeType": "Block",
-              "src": "5146:204:12",
+              "src": "5147:204:13",
               "statements": [
                 {
                   "expression": {
@@ -7476,12 +7476,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6467,
+                            "id": 10621,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "5179:5:12",
+                            "referencedDeclaration": 10800,
+                            "src": "5180:5:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -7495,14 +7495,14 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 6471,
+                                    "id": 10625,
                                     "name": "this",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7800,
-                                    "src": "5210:4:12",
+                                    "referencedDeclaration": 11348,
+                                    "src": "5211:4:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                                       "typeString": "contract SimpleGatekeeperWithLimit"
                                     }
                                   }
@@ -7510,24 +7510,24 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                                       "typeString": "contract SimpleGatekeeperWithLimit"
                                     }
                                   ],
-                                  "id": 6470,
+                                  "id": 10624,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "lValueRequested": false,
                                   "nodeType": "ElementaryTypeNameExpression",
-                                  "src": "5202:7:12",
+                                  "src": "5203:7:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_type$_t_address_$",
                                     "typeString": "type(address)"
                                   },
                                   "typeName": "address"
                                 },
-                                "id": 6472,
+                                "id": 10626,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -7535,7 +7535,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "5202:13:12",
+                                "src": "5203:13:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -7551,32 +7551,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6468,
+                                "id": 10622,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5937,
-                                "src": "5186:5:12",
+                                "referencedDeclaration": 10091,
+                                "src": "5187:5:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_StandardToken_$7754",
+                                  "typeIdentifier": "t_contract$_StandardToken_$11300",
                                   "typeString": "contract StandardToken"
                                 }
                               },
-                              "id": 6469,
+                              "id": 10623,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "5186:15:12",
+                              "referencedDeclaration": 10977,
+                              "src": "5187:15:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 6473,
+                            "id": 10627,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -7584,7 +7584,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "5186:30:12",
+                            "src": "5187:30:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -7604,32 +7604,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6465,
+                            "id": 10619,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "5164:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "5165:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6466,
+                          "id": 10620,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "5164:14:12",
+                          "referencedDeclaration": 10965,
+                          "src": "5165:14:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6474,
+                        "id": 10628,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7637,7 +7637,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5164:53:12",
+                        "src": "5165:53:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7651,21 +7651,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6464,
+                      "id": 10618,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5156:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "5157:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6475,
+                    "id": 10629,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7673,15 +7673,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5156:62:12",
+                    "src": "5157:62:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6476,
+                  "id": 10630,
                   "nodeType": "ExpressionStatement",
-                  "src": "5156:62:12"
+                  "src": "5157:62:13"
                 },
                 {
                   "eventCall": {
@@ -7691,18 +7691,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6478,
+                          "id": 10632,
                           "name": "block",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7759,
-                          "src": "5241:5:12",
+                          "referencedDeclaration": 11305,
+                          "src": "5242:5:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_block",
                             "typeString": "block"
                           }
                         },
-                        "id": 6479,
+                        "id": 10633,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7710,7 +7710,7 @@
                         "memberName": "timestamp",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5241:15:12",
+                        "src": "5242:15:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7724,18 +7724,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6477,
+                      "id": 10631,
                       "name": "Suicide",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6025,
-                      "src": "5233:7:12",
+                      "referencedDeclaration": 10179,
+                      "src": "5234:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 6480,
+                    "id": 10634,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7743,15 +7743,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5233:24:12",
+                    "src": "5234:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6481,
+                  "id": 10635,
                   "nodeType": "EmitStatement",
-                  "src": "5228:29:12"
+                  "src": "5229:29:13"
                 },
                 {
                   "expression": {
@@ -7759,12 +7759,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6483,
+                        "id": 10637,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "5337:5:12",
+                        "referencedDeclaration": 10800,
+                        "src": "5338:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -7778,18 +7778,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6482,
+                      "id": 10636,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "5324:12:12",
+                      "referencedDeclaration": 11323,
+                      "src": "5325:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6484,
+                    "id": 10638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7797,84 +7797,84 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5324:19:12",
+                    "src": "5325:19:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6485,
+                  "id": 10639,
                   "nodeType": "ExpressionStatement",
-                  "src": "5324:19:12"
+                  "src": "5325:19:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6487,
+            "id": 10641,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6462,
+                "id": 10616,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6461,
+                  "id": 10615,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "5136:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "5137:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5136:9:12"
+                "src": "5137:9:13"
               }
             ],
             "name": "kill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6460,
+              "id": 10614,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5126:2:12"
+              "src": "5127:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6463,
+              "id": 10617,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5146:0:12"
+              "src": "5147:0:13"
             },
-            "scope": 6488,
-            "src": "5113:237:12",
+            "scope": 10642,
+            "src": "5114:237:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 6489,
-        "src": "157:5196:12"
+        "scope": 10643,
+        "src": "157:5197:13"
       }
     ],
-    "src": "0:5354:12"
+    "src": "0:5355:13"
   },
   "legacyAST": {
     "absolutePath": "contracts/SimpleGatekeeperWithLimit.sol",
     "exportedSymbols": {
       "SimpleGatekeeperWithLimit": [
-        6488
+        10642
       ]
     },
-    "id": 6489,
+    "id": 10643,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 5928,
+        "id": 10082,
         "literals": [
           "solidity",
           "^",
@@ -7882,27 +7882,27 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:12"
+        "src": "0:24:13"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 5929,
+        "id": 10083,
         "nodeType": "ImportDirective",
-        "scope": 6489,
-        "sourceUnit": 7755,
-        "src": "27:67:12",
+        "scope": 10643,
+        "sourceUnit": 11301,
+        "src": "27:67:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 5930,
+        "id": 10084,
         "nodeType": "ImportDirective",
-        "scope": 6489,
-        "sourceUnit": 7337,
-        "src": "95:59:12",
+        "scope": 10643,
+        "sourceUnit": 10883,
+        "src": "95:59:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -7912,56 +7912,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 5931,
+              "id": 10085,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7336,
-              "src": "195:7:12",
+              "referencedDeclaration": 10882,
+              "src": "195:7:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$7336",
+                "typeIdentifier": "t_contract$_Ownable_$10882",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 5932,
+            "id": 10086,
             "nodeType": "InheritanceSpecifier",
-            "src": "195:7:12"
+            "src": "195:7:13"
           }
         ],
         "contractDependencies": [
-          7336
+          10882
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 6488,
+        "id": 10642,
         "linearizedBaseContracts": [
-          6488,
-          7336
+          10642,
+          10882
         ],
         "name": "SimpleGatekeeperWithLimit",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 5935,
+            "id": 10089,
             "libraryName": {
               "contractScope": null,
-              "id": 5933,
+              "id": 10087,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7250,
-              "src": "216:8:12",
+              "referencedDeclaration": 10796,
+              "src": "216:8:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$7250",
+                "typeIdentifier": "t_contract$_SafeMath_$10796",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "210:27:12",
+            "src": "210:27:13",
             "typeName": {
-              "id": 5934,
+              "id": 10088,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "229:7:12",
+              "src": "229:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -7970,26 +7970,26 @@
           },
           {
             "constant": false,
-            "id": 5937,
+            "id": 10091,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "243:19:12",
+            "scope": 10642,
+            "src": "243:19:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_StandardToken_$7754",
+              "typeIdentifier": "t_contract$_StandardToken_$11300",
               "typeString": "contract StandardToken"
             },
             "typeName": {
               "contractScope": null,
-              "id": 5936,
+              "id": 10090,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7754,
-              "src": "243:13:12",
+              "referencedDeclaration": 11300,
+              "src": "243:13:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$7754",
+                "typeIdentifier": "t_contract$_StandardToken_$11300",
                 "typeString": "contract StandardToken"
               }
             },
@@ -7998,15 +7998,15 @@
           },
           {
             "canonicalName": "SimpleGatekeeperWithLimit.Keeper",
-            "id": 5946,
+            "id": 10100,
             "members": [
               {
                 "constant": false,
-                "id": 5939,
+                "id": 10093,
                 "name": "dayLimit",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "293:16:12",
+                "scope": 10100,
+                "src": "293:16:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8014,10 +8014,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5938,
+                  "id": 10092,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "293:7:12",
+                  "src": "293:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8028,11 +8028,11 @@
               },
               {
                 "constant": false,
-                "id": 5941,
+                "id": 10095,
                 "name": "lastDay",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "319:15:12",
+                "scope": 10100,
+                "src": "319:15:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8040,10 +8040,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5940,
+                  "id": 10094,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "319:7:12",
+                  "src": "319:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8054,11 +8054,11 @@
               },
               {
                 "constant": false,
-                "id": 5943,
+                "id": 10097,
                 "name": "spentToday",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "344:18:12",
+                "scope": 10100,
+                "src": "344:18:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8066,10 +8066,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5942,
+                  "id": 10096,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "344:7:12",
+                  "src": "344:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8080,11 +8080,11 @@
               },
               {
                 "constant": false,
-                "id": 5945,
+                "id": 10099,
                 "name": "frozen",
                 "nodeType": "VariableDeclaration",
-                "scope": 5946,
-                "src": "372:11:12",
+                "scope": 10100,
+                "src": "372:11:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8092,10 +8092,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 5944,
+                  "id": 10098,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "372:4:12",
+                  "src": "372:4:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -8107,21 +8107,21 @@
             ],
             "name": "Keeper",
             "nodeType": "StructDefinition",
-            "scope": 6488,
-            "src": "269:121:12",
+            "scope": 10642,
+            "src": "269:121:13",
             "visibility": "public"
           },
           {
             "canonicalName": "SimpleGatekeeperWithLimit.TransactionState",
-            "id": 5953,
+            "id": 10107,
             "members": [
               {
                 "constant": false,
-                "id": 5948,
+                "id": 10102,
                 "name": "commitTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "430:16:12",
+                "scope": 10107,
+                "src": "430:16:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8129,10 +8129,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 5947,
+                  "id": 10101,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "430:7:12",
+                  "src": "430:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -8143,11 +8143,11 @@
               },
               {
                 "constant": false,
-                "id": 5950,
+                "id": 10104,
                 "name": "paid",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "456:9:12",
+                "scope": 10107,
+                "src": "456:9:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8155,10 +8155,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 5949,
+                  "id": 10103,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "456:4:12",
+                  "src": "456:4:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -8169,11 +8169,11 @@
               },
               {
                 "constant": false,
-                "id": 5952,
+                "id": 10106,
                 "name": "keeper",
                 "nodeType": "VariableDeclaration",
-                "scope": 5953,
-                "src": "475:14:12",
+                "scope": 10107,
+                "src": "475:14:13",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -8181,10 +8181,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 5951,
+                  "id": 10105,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "475:7:12",
+                  "src": "475:7:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -8196,50 +8196,50 @@
             ],
             "name": "TransactionState",
             "nodeType": "StructDefinition",
-            "scope": 6488,
-            "src": "396:100:12",
+            "scope": 10642,
+            "src": "396:100:13",
             "visibility": "public"
           },
           {
             "constant": false,
-            "id": 5957,
+            "id": 10111,
             "name": "keepers",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "502:41:12",
+            "scope": 10642,
+            "src": "502:41:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper)"
             },
             "typeName": {
-              "id": 5956,
+              "id": 10110,
               "keyType": {
-                "id": 5954,
+                "id": 10108,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "510:7:12",
+                "src": "510:7:13",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "502:26:12",
+              "src": "502:26:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 5955,
+                "id": 10109,
                 "name": "Keeper",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 5946,
-                "src": "521:6:12",
+                "referencedDeclaration": 10100,
+                "src": "521:6:13",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Keeper_$5946_storage_ptr",
+                  "typeIdentifier": "t_struct$_Keeper_$10100_storage_ptr",
                   "typeString": "struct SimpleGatekeeperWithLimit.Keeper"
                 }
               }
@@ -8249,11 +8249,11 @@
           },
           {
             "constant": false,
-            "id": 5960,
+            "id": 10114,
             "name": "transactionAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "550:36:12",
+            "scope": 10642,
+            "src": "550:36:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8261,10 +8261,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5958,
+              "id": 10112,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "550:7:12",
+              "src": "550:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -8273,14 +8273,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5959,
+              "id": 10113,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "585:1:12",
+              "src": "585:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -8292,11 +8292,11 @@
           },
           {
             "constant": false,
-            "id": 5963,
+            "id": 10117,
             "name": "commission",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "593:29:12",
+            "scope": 10642,
+            "src": "593:29:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8304,10 +8304,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5961,
+              "id": 10115,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "593:7:12",
+              "src": "593:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -8316,14 +8316,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5962,
+              "id": 10116,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "621:1:12",
+              "src": "621:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -8335,11 +8335,11 @@
           },
           {
             "constant": false,
-            "id": 5966,
+            "id": 10120,
             "name": "commissionBalance",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "629:36:12",
+            "scope": 10642,
+            "src": "629:36:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8347,10 +8347,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5964,
+              "id": 10118,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "629:7:12",
+              "src": "629:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -8359,14 +8359,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 5965,
+              "id": 10119,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "664:1:12",
+              "src": "664:1:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -8378,44 +8378,44 @@
           },
           {
             "constant": false,
-            "id": 5970,
+            "id": 10124,
             "name": "paid",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "672:48:12",
+            "scope": 10642,
+            "src": "672:48:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+              "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
               "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState)"
             },
             "typeName": {
-              "id": 5969,
+              "id": 10123,
               "keyType": {
-                "id": 5967,
+                "id": 10121,
                 "name": "bytes32",
                 "nodeType": "ElementaryTypeName",
-                "src": "680:7:12",
+                "src": "680:7:13",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bytes32",
                   "typeString": "bytes32"
                 }
               },
               "nodeType": "Mapping",
-              "src": "672:36:12",
+              "src": "672:36:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                 "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 5968,
+                "id": 10122,
                 "name": "TransactionState",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 5953,
-                "src": "691:16:12",
+                "referencedDeclaration": 10107,
+                "src": "691:16:13",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_TransactionState_$5953_storage_ptr",
+                  "typeIdentifier": "t_struct$_TransactionState_$10107_storage_ptr",
                   "typeString": "struct SimpleGatekeeperWithLimit.TransactionState"
                 }
               }
@@ -8425,11 +8425,11 @@
           },
           {
             "constant": false,
-            "id": 5972,
+            "id": 10126,
             "name": "freezingTime",
             "nodeType": "VariableDeclaration",
-            "scope": 6488,
-            "src": "727:20:12",
+            "scope": 10642,
+            "src": "727:20:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -8437,10 +8437,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 5971,
+              "id": 10125,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "727:7:12",
+              "src": "727:7:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -8451,28 +8451,28 @@
           },
           {
             "body": {
-              "id": 5994,
+              "id": 10148,
               "nodeType": "Block",
-              "src": "812:112:12",
+              "src": "812:112:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5983,
+                    "id": 10137,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5979,
+                      "id": 10133,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5937,
-                      "src": "822:5:12",
+                      "referencedDeclaration": 10091,
+                      "src": "822:5:13",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_StandardToken_$7754",
+                        "typeIdentifier": "t_contract$_StandardToken_$11300",
                         "typeString": "contract StandardToken"
                       }
                     },
@@ -8483,12 +8483,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5981,
+                          "id": 10135,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5974,
-                          "src": "844:6:12",
+                          "referencedDeclaration": 10128,
+                          "src": "844:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -8502,18 +8502,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5980,
+                        "id": 10134,
                         "name": "StandardToken",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7754,
-                        "src": "830:13:12",
+                        "referencedDeclaration": 11300,
+                        "src": "830:13:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_StandardToken_$7754_$",
+                          "typeIdentifier": "t_type$_t_contract$_StandardToken_$11300_$",
                           "typeString": "type(contract StandardToken)"
                         }
                       },
-                      "id": 5982,
+                      "id": 10136,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -8521,38 +8521,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "830:21:12",
+                      "src": "830:21:13",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_StandardToken_$7754",
+                        "typeIdentifier": "t_contract$_StandardToken_$11300",
                         "typeString": "contract StandardToken"
                       }
                     },
-                    "src": "822:29:12",
+                    "src": "822:29:13",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_StandardToken_$7754",
+                      "typeIdentifier": "t_contract$_StandardToken_$11300",
                       "typeString": "contract StandardToken"
                     }
                   },
-                  "id": 5984,
+                  "id": 10138,
                   "nodeType": "ExpressionStatement",
-                  "src": "822:29:12"
+                  "src": "822:29:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5988,
+                    "id": 10142,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5985,
+                      "id": 10139,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7254,
-                      "src": "861:5:12",
+                      "referencedDeclaration": 10800,
+                      "src": "861:5:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -8564,18 +8564,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5986,
+                        "id": 10140,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "869:3:12",
+                        "referencedDeclaration": 11315,
+                        "src": "869:3:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 5987,
+                      "id": 10141,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -8583,38 +8583,38 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "869:10:12",
+                      "src": "869:10:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "861:18:12",
+                    "src": "861:18:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 5989,
+                  "id": 10143,
                   "nodeType": "ExpressionStatement",
-                  "src": "861:18:12"
+                  "src": "861:18:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5992,
+                    "id": 10146,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5990,
+                      "id": 10144,
                       "name": "freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5972,
-                      "src": "889:12:12",
+                      "referencedDeclaration": 10126,
+                      "src": "889:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -8624,31 +8624,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5991,
+                      "id": 10145,
                       "name": "_freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5976,
-                      "src": "904:13:12",
+                      "referencedDeclaration": 10130,
+                      "src": "904:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "889:28:12",
+                    "src": "889:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5993,
+                  "id": 10147,
                   "nodeType": "ExpressionStatement",
-                  "src": "889:28:12"
+                  "src": "889:28:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 5995,
+            "id": 10149,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -8656,16 +8656,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5977,
+              "id": 10131,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5974,
+                  "id": 10128,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5995,
-                  "src": "766:14:12",
+                  "scope": 10149,
+                  "src": "766:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8673,10 +8673,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5973,
+                    "id": 10127,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "766:7:12",
+                    "src": "766:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8687,11 +8687,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 5976,
+                  "id": 10130,
                   "name": "_freezingTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5995,
-                  "src": "782:21:12",
+                  "scope": 10149,
+                  "src": "782:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8699,10 +8699,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5975,
+                    "id": 10129,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "782:7:12",
+                    "src": "782:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8712,17 +8712,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "765:39:12"
+              "src": "765:39:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5978,
+              "id": 10132,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "812:0:12"
+              "src": "812:0:13"
             },
-            "scope": 6488,
-            "src": "754:170:12",
+            "scope": 10642,
+            "src": "754:170:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -8730,21 +8730,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6003,
+            "id": 10157,
             "name": "PayinTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6002,
+              "id": 10156,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5997,
+                  "id": 10151,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "944:20:12",
+                  "scope": 10157,
+                  "src": "944:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8752,10 +8752,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5996,
+                    "id": 10150,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "944:7:12",
+                    "src": "944:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8766,12 +8766,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 5999,
+                  "id": 10153,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "966:24:12",
+                  "scope": 10157,
+                  "src": "966:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8779,10 +8779,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5998,
+                    "id": 10152,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "966:7:12",
+                    "src": "966:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8793,12 +8793,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6001,
+                  "id": 10155,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6003,
-                  "src": "992:21:12",
+                  "scope": 10157,
+                  "src": "992:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8806,10 +8806,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6000,
+                    "id": 10154,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "992:7:12",
+                    "src": "992:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8819,28 +8819,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "943:71:12"
+              "src": "943:71:13"
             },
-            "src": "930:85:12"
+            "src": "930:85:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6013,
+            "id": 10167,
             "name": "CommitTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6012,
+              "id": 10166,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6005,
+                  "id": 10159,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1035:20:12",
+                  "scope": 10167,
+                  "src": "1035:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8848,10 +8848,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6004,
+                    "id": 10158,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1035:7:12",
+                    "src": "1035:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8862,12 +8862,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6007,
+                  "id": 10161,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1057:24:12",
+                  "scope": 10167,
+                  "src": "1057:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8875,10 +8875,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6006,
+                    "id": 10160,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1057:7:12",
+                    "src": "1057:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8889,12 +8889,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6009,
+                  "id": 10163,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1083:21:12",
+                  "scope": 10167,
+                  "src": "1083:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8902,10 +8902,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6008,
+                    "id": 10162,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1083:7:12",
+                    "src": "1083:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8916,12 +8916,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6011,
+                  "id": 10165,
                   "indexed": false,
                   "name": "commitTimestamp",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6013,
-                  "src": "1106:20:12",
+                  "scope": 10167,
+                  "src": "1106:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8929,10 +8929,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6010,
+                    "id": 10164,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1106:4:12",
+                    "src": "1106:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8942,28 +8942,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1034:93:12"
+              "src": "1034:93:13"
             },
-            "src": "1020:108:12"
+            "src": "1020:108:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6021,
+            "id": 10175,
             "name": "PayoutTx",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6020,
+              "id": 10174,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6015,
+                  "id": 10169,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1148:20:12",
+                  "scope": 10175,
+                  "src": "1148:20:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8971,10 +8971,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6014,
+                    "id": 10168,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1148:7:12",
+                    "src": "1148:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8985,12 +8985,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6017,
+                  "id": 10171,
                   "indexed": true,
                   "name": "txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1170:24:12",
+                  "scope": 10175,
+                  "src": "1170:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8998,10 +8998,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6016,
+                    "id": 10170,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1170:7:12",
+                    "src": "1170:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9012,12 +9012,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6019,
+                  "id": 10173,
                   "indexed": true,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6021,
-                  "src": "1196:21:12",
+                  "scope": 10175,
+                  "src": "1196:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9025,10 +9025,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6018,
+                    "id": 10172,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1196:7:12",
+                    "src": "1196:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9038,28 +9038,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1147:71:12"
+              "src": "1147:71:13"
             },
-            "src": "1133:86:12"
+            "src": "1133:86:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6025,
+            "id": 10179,
             "name": "Suicide",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6024,
+              "id": 10178,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6023,
+                  "id": 10177,
                   "indexed": false,
                   "name": "block",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6025,
-                  "src": "1238:10:12",
+                  "scope": 10179,
+                  "src": "1238:10:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9067,10 +9067,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6022,
+                    "id": 10176,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1238:4:12",
+                    "src": "1238:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9080,28 +9080,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1237:12:12"
+              "src": "1237:12:13"
             },
-            "src": "1224:26:12"
+            "src": "1224:26:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6031,
+            "id": 10185,
             "name": "LimitChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6030,
+              "id": 10184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6027,
+                  "id": 10181,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6031,
-                  "src": "1275:22:12",
+                  "scope": 10185,
+                  "src": "1275:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9109,10 +9109,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6026,
+                    "id": 10180,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1275:7:12",
+                    "src": "1275:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9123,12 +9123,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 6029,
+                  "id": 10183,
                   "indexed": true,
                   "name": "dayLimit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6031,
-                  "src": "1299:24:12",
+                  "scope": 10185,
+                  "src": "1299:24:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9136,10 +9136,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6028,
+                    "id": 10182,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1299:7:12",
+                    "src": "1299:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9149,28 +9149,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1274:50:12"
+              "src": "1274:50:13"
             },
-            "src": "1256:69:12"
+            "src": "1256:69:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6035,
+            "id": 10189,
             "name": "KeeperFreezed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6034,
+              "id": 10188,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6033,
+                  "id": 10187,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6035,
-                  "src": "1350:22:12",
+                  "scope": 10189,
+                  "src": "1350:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9178,10 +9178,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6032,
+                    "id": 10186,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1350:7:12",
+                    "src": "1350:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9191,28 +9191,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1349:24:12"
+              "src": "1349:24:13"
             },
-            "src": "1330:44:12"
+            "src": "1330:44:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6039,
+            "id": 10193,
             "name": "KeeperUnfreezed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6038,
+              "id": 10192,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6037,
+                  "id": 10191,
                   "indexed": true,
                   "name": "keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6039,
-                  "src": "1401:22:12",
+                  "scope": 10193,
+                  "src": "1401:22:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9220,10 +9220,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6036,
+                    "id": 10190,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1401:7:12",
+                    "src": "1401:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9233,28 +9233,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1400:24:12"
+              "src": "1400:24:13"
             },
-            "src": "1379:46:12"
+            "src": "1379:46:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 6043,
+            "id": 10197,
             "name": "CommissionChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 6042,
+              "id": 10196,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6041,
+                  "id": 10195,
                   "indexed": true,
                   "name": "commission",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6043,
-                  "src": "1455:26:12",
+                  "scope": 10197,
+                  "src": "1455:26:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9262,10 +9262,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6040,
+                    "id": 10194,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1455:7:12",
+                    "src": "1455:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9275,20 +9275,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1454:28:12"
+              "src": "1454:28:13"
             },
-            "src": "1431:52:12"
+            "src": "1431:52:13"
           },
           {
             "body": {
-              "id": 6064,
+              "id": 10218,
               "nodeType": "Block",
-              "src": "1566:95:12",
+              "src": "1566:95:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6057,
+                    "id": 10211,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9299,26 +9299,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6052,
+                          "id": 10206,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "1576:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "1576:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6054,
+                        "id": 10208,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6053,
+                          "id": 10207,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6045,
-                          "src": "1584:7:12",
+                          "referencedDeclaration": 10199,
+                          "src": "1584:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -9329,21 +9329,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1576:16:12",
+                        "src": "1576:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6055,
+                      "id": 10209,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dayLimit",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5939,
-                      "src": "1576:25:12",
+                      "referencedDeclaration": 10093,
+                      "src": "1576:25:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9353,26 +9353,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6056,
+                      "id": 10210,
                       "name": "_limit",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6047,
-                      "src": "1604:6:12",
+                      "referencedDeclaration": 10201,
+                      "src": "1604:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1576:34:12",
+                    "src": "1576:34:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6058,
+                  "id": 10212,
                   "nodeType": "ExpressionStatement",
-                  "src": "1576:34:12"
+                  "src": "1576:34:13"
                 },
                 {
                   "eventCall": {
@@ -9380,12 +9380,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6060,
+                        "id": 10214,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6045,
-                        "src": "1638:7:12",
+                        "referencedDeclaration": 10199,
+                        "src": "1638:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9393,12 +9393,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6061,
+                        "id": 10215,
                         "name": "_limit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6047,
-                        "src": "1647:6:12",
+                        "referencedDeclaration": 10201,
+                        "src": "1647:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9416,18 +9416,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6059,
+                      "id": 10213,
                       "name": "LimitChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6031,
-                      "src": "1625:12:12",
+                      "referencedDeclaration": 10185,
+                      "src": "1625:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 6062,
+                    "id": 10216,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9435,57 +9435,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1625:29:12",
+                    "src": "1625:29:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6063,
+                  "id": 10217,
                   "nodeType": "EmitStatement",
-                  "src": "1620:34:12"
+                  "src": "1620:34:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6065,
+            "id": 10219,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6050,
+                "id": 10204,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6049,
+                  "id": 10203,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "1556:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "1556:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1556:9:12"
+                "src": "1556:9:13"
               }
             ],
             "name": "ChangeKeeperLimit",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6048,
+              "id": 10202,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6045,
+                  "id": 10199,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6065,
-                  "src": "1516:15:12",
+                  "scope": 10219,
+                  "src": "1516:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9493,10 +9493,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6044,
+                    "id": 10198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1516:7:12",
+                    "src": "1516:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9507,11 +9507,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6047,
+                  "id": 10201,
                   "name": "_limit",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6065,
-                  "src": "1533:14:12",
+                  "scope": 10219,
+                  "src": "1533:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9519,10 +9519,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6046,
+                    "id": 10200,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1533:7:12",
+                    "src": "1533:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9532,26 +9532,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1515:33:12"
+              "src": "1515:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6051,
+              "id": 10205,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1566:0:12"
+              "src": "1566:0:13"
             },
-            "scope": 6488,
-            "src": "1489:172:12",
+            "scope": 10642,
+            "src": "1489:172:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6100,
+              "id": 10254,
               "nodeType": "Block",
-              "src": "1713:265:12",
+              "src": "1713:265:13",
               "statements": [
                 {
                   "expression": {
@@ -9563,7 +9563,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6077,
+                        "id": 10231,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9574,34 +9574,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6071,
+                              "id": 10225,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "1765:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "1765:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6074,
+                            "id": 10228,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6072,
+                                "id": 10226,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "1773:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "1773:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6073,
+                              "id": 10227,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -9609,7 +9609,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1773:10:12",
+                              "src": "1773:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -9620,21 +9620,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1765:19:12",
+                            "src": "1765:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6075,
+                          "id": 10229,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "1765:28:12",
+                          "referencedDeclaration": 10093,
+                          "src": "1765:28:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9645,14 +9645,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6076,
+                          "id": 10230,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1796:1:12",
+                          "src": "1796:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -9660,7 +9660,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1765:32:12",
+                        "src": "1765:32:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9674,21 +9674,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6070,
+                      "id": 10224,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1757:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "1757:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6078,
+                    "id": 10232,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9696,15 +9696,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1757:41:12",
+                    "src": "1757:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6079,
+                  "id": 10233,
                   "nodeType": "ExpressionStatement",
-                  "src": "1757:41:12"
+                  "src": "1757:41:13"
                 },
                 {
                   "expression": {
@@ -9716,7 +9716,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6086,
+                        "id": 10240,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9727,26 +9727,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6081,
+                              "id": 10235,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "1864:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "1864:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6083,
+                            "id": 10237,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6082,
+                              "id": 10236,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6067,
-                              "src": "1872:7:12",
+                              "referencedDeclaration": 10221,
+                              "src": "1872:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -9757,21 +9757,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1864:16:12",
+                            "src": "1864:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6084,
+                          "id": 10238,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "1864:25:12",
+                          "referencedDeclaration": 10093,
+                          "src": "1864:25:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9782,14 +9782,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6085,
+                          "id": 10239,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1892:1:12",
+                          "src": "1892:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -9797,7 +9797,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1864:29:12",
+                        "src": "1864:29:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9811,21 +9811,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6080,
+                      "id": 10234,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1856:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "1856:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6087,
+                    "id": 10241,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9833,20 +9833,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1856:38:12",
+                    "src": "1856:38:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6088,
+                  "id": 10242,
                   "nodeType": "ExpressionStatement",
-                  "src": "1856:38:12"
+                  "src": "1856:38:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6094,
+                    "id": 10248,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9857,26 +9857,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6089,
+                          "id": 10243,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "1904:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "1904:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6091,
+                        "id": 10245,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6090,
+                          "id": 10244,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6067,
-                          "src": "1912:7:12",
+                          "referencedDeclaration": 10221,
+                          "src": "1912:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -9887,21 +9887,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1904:16:12",
+                        "src": "1904:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6092,
+                      "id": 10246,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "frozen",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5945,
-                      "src": "1904:23:12",
+                      "referencedDeclaration": 10099,
+                      "src": "1904:23:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -9912,14 +9912,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 6093,
+                      "id": 10247,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1930:4:12",
+                      "src": "1930:4:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -9927,15 +9927,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "1904:30:12",
+                    "src": "1904:30:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 6095,
+                  "id": 10249,
                   "nodeType": "ExpressionStatement",
-                  "src": "1904:30:12"
+                  "src": "1904:30:13"
                 },
                 {
                   "eventCall": {
@@ -9943,12 +9943,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6097,
+                        "id": 10251,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6067,
-                        "src": "1963:7:12",
+                        "referencedDeclaration": 10221,
+                        "src": "1963:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9962,18 +9962,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6096,
+                      "id": 10250,
                       "name": "KeeperFreezed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6035,
-                      "src": "1949:13:12",
+                      "referencedDeclaration": 10189,
+                      "src": "1949:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6098,
+                    "id": 10252,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9981,20 +9981,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1949:22:12",
+                    "src": "1949:22:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6099,
+                  "id": 10253,
                   "nodeType": "EmitStatement",
-                  "src": "1944:27:12"
+                  "src": "1944:27:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6101,
+            "id": 10255,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -10002,16 +10002,16 @@
             "name": "FreezeKeeper",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6068,
+              "id": 10222,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6067,
+                  "id": 10221,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6101,
-                  "src": "1689:15:12",
+                  "scope": 10255,
+                  "src": "1689:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10019,10 +10019,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6066,
+                    "id": 10220,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1689:7:12",
+                    "src": "1689:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -10032,26 +10032,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1688:17:12"
+              "src": "1688:17:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6069,
+              "id": 10223,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1713:0:12"
+              "src": "1713:0:13"
             },
-            "scope": 6488,
-            "src": "1667:311:12",
+            "scope": 10642,
+            "src": "1667:311:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6128,
+              "id": 10282,
               "nodeType": "Block",
-              "src": "2042:135:12",
+              "src": "2042:135:13",
               "statements": [
                 {
                   "expression": {
@@ -10063,7 +10063,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6114,
+                        "id": 10268,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10074,26 +10074,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6109,
+                              "id": 10263,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2060:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2060:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6111,
+                            "id": 10265,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6110,
+                              "id": 10264,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6103,
-                              "src": "2068:7:12",
+                              "referencedDeclaration": 10257,
+                              "src": "2068:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -10104,21 +10104,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2060:16:12",
+                            "src": "2060:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6112,
+                          "id": 10266,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "2060:25:12",
+                          "referencedDeclaration": 10093,
+                          "src": "2060:25:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -10129,14 +10129,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6113,
+                          "id": 10267,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2088:1:12",
+                          "src": "2088:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -10144,7 +10144,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2060:29:12",
+                        "src": "2060:29:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10158,21 +10158,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6108,
+                      "id": 10262,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2052:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2052:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6115,
+                    "id": 10269,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10180,20 +10180,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2052:38:12",
+                    "src": "2052:38:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6116,
+                  "id": 10270,
                   "nodeType": "ExpressionStatement",
-                  "src": "2052:38:12"
+                  "src": "2052:38:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6122,
+                    "id": 10276,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10204,26 +10204,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6117,
+                          "id": 10271,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "2100:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "2100:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6119,
+                        "id": 10273,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6118,
+                          "id": 10272,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6103,
-                          "src": "2108:7:12",
+                          "referencedDeclaration": 10257,
+                          "src": "2108:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -10234,21 +10234,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "2100:16:12",
+                        "src": "2100:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6120,
+                      "id": 10274,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "frozen",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5945,
-                      "src": "2100:23:12",
+                      "referencedDeclaration": 10099,
+                      "src": "2100:23:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -10259,14 +10259,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 6121,
+                      "id": 10275,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2126:5:12",
+                      "src": "2126:5:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -10274,15 +10274,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "2100:31:12",
+                    "src": "2100:31:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 6123,
+                  "id": 10277,
                   "nodeType": "ExpressionStatement",
-                  "src": "2100:31:12"
+                  "src": "2100:31:13"
                 },
                 {
                   "eventCall": {
@@ -10290,12 +10290,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6125,
+                        "id": 10279,
                         "name": "_keeper",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6103,
-                        "src": "2162:7:12",
+                        "referencedDeclaration": 10257,
+                        "src": "2162:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -10309,18 +10309,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6124,
+                      "id": 10278,
                       "name": "KeeperUnfreezed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6039,
-                      "src": "2146:15:12",
+                      "referencedDeclaration": 10193,
+                      "src": "2146:15:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6126,
+                    "id": 10280,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10328,57 +10328,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2146:24:12",
+                    "src": "2146:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6127,
+                  "id": 10281,
                   "nodeType": "EmitStatement",
-                  "src": "2141:29:12"
+                  "src": "2141:29:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6129,
+            "id": 10283,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6106,
+                "id": 10260,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6105,
+                  "id": 10259,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "2032:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "2032:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2032:9:12"
+                "src": "2032:9:13"
               }
             ],
             "name": "UnfreezeKeeper",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6104,
+              "id": 10258,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6103,
+                  "id": 10257,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6129,
-                  "src": "2008:15:12",
+                  "scope": 10283,
+                  "src": "2008:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10386,10 +10386,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6102,
+                    "id": 10256,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2008:7:12",
+                    "src": "2008:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -10399,26 +10399,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2007:17:12"
+              "src": "2007:17:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6107,
+              "id": 10261,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2042:0:12"
+              "src": "2042:0:13"
             },
-            "scope": 6488,
-            "src": "1984:193:12",
+            "scope": 10642,
+            "src": "1984:193:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6140,
+              "id": 10294,
               "nodeType": "Block",
-              "src": "2221:50:12",
+              "src": "2221:50:13",
               "statements": [
                 {
                   "expression": {
@@ -10426,12 +10426,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6135,
+                        "id": 10289,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6131,
-                        "src": "2245:6:12",
+                        "referencedDeclaration": 10285,
+                        "src": "2245:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10441,18 +10441,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6136,
+                          "id": 10290,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "2253:3:12",
+                          "referencedDeclaration": 11315,
+                          "src": "2253:3:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 6137,
+                        "id": 10291,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10460,7 +10460,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "2253:10:12",
+                        "src": "2253:10:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -10478,18 +10478,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6134,
+                      "id": 10288,
                       "name": "PayinTargeted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6187,
-                      "src": "2231:13:12",
+                      "referencedDeclaration": 10341,
+                      "src": "2231:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_address_$returns$__$",
                         "typeString": "function (uint256,address)"
                       }
                     },
-                    "id": 6138,
+                    "id": 10292,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10497,20 +10497,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2231:33:12",
+                    "src": "2231:33:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6139,
+                  "id": 10293,
                   "nodeType": "ExpressionStatement",
-                  "src": "2231:33:12"
+                  "src": "2231:33:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6141,
+            "id": 10295,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -10518,16 +10518,16 @@
             "name": "Payin",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6132,
+              "id": 10286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6131,
+                  "id": 10285,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6141,
-                  "src": "2198:14:12",
+                  "scope": 10295,
+                  "src": "2198:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10535,10 +10535,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6130,
+                    "id": 10284,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2198:7:12",
+                    "src": "2198:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -10548,26 +10548,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2197:16:12"
+              "src": "2197:16:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6133,
+              "id": 10287,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2221:0:12"
+              "src": "2221:0:13"
             },
-            "scope": 6488,
-            "src": "2183:88:12",
+            "scope": 10642,
+            "src": "2183:88:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6186,
+              "id": 10340,
               "nodeType": "Block",
-              "src": "2340:297:12",
+              "src": "2340:297:13",
               "statements": [
                 {
                   "expression": {
@@ -10579,19 +10579,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6151,
+                        "id": 10305,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 6149,
+                          "id": 10303,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6143,
-                          "src": "2358:6:12",
+                          "referencedDeclaration": 10297,
+                          "src": "2358:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -10601,18 +10601,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6150,
+                          "id": 10304,
                           "name": "commission",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5963,
-                          "src": "2367:10:12",
+                          "referencedDeclaration": 10117,
+                          "src": "2367:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "2358:19:12",
+                        "src": "2358:19:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10626,21 +10626,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6148,
+                      "id": 10302,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2350:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2350:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6152,
+                    "id": 10306,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10648,15 +10648,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2350:28:12",
+                    "src": "2350:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6153,
+                  "id": 10307,
                   "nodeType": "ExpressionStatement",
-                  "src": "2350:28:12"
+                  "src": "2350:28:13"
                 },
                 {
                   "expression": {
@@ -10669,18 +10669,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6157,
+                              "id": 10311,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "2415:3:12",
+                              "referencedDeclaration": 11315,
+                              "src": "2415:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 6158,
+                            "id": 10312,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -10688,7 +10688,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "2415:10:12",
+                            "src": "2415:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -10696,25 +10696,25 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6159,
+                            "id": 10313,
                             "name": "this",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7800,
-                            "src": "2427:4:12",
+                            "referencedDeclaration": 11348,
+                            "src": "2427:4:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                               "typeString": "contract SimpleGatekeeperWithLimit"
                             }
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6160,
+                            "id": 10314,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6143,
-                            "src": "2433:6:12",
+                            "referencedDeclaration": 10297,
+                            "src": "2433:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -10728,7 +10728,7 @@
                               "typeString": "address"
                             },
                             {
-                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                              "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                               "typeString": "contract SimpleGatekeeperWithLimit"
                             },
                             {
@@ -10738,32 +10738,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6155,
+                            "id": 10309,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "2396:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "2396:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6156,
+                          "id": 10310,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transferFrom",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7607,
-                          "src": "2396:18:12",
+                          "referencedDeclaration": 11153,
+                          "src": "2396:18:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6161,
+                        "id": 10315,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10771,7 +10771,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "2396:44:12",
+                        "src": "2396:44:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10785,21 +10785,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6154,
+                      "id": 10308,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2388:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2388:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6162,
+                    "id": 10316,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10807,32 +10807,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2388:53:12",
+                    "src": "2388:53:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6163,
+                  "id": 10317,
                   "nodeType": "ExpressionStatement",
-                  "src": "2388:53:12"
+                  "src": "2388:53:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6168,
+                    "id": 10322,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6164,
+                      "id": 10318,
                       "name": "transactionAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5960,
-                      "src": "2451:17:12",
+                      "referencedDeclaration": 10114,
+                      "src": "2451:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -10846,19 +10846,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6167,
+                      "id": 10321,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 6165,
+                        "id": 10319,
                         "name": "transactionAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5960,
-                        "src": "2471:17:12",
+                        "referencedDeclaration": 10114,
+                        "src": "2471:17:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10869,14 +10869,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 6166,
+                        "id": 10320,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "2491:1:12",
+                        "src": "2491:1:13",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -10884,38 +10884,38 @@
                         },
                         "value": "1"
                       },
-                      "src": "2471:21:12",
+                      "src": "2471:21:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2451:41:12",
+                    "src": "2451:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6169,
+                  "id": 10323,
                   "nodeType": "ExpressionStatement",
-                  "src": "2451:41:12"
+                  "src": "2451:41:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6175,
+                    "id": 10329,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6170,
+                      "id": 10324,
                       "name": "commissionBalance",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5966,
-                      "src": "2502:17:12",
+                      "referencedDeclaration": 10120,
+                      "src": "2502:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -10928,12 +10928,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 6173,
+                          "id": 10327,
                           "name": "commission",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5963,
-                          "src": "2544:10:12",
+                          "referencedDeclaration": 10117,
+                          "src": "2544:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -10949,32 +10949,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6171,
+                          "id": 10325,
                           "name": "commissionBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5966,
-                          "src": "2522:17:12",
+                          "referencedDeclaration": 10120,
+                          "src": "2522:17:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6172,
+                        "id": 10326,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "2522:21:12",
+                        "referencedDeclaration": 10795,
+                        "src": "2522:21:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 6174,
+                      "id": 10328,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -10982,21 +10982,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2522:33:12",
+                      "src": "2522:33:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2502:53:12",
+                    "src": "2502:53:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6176,
+                  "id": 10330,
                   "nodeType": "ExpressionStatement",
-                  "src": "2502:53:12"
+                  "src": "2502:53:13"
                 },
                 {
                   "eventCall": {
@@ -11004,12 +11004,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6178,
+                        "id": 10332,
                         "name": "_target",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6145,
-                        "src": "2578:7:12",
+                        "referencedDeclaration": 10299,
+                        "src": "2578:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -11017,12 +11017,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6179,
+                        "id": 10333,
                         "name": "transactionAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5960,
-                        "src": "2587:17:12",
+                        "referencedDeclaration": 10114,
+                        "src": "2587:17:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11033,12 +11033,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6182,
+                            "id": 10336,
                             "name": "commission",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5963,
-                            "src": "2618:10:12",
+                            "referencedDeclaration": 10117,
+                            "src": "2618:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -11054,32 +11054,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6180,
+                            "id": 10334,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6143,
-                            "src": "2607:6:12",
+                            "referencedDeclaration": 10297,
+                            "src": "2607:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 6181,
+                          "id": 10335,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "sub",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7225,
-                          "src": "2607:10:12",
+                          "referencedDeclaration": 10771,
+                          "src": "2607:10:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 6183,
+                        "id": 10337,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11087,7 +11087,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "2607:22:12",
+                        "src": "2607:22:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11109,18 +11109,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6177,
+                      "id": 10331,
                       "name": "PayinTx",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6003,
-                      "src": "2570:7:12",
+                      "referencedDeclaration": 10157,
+                      "src": "2570:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256,uint256)"
                       }
                     },
-                    "id": 6184,
+                    "id": 10338,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11128,20 +11128,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2570:60:12",
+                    "src": "2570:60:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6185,
+                  "id": 10339,
                   "nodeType": "EmitStatement",
-                  "src": "2565:65:12"
+                  "src": "2565:65:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6187,
+            "id": 10341,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -11149,16 +11149,16 @@
             "name": "PayinTargeted",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6146,
+              "id": 10300,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6143,
+                  "id": 10297,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6187,
-                  "src": "2300:14:12",
+                  "scope": 10341,
+                  "src": "2300:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11166,10 +11166,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6142,
+                    "id": 10296,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2300:7:12",
+                    "src": "2300:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -11180,11 +11180,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6145,
+                  "id": 10299,
                   "name": "_target",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6187,
-                  "src": "2316:15:12",
+                  "scope": 10341,
+                  "src": "2316:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11192,10 +11192,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6144,
+                    "id": 10298,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2316:7:12",
+                    "src": "2316:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -11205,26 +11205,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2299:33:12"
+              "src": "2299:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6147,
+              "id": 10301,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2340:0:12"
+              "src": "2340:0:13"
             },
-            "scope": 6488,
-            "src": "2277:360:12",
+            "scope": 10642,
+            "src": "2277:360:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6315,
+              "id": 10469,
               "nodeType": "Block",
-              "src": "2714:885:12",
+              "src": "2714:885:13",
               "statements": [
                 {
                   "expression": {
@@ -11232,7 +11232,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6202,
+                        "id": 10356,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11240,41 +11240,41 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2775:27:12",
+                        "src": "2775:27:13",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6197,
+                              "id": 10351,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2776:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2776:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6200,
+                            "id": 10354,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6198,
+                                "id": 10352,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "2784:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "2784:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6199,
+                              "id": 10353,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11282,7 +11282,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "2784:10:12",
+                              "src": "2784:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11293,21 +11293,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2776:19:12",
+                            "src": "2776:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6201,
+                          "id": 10355,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "frozen",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5945,
-                          "src": "2776:26:12",
+                          "referencedDeclaration": 10099,
+                          "src": "2776:26:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -11326,21 +11326,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6196,
+                      "id": 10350,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2767:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2767:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6203,
+                    "id": 10357,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11348,15 +11348,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2767:36:12",
+                    "src": "2767:36:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6204,
+                  "id": 10358,
                   "nodeType": "ExpressionStatement",
-                  "src": "2767:36:12"
+                  "src": "2767:36:13"
                 },
                 {
                   "expression": {
@@ -11368,7 +11368,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6212,
+                        "id": 10366,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11379,34 +11379,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6206,
+                              "id": 10360,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "2821:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "2821:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6209,
+                            "id": 10363,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6207,
+                                "id": 10361,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7769,
-                                "src": "2829:3:12",
+                                "referencedDeclaration": 11315,
+                                "src": "2829:3:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 6208,
+                              "id": 10362,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11414,7 +11414,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "2829:10:12",
+                              "src": "2829:10:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11425,21 +11425,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2821:19:12",
+                            "src": "2821:19:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6210,
+                          "id": 10364,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "dayLimit",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5939,
-                          "src": "2821:28:12",
+                          "referencedDeclaration": 10093,
+                          "src": "2821:28:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11450,14 +11450,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 6211,
+                          "id": 10365,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2852:1:12",
+                          "src": "2852:1:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -11465,7 +11465,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2821:32:12",
+                        "src": "2821:32:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11479,21 +11479,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6205,
+                      "id": 10359,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2813:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2813:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6213,
+                    "id": 10367,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11501,28 +11501,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2813:41:12",
+                    "src": "2813:41:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6214,
+                  "id": 10368,
                   "nodeType": "ExpressionStatement",
-                  "src": "2813:41:12"
+                  "src": "2813:41:13"
                 },
                 {
                   "assignments": [
-                    6216
+                    10370
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 6216,
+                      "id": 10370,
                       "name": "txHash",
                       "nodeType": "VariableDeclaration",
-                      "scope": 6316,
-                      "src": "2865:14:12",
+                      "scope": 10470,
+                      "src": "2865:14:13",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -11530,10 +11530,10 @@
                         "typeString": "bytes32"
                       },
                       "typeName": {
-                        "id": 6215,
+                        "id": 10369,
                         "name": "bytes32",
                         "nodeType": "ElementaryTypeName",
-                        "src": "2865:7:12",
+                        "src": "2865:7:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -11543,18 +11543,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 6222,
+                  "id": 10376,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6218,
+                        "id": 10372,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6189,
-                        "src": "2892:3:12",
+                        "referencedDeclaration": 10343,
+                        "src": "2892:3:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -11562,12 +11562,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6219,
+                        "id": 10373,
                         "name": "_txNumber",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6193,
-                        "src": "2897:9:12",
+                        "referencedDeclaration": 10347,
+                        "src": "2897:9:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11575,12 +11575,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 6220,
+                        "id": 10374,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6191,
-                        "src": "2908:6:12",
+                        "referencedDeclaration": 10345,
+                        "src": "2908:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11602,18 +11602,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6217,
+                      "id": 10371,
                       "name": "keccak256",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7763,
-                      "src": "2882:9:12",
+                      "referencedDeclaration": 11309,
+                      "src": "2882:9:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                         "typeString": "function () pure returns (bytes32)"
                       }
                     },
-                    "id": 6221,
+                    "id": 10375,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11621,14 +11621,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2882:33:12",
+                    "src": "2882:33:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "2865:50:12"
+                  "src": "2865:50:13"
                 },
                 {
                   "expression": {
@@ -11636,7 +11636,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6228,
+                        "id": 10382,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11644,33 +11644,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2980:18:12",
+                        "src": "2980:18:13",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6224,
+                              "id": 10378,
                               "name": "paid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5970,
-                              "src": "2981:4:12",
+                              "referencedDeclaration": 10124,
+                              "src": "2981:4:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                 "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                               }
                             },
-                            "id": 6226,
+                            "id": 10380,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6225,
+                              "id": 10379,
                               "name": "txHash",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6216,
-                              "src": "2986:6:12",
+                              "referencedDeclaration": 10370,
+                              "src": "2986:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes32",
                                 "typeString": "bytes32"
@@ -11681,21 +11681,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2981:12:12",
+                            "src": "2981:12:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                              "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                             }
                           },
-                          "id": 6227,
+                          "id": 10381,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "paid",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5950,
-                          "src": "2981:17:12",
+                          "referencedDeclaration": 10104,
+                          "src": "2981:17:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -11714,21 +11714,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6223,
+                      "id": 10377,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2972:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "2972:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6229,
+                    "id": 10383,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11736,15 +11736,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2972:27:12",
+                    "src": "2972:27:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6230,
+                  "id": 10384,
                   "nodeType": "ExpressionStatement",
-                  "src": "2972:27:12"
+                  "src": "2972:27:13"
                 },
                 {
                   "condition": {
@@ -11753,7 +11753,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6236,
+                    "id": 10390,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11764,26 +11764,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6231,
+                          "id": 10385,
                           "name": "paid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5970,
-                          "src": "3014:4:12",
+                          "referencedDeclaration": 10124,
+                          "src": "3014:4:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                            "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                             "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                           }
                         },
-                        "id": 6233,
+                        "id": 10387,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6232,
+                          "id": 10386,
                           "name": "txHash",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6216,
-                          "src": "3019:6:12",
+                          "referencedDeclaration": 10370,
+                          "src": "3019:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -11794,21 +11794,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3014:12:12",
+                        "src": "3014:12:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                          "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                         }
                       },
-                      "id": 6234,
+                      "id": 10388,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "commitTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5948,
-                      "src": "3014:21:12",
+                      "referencedDeclaration": 10102,
+                      "src": "3014:21:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11819,14 +11819,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 6235,
+                      "id": 10389,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3039:1:12",
+                      "src": "3039:1:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -11834,16 +11834,16 @@
                       },
                       "value": "0"
                     },
-                    "src": "3014:26:12",
+                    "src": "3014:26:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 6313,
+                    "id": 10467,
                     "nodeType": "Block",
-                    "src": "3309:284:12",
+                    "src": "3309:284:13",
                     "statements": [
                       {
                         "expression": {
@@ -11855,7 +11855,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 6277,
+                              "id": 10431,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11866,26 +11866,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 6271,
+                                    "id": 10425,
                                     "name": "paid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 5970,
-                                    "src": "3331:4:12",
+                                    "referencedDeclaration": 10124,
+                                    "src": "3331:4:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                       "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                     }
                                   },
-                                  "id": 6273,
+                                  "id": 10427,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 6272,
+                                    "id": 10426,
                                     "name": "txHash",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 6216,
-                                    "src": "3336:6:12",
+                                    "referencedDeclaration": 10370,
+                                    "src": "3336:6:13",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
@@ -11896,21 +11896,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "3331:12:12",
+                                  "src": "3331:12:13",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                    "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                     "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                                   }
                                 },
-                                "id": 6274,
+                                "id": 10428,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "keeper",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 5952,
-                                "src": "3331:19:12",
+                                "referencedDeclaration": 10106,
+                                "src": "3331:19:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -11922,18 +11922,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6275,
+                                  "id": 10429,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3354:3:12",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3354:3:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 6276,
+                                "id": 10430,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11941,13 +11941,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3354:10:12",
+                                "src": "3354:10:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "3331:33:12",
+                              "src": "3331:33:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -11961,21 +11961,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6270,
+                            "id": 10424,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3323:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3323:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6278,
+                          "id": 10432,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -11983,15 +11983,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3323:42:12",
+                          "src": "3323:42:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6279,
+                        "id": 10433,
                         "nodeType": "ExpressionStatement",
-                        "src": "3323:42:12"
+                        "src": "3323:42:13"
                       },
                       {
                         "expression": {
@@ -12003,7 +12003,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 6289,
+                              "id": 10443,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12014,7 +12014,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 6286,
+                                "id": 10440,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -12025,26 +12025,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 6281,
+                                      "id": 10435,
                                       "name": "paid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 5970,
-                                      "src": "3387:4:12",
+                                      "referencedDeclaration": 10124,
+                                      "src": "3387:4:13",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                         "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                       }
                                     },
-                                    "id": 6283,
+                                    "id": 10437,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 6282,
+                                      "id": 10436,
                                       "name": "txHash",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 6216,
-                                      "src": "3392:6:12",
+                                      "referencedDeclaration": 10370,
+                                      "src": "3392:6:13",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_bytes32",
                                         "typeString": "bytes32"
@@ -12055,21 +12055,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "3387:12:12",
+                                    "src": "3387:12:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                      "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                       "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                                     }
                                   },
-                                  "id": 6284,
+                                  "id": 10438,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "commitTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 5948,
-                                  "src": "3387:21:12",
+                                  "referencedDeclaration": 10102,
+                                  "src": "3387:21:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -12079,18 +12079,18 @@
                                 "operator": "+",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 6285,
+                                  "id": 10439,
                                   "name": "freezingTime",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5972,
-                                  "src": "3411:12:12",
+                                  "referencedDeclaration": 10126,
+                                  "src": "3411:12:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "3387:36:12",
+                                "src": "3387:36:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -12102,18 +12102,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6287,
+                                  "id": 10441,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7759,
-                                  "src": "3427:5:12",
+                                  "referencedDeclaration": 11305,
+                                  "src": "3427:5:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 6288,
+                                "id": 10442,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -12121,13 +12121,13 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3427:15:12",
+                                "src": "3427:15:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "3387:55:12",
+                              "src": "3387:55:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -12141,21 +12141,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6280,
+                            "id": 10434,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3379:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3379:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6290,
+                          "id": 10444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12163,15 +12163,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3379:64:12",
+                          "src": "3379:64:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6291,
+                        "id": 10445,
                         "nodeType": "ExpressionStatement",
-                        "src": "3379:64:12"
+                        "src": "3379:64:13"
                       },
                       {
                         "expression": {
@@ -12182,12 +12182,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 6295,
+                                  "id": 10449,
                                   "name": "_to",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6189,
-                                  "src": "3480:3:12",
+                                  "referencedDeclaration": 10343,
+                                  "src": "3480:3:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -12195,12 +12195,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 6296,
+                                  "id": 10450,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6191,
-                                  "src": "3485:6:12",
+                                  "referencedDeclaration": 10345,
+                                  "src": "3485:6:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -12220,32 +12220,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 6293,
+                                  "id": 10447,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5937,
-                                  "src": "3465:5:12",
+                                  "referencedDeclaration": 10091,
+                                  "src": "3465:5:13",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_StandardToken_$7754",
+                                    "typeIdentifier": "t_contract$_StandardToken_$11300",
                                     "typeString": "contract StandardToken"
                                   }
                                 },
-                                "id": 6294,
+                                "id": 10448,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transfer",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 7419,
-                                "src": "3465:14:12",
+                                "referencedDeclaration": 10965,
+                                "src": "3465:14:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 6297,
+                              "id": 10451,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12253,7 +12253,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "3465:27:12",
+                              "src": "3465:27:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -12267,21 +12267,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6292,
+                            "id": 10446,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3457:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3457:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6298,
+                          "id": 10452,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12289,20 +12289,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3457:36:12",
+                          "src": "3457:36:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6299,
+                        "id": 10453,
                         "nodeType": "ExpressionStatement",
-                        "src": "3457:36:12"
+                        "src": "3457:36:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6305,
+                          "id": 10459,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12313,26 +12313,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6300,
+                                "id": 10454,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3507:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3507:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6302,
+                              "id": 10456,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6301,
+                                "id": 10455,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3512:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3512:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -12343,21 +12343,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3507:12:12",
+                              "src": "3507:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6303,
+                            "id": 10457,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "paid",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5950,
-                            "src": "3507:17:12",
+                            "referencedDeclaration": 10104,
+                            "src": "3507:17:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -12368,14 +12368,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 6304,
+                            "id": 10458,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3527:4:12",
+                            "src": "3527:4:13",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -12383,15 +12383,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "3507:24:12",
+                          "src": "3507:24:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 6306,
+                        "id": 10460,
                         "nodeType": "ExpressionStatement",
-                        "src": "3507:24:12"
+                        "src": "3507:24:13"
                       },
                       {
                         "eventCall": {
@@ -12399,12 +12399,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 6308,
+                              "id": 10462,
                               "name": "_to",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6189,
-                              "src": "3559:3:12",
+                              "referencedDeclaration": 10343,
+                              "src": "3559:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12412,12 +12412,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6309,
+                              "id": 10463,
                               "name": "_txNumber",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6193,
-                              "src": "3564:9:12",
+                              "referencedDeclaration": 10347,
+                              "src": "3564:9:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12425,12 +12425,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6310,
+                              "id": 10464,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6191,
-                              "src": "3575:6:12",
+                              "referencedDeclaration": 10345,
+                              "src": "3575:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12452,18 +12452,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 6307,
+                            "id": 10461,
                             "name": "PayoutTx",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6021,
-                            "src": "3550:8:12",
+                            "referencedDeclaration": 10175,
+                            "src": "3550:8:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$__$",
                               "typeString": "function (address,uint256,uint256)"
                             }
                           },
-                          "id": 6311,
+                          "id": 10465,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12471,25 +12471,25 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3550:32:12",
+                          "src": "3550:32:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6312,
+                        "id": 10466,
                         "nodeType": "EmitStatement",
-                        "src": "3545:37:12"
+                        "src": "3545:37:13"
                       }
                     ]
                   },
-                  "id": 6314,
+                  "id": 10468,
                   "nodeType": "IfStatement",
-                  "src": "3010:583:12",
+                  "src": "3010:583:13",
                   "trueBody": {
-                    "id": 6269,
+                    "id": 10423,
                     "nodeType": "Block",
-                    "src": "3042:261:12",
+                    "src": "3042:261:13",
                     "statements": [
                       {
                         "expression": {
@@ -12502,18 +12502,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 6239,
+                                    "id": 10393,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "3105:3:12",
+                                    "referencedDeclaration": 11315,
+                                    "src": "3105:3:13",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 6240,
+                                  "id": 10394,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -12521,7 +12521,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3105:10:12",
+                                  "src": "3105:10:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -12529,12 +12529,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 6241,
+                                  "id": 10395,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 6191,
-                                  "src": "3117:6:12",
+                                  "referencedDeclaration": 10345,
+                                  "src": "3117:6:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -12552,18 +12552,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 6238,
+                                "id": 10392,
                                 "name": "underLimit",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6448,
-                                "src": "3094:10:12",
+                                "referencedDeclaration": 10602,
+                                "src": "3094:10:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,uint256) returns (bool)"
                                 }
                               },
-                              "id": 6242,
+                              "id": 10396,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12571,7 +12571,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "3094:30:12",
+                              "src": "3094:30:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -12585,21 +12585,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 6237,
+                            "id": 10391,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11318,
+                              11319
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "3086:7:12",
+                            "referencedDeclaration": 11318,
+                            "src": "3086:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 6243,
+                          "id": 10397,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12607,20 +12607,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3086:39:12",
+                          "src": "3086:39:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6244,
+                        "id": 10398,
                         "nodeType": "ExpressionStatement",
-                        "src": "3086:39:12"
+                        "src": "3086:39:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6251,
+                          "id": 10405,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12631,26 +12631,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6245,
+                                "id": 10399,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3139:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3139:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6247,
+                              "id": 10401,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6246,
+                                "id": 10400,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3144:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3144:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -12661,21 +12661,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3139:12:12",
+                              "src": "3139:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6248,
+                            "id": 10402,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "commitTS",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5948,
-                            "src": "3139:21:12",
+                            "referencedDeclaration": 10102,
+                            "src": "3139:21:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -12687,18 +12687,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6249,
+                              "id": 10403,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7759,
-                              "src": "3163:5:12",
+                              "referencedDeclaration": 11305,
+                              "src": "3163:5:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 6250,
+                            "id": 10404,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12706,26 +12706,26 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3163:15:12",
+                            "src": "3163:15:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3139:39:12",
+                          "src": "3139:39:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6252,
+                        "id": 10406,
                         "nodeType": "ExpressionStatement",
-                        "src": "3139:39:12"
+                        "src": "3139:39:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6259,
+                          "id": 10413,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12736,26 +12736,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6253,
+                                "id": 10407,
                                 "name": "paid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5970,
-                                "src": "3192:4:12",
+                                "referencedDeclaration": 10124,
+                                "src": "3192:4:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$5953_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_bytes32_$_t_struct$_TransactionState_$10107_storage_$",
                                   "typeString": "mapping(bytes32 => struct SimpleGatekeeperWithLimit.TransactionState storage ref)"
                                 }
                               },
-                              "id": 6255,
+                              "id": 10409,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6254,
+                                "id": 10408,
                                 "name": "txHash",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6216,
-                                "src": "3197:6:12",
+                                "referencedDeclaration": 10370,
+                                "src": "3197:6:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes32",
                                   "typeString": "bytes32"
@@ -12766,21 +12766,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3192:12:12",
+                              "src": "3192:12:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_TransactionState_$5953_storage",
+                                "typeIdentifier": "t_struct$_TransactionState_$10107_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.TransactionState storage ref"
                               }
                             },
-                            "id": 6256,
+                            "id": 10410,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "keeper",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5952,
-                            "src": "3192:19:12",
+                            "referencedDeclaration": 10106,
+                            "src": "3192:19:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -12792,18 +12792,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 6257,
+                              "id": 10411,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "3214:3:12",
+                              "referencedDeclaration": 11315,
+                              "src": "3214:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 6258,
+                            "id": 10412,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12811,21 +12811,21 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3214:10:12",
+                            "src": "3214:10:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "3192:32:12",
+                          "src": "3192:32:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 6260,
+                        "id": 10414,
                         "nodeType": "ExpressionStatement",
-                        "src": "3192:32:12"
+                        "src": "3192:32:13"
                       },
                       {
                         "eventCall": {
@@ -12833,12 +12833,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 6262,
+                              "id": 10416,
                               "name": "_to",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6189,
-                              "src": "3252:3:12",
+                              "referencedDeclaration": 10343,
+                              "src": "3252:3:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12846,12 +12846,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6263,
+                              "id": 10417,
                               "name": "_txNumber",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6193,
-                              "src": "3257:9:12",
+                              "referencedDeclaration": 10347,
+                              "src": "3257:9:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12859,12 +12859,12 @@
                             },
                             {
                               "argumentTypes": null,
-                              "id": 6264,
+                              "id": 10418,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6191,
-                              "src": "3268:6:12",
+                              "referencedDeclaration": 10345,
+                              "src": "3268:6:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12874,18 +12874,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6265,
+                                "id": 10419,
                                 "name": "block",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7759,
-                                "src": "3276:5:12",
+                                "referencedDeclaration": 11305,
+                                "src": "3276:5:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_block",
                                   "typeString": "block"
                                 }
                               },
-                              "id": 6266,
+                              "id": 10420,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12893,7 +12893,7 @@
                               "memberName": "timestamp",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "3276:15:12",
+                              "src": "3276:15:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12919,18 +12919,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 6261,
+                            "id": 10415,
                             "name": "CommitTx",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6013,
-                            "src": "3243:8:12",
+                            "referencedDeclaration": 10167,
+                            "src": "3243:8:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$returns$__$",
                               "typeString": "function (address,uint256,uint256,uint256)"
                             }
                           },
-                          "id": 6267,
+                          "id": 10421,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12938,15 +12938,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3243:49:12",
+                          "src": "3243:49:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 6268,
+                        "id": 10422,
                         "nodeType": "EmitStatement",
-                        "src": "3238:54:12"
+                        "src": "3238:54:13"
                       }
                     ]
                   }
@@ -12954,7 +12954,7 @@
               ]
             },
             "documentation": null,
-            "id": 6316,
+            "id": 10470,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -12962,16 +12962,16 @@
             "name": "Payout",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6194,
+              "id": 10348,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6189,
+                  "id": 10343,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2659:11:12",
+                  "scope": 10470,
+                  "src": "2659:11:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -12979,10 +12979,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6188,
+                    "id": 10342,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2659:7:12",
+                    "src": "2659:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -12993,11 +12993,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6191,
+                  "id": 10345,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2672:14:12",
+                  "scope": 10470,
+                  "src": "2672:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13005,10 +13005,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6190,
+                    "id": 10344,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2672:7:12",
+                    "src": "2672:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13019,11 +13019,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6193,
+                  "id": 10347,
                   "name": "_txNumber",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6316,
-                  "src": "2688:17:12",
+                  "scope": 10470,
+                  "src": "2688:17:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13031,10 +13031,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6192,
+                    "id": 10346,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2688:7:12",
+                    "src": "2688:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13044,43 +13044,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2658:48:12"
+              "src": "2658:48:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6195,
+              "id": 10349,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2714:0:12"
+              "src": "2714:0:13"
             },
-            "scope": 6488,
-            "src": "2643:956:12",
+            "scope": 10642,
+            "src": "2643:956:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6327,
+              "id": 10481,
               "nodeType": "Block",
-              "src": "3670:45:12",
+              "src": "3670:45:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6325,
+                    "id": 10479,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6323,
+                      "id": 10477,
                       "name": "freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5972,
-                      "src": "3680:12:12",
+                      "referencedDeclaration": 10126,
+                      "src": "3680:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13090,68 +13090,68 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6324,
+                      "id": 10478,
                       "name": "_freezingTime",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6318,
-                      "src": "3695:13:12",
+                      "referencedDeclaration": 10472,
+                      "src": "3695:13:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3680:28:12",
+                    "src": "3680:28:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6326,
+                  "id": 10480,
                   "nodeType": "ExpressionStatement",
-                  "src": "3680:28:12"
+                  "src": "3680:28:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6328,
+            "id": 10482,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6321,
+                "id": 10475,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6320,
+                  "id": 10474,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "3660:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "3660:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3660:9:12"
+                "src": "3660:9:13"
               }
             ],
             "name": "SetFreezingTime",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6319,
+              "id": 10473,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6318,
+                  "id": 10472,
                   "name": "_freezingTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6328,
-                  "src": "3630:21:12",
+                  "scope": 10482,
+                  "src": "3630:21:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13159,10 +13159,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6317,
+                    "id": 10471,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3630:7:12",
+                    "src": "3630:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13172,50 +13172,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3629:23:12"
+              "src": "3629:23:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6322,
+              "id": 10476,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3670:0:12"
+              "src": "3670:0:13"
             },
-            "scope": 6488,
-            "src": "3605:110:12",
+            "scope": 10642,
+            "src": "3605:110:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6335,
+              "id": 10489,
               "nodeType": "Block",
-              "src": "3778:36:12",
+              "src": "3778:36:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6333,
+                    "id": 10487,
                     "name": "freezingTime",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5972,
-                    "src": "3795:12:12",
+                    "referencedDeclaration": 10126,
+                    "src": "3795:12:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6332,
-                  "id": 6334,
+                  "functionReturnParameters": 10486,
+                  "id": 10488,
                   "nodeType": "Return",
-                  "src": "3788:19:12"
+                  "src": "3788:19:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6336,
+            "id": 10490,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13223,23 +13223,23 @@
             "name": "GetFreezingTime",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6329,
+              "id": 10483,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3745:2:12"
+              "src": "3745:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6332,
+              "id": 10486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6331,
+                  "id": 10485,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6336,
-                  "src": "3769:7:12",
+                  "scope": 10490,
+                  "src": "3769:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13247,10 +13247,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6330,
+                    "id": 10484,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3769:7:12",
+                    "src": "3769:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13260,36 +13260,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3768:9:12"
+              "src": "3768:9:13"
             },
-            "scope": 6488,
-            "src": "3721:93:12",
+            "scope": 10642,
+            "src": "3721:93:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6351,
+              "id": 10505,
               "nodeType": "Block",
-              "src": "3881:80:12",
+              "src": "3881:80:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6345,
+                    "id": 10499,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6343,
+                      "id": 10497,
                       "name": "commission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5963,
-                      "src": "3891:10:12",
+                      "referencedDeclaration": 10117,
+                      "src": "3891:10:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13299,26 +13299,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 6344,
+                      "id": 10498,
                       "name": "_commission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6338,
-                      "src": "3904:11:12",
+                      "referencedDeclaration": 10492,
+                      "src": "3904:11:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3891:24:12",
+                    "src": "3891:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6346,
+                  "id": 10500,
                   "nodeType": "ExpressionStatement",
-                  "src": "3891:24:12"
+                  "src": "3891:24:13"
                 },
                 {
                   "expression": {
@@ -13326,12 +13326,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6348,
+                        "id": 10502,
                         "name": "commission",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5963,
-                        "src": "3943:10:12",
+                        "referencedDeclaration": 10117,
+                        "src": "3943:10:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13345,18 +13345,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6347,
+                      "id": 10501,
                       "name": "CommissionChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6043,
-                      "src": "3925:17:12",
+                      "referencedDeclaration": 10197,
+                      "src": "3925:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 6349,
+                    "id": 10503,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13364,57 +13364,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3925:29:12",
+                    "src": "3925:29:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6350,
+                  "id": 10504,
                   "nodeType": "ExpressionStatement",
-                  "src": "3925:29:12"
+                  "src": "3925:29:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6352,
+            "id": 10506,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6341,
+                "id": 10495,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6340,
+                  "id": 10494,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "3871:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "3871:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3871:9:12"
+                "src": "3871:9:13"
               }
             ],
             "name": "SetCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6339,
+              "id": 10493,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6338,
+                  "id": 10492,
                   "name": "_commission",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6352,
-                  "src": "3843:19:12",
+                  "scope": 10506,
+                  "src": "3843:19:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13422,10 +13422,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6337,
+                    "id": 10491,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3843:7:12",
+                    "src": "3843:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13435,50 +13435,50 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3842:21:12"
+              "src": "3842:21:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6342,
+              "id": 10496,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3881:0:12"
+              "src": "3881:0:13"
             },
-            "scope": 6488,
-            "src": "3820:141:12",
+            "scope": 10642,
+            "src": "3820:141:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6359,
+              "id": 10513,
               "nodeType": "Block",
-              "src": "4021:34:12",
+              "src": "4022:34:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6357,
+                    "id": 10511,
                     "name": "commission",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5963,
-                    "src": "4038:10:12",
+                    "referencedDeclaration": 10117,
+                    "src": "4039:10:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6356,
-                  "id": 6358,
+                  "functionReturnParameters": 10510,
+                  "id": 10512,
                   "nodeType": "Return",
-                  "src": "4031:17:12"
+                  "src": "4032:17:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6360,
+            "id": 10514,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13486,23 +13486,23 @@
             "name": "GetCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6353,
+              "id": 10507,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3989:2:12"
+              "src": "3989:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6356,
+              "id": 10510,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6355,
+                  "id": 10509,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6360,
-                  "src": "4013:7:12",
+                  "scope": 10514,
+                  "src": "4013:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13510,10 +13510,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6354,
+                    "id": 10508,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4013:7:12",
+                    "src": "4013:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13523,19 +13523,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4012:9:12"
+              "src": "4012:9:13"
             },
-            "scope": 6488,
-            "src": "3967:88:12",
+            "scope": 10642,
+            "src": "3967:89:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6377,
+              "id": 10531,
               "nodeType": "Block",
-              "src": "4108:97:12",
+              "src": "4109:97:13",
               "statements": [
                 {
                   "expression": {
@@ -13546,12 +13546,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6368,
+                            "id": 10522,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "4141:5:12",
+                            "referencedDeclaration": 10800,
+                            "src": "4142:5:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -13559,12 +13559,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 6369,
+                            "id": 10523,
                             "name": "commissionBalance",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5966,
-                            "src": "4148:17:12",
+                            "referencedDeclaration": 10120,
+                            "src": "4149:17:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13584,32 +13584,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6366,
+                            "id": 10520,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "4126:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "4127:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6367,
+                          "id": 10521,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "4126:14:12",
+                          "referencedDeclaration": 10965,
+                          "src": "4127:14:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6370,
+                        "id": 10524,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -13617,7 +13617,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "4126:40:12",
+                        "src": "4127:40:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -13631,21 +13631,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6365,
+                      "id": 10519,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "4118:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "4119:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6371,
+                    "id": 10525,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13653,32 +13653,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4118:49:12",
+                    "src": "4119:49:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6372,
+                  "id": 10526,
                   "nodeType": "ExpressionStatement",
-                  "src": "4118:49:12"
+                  "src": "4119:49:13"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 6375,
+                    "id": 10529,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 6373,
+                      "id": 10527,
                       "name": "commissionBalance",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5966,
-                      "src": "4177:17:12",
+                      "referencedDeclaration": 10120,
+                      "src": "4178:17:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13689,14 +13689,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 6374,
+                      "id": 10528,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4197:1:12",
+                      "src": "4198:1:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -13704,70 +13704,70 @@
                       },
                       "value": "0"
                     },
-                    "src": "4177:21:12",
+                    "src": "4178:21:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 6376,
+                  "id": 10530,
                   "nodeType": "ExpressionStatement",
-                  "src": "4177:21:12"
+                  "src": "4178:21:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6378,
+            "id": 10532,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6363,
+                "id": 10517,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6362,
+                  "id": 10516,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "4098:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "4099:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4098:9:12"
+                "src": "4099:9:13"
               }
             ],
             "name": "TransferCommission",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6361,
+              "id": 10515,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4088:2:12"
+              "src": "4089:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6364,
+              "id": 10518,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4108:0:12"
+              "src": "4109:0:13"
             },
-            "scope": 6488,
-            "src": "4061:144:12",
+            "scope": 10642,
+            "src": "4062:144:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 6447,
+              "id": 10601,
               "nodeType": "Block",
-              "src": "4288:655:12",
+              "src": "4289:655:13",
               "statements": [
                 {
                   "condition": {
@@ -13776,7 +13776,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6393,
+                    "id": 10547,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13786,18 +13786,18 @@
                       "arguments": [],
                       "expression": {
                         "argumentTypes": [],
-                        "id": 6387,
+                        "id": 10541,
                         "name": "today",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 6459,
-                        "src": "4377:5:12",
+                        "referencedDeclaration": 10613,
+                        "src": "4378:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                           "typeString": "function () view returns (uint256)"
                         }
                       },
-                      "id": 6388,
+                      "id": 10542,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13805,7 +13805,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4377:7:12",
+                      "src": "4378:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13819,26 +13819,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 6389,
+                          "id": 10543,
                           "name": "keepers",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5957,
-                          "src": "4387:7:12",
+                          "referencedDeclaration": 10111,
+                          "src": "4388:7:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                            "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                             "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                           }
                         },
-                        "id": 6391,
+                        "id": 10545,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 6390,
+                          "id": 10544,
                           "name": "_keeper",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6380,
-                          "src": "4395:7:12",
+                          "referencedDeclaration": 10534,
+                          "src": "4396:7:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -13849,45 +13849,45 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4387:16:12",
+                        "src": "4388:16:13",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                          "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                           "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                         }
                       },
-                      "id": 6392,
+                      "id": 10546,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "lastDay",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 5941,
-                      "src": "4387:24:12",
+                      "referencedDeclaration": 10095,
+                      "src": "4388:24:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4377:34:12",
+                    "src": "4378:34:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 6410,
+                  "id": 10564,
                   "nodeType": "IfStatement",
-                  "src": "4373:144:12",
+                  "src": "4374:144:13",
                   "trueBody": {
-                    "id": 6409,
+                    "id": 10563,
                     "nodeType": "Block",
-                    "src": "4413:104:12",
+                    "src": "4414:104:13",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6399,
+                          "id": 10553,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13898,26 +13898,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6394,
+                                "id": 10548,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4427:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4428:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6396,
+                              "id": 10550,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6395,
+                                "id": 10549,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4435:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4436:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -13928,21 +13928,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4427:16:12",
+                              "src": "4428:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6397,
+                            "id": 10551,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "spentToday",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5943,
-                            "src": "4427:27:12",
+                            "referencedDeclaration": 10097,
+                            "src": "4428:27:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -13953,14 +13953,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 6398,
+                            "id": 10552,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4457:1:12",
+                            "src": "4458:1:13",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -13968,20 +13968,20 @@
                             },
                             "value": "0"
                           },
-                          "src": "4427:31:12",
+                          "src": "4428:31:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6400,
+                        "id": 10554,
                         "nodeType": "ExpressionStatement",
-                        "src": "4427:31:12"
+                        "src": "4428:31:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6407,
+                          "id": 10561,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13992,26 +13992,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6401,
+                                "id": 10555,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4472:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4473:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6403,
+                              "id": 10557,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6402,
+                                "id": 10556,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4480:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4481:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -14022,21 +14022,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4472:16:12",
+                              "src": "4473:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6404,
+                            "id": 10558,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "lastDay",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5941,
-                            "src": "4472:24:12",
+                            "referencedDeclaration": 10095,
+                            "src": "4473:24:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14049,18 +14049,18 @@
                             "arguments": [],
                             "expression": {
                               "argumentTypes": [],
-                              "id": 6405,
+                              "id": 10559,
                               "name": "today",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6459,
-                              "src": "4499:5:12",
+                              "referencedDeclaration": 10613,
+                              "src": "4500:5:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                                 "typeString": "function () view returns (uint256)"
                               }
                             },
-                            "id": 6406,
+                            "id": 10560,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14068,21 +14068,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "4499:7:12",
+                            "src": "4500:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "4472:34:12",
+                          "src": "4473:34:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6408,
+                        "id": 10562,
                         "nodeType": "ExpressionStatement",
-                        "src": "4472:34:12"
+                        "src": "4473:34:13"
                       }
                     ]
                   }
@@ -14094,7 +14094,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 6433,
+                    "id": 10587,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14105,7 +14105,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6421,
+                      "id": 10575,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14116,7 +14116,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6416,
+                        "id": 10570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14127,26 +14127,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6411,
+                              "id": 10565,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "4682:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "4683:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6413,
+                            "id": 10567,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6412,
+                              "id": 10566,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6380,
-                              "src": "4690:7:12",
+                              "referencedDeclaration": 10534,
+                              "src": "4691:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -14157,21 +14157,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "4682:16:12",
+                            "src": "4683:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6414,
+                          "id": 10568,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "spentToday",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5943,
-                          "src": "4682:27:12",
+                          "referencedDeclaration": 10097,
+                          "src": "4683:27:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14181,18 +14181,18 @@
                         "operator": "+",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6415,
+                          "id": 10569,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6382,
-                          "src": "4712:6:12",
+                          "referencedDeclaration": 10536,
+                          "src": "4713:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4682:36:12",
+                        "src": "4683:36:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14206,26 +14206,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 6417,
+                            "id": 10571,
                             "name": "keepers",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5957,
-                            "src": "4722:7:12",
+                            "referencedDeclaration": 10111,
+                            "src": "4723:7:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                             }
                           },
-                          "id": 6419,
+                          "id": 10573,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 6418,
+                            "id": 10572,
                             "name": "_keeper",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6380,
-                            "src": "4730:7:12",
+                            "referencedDeclaration": 10534,
+                            "src": "4731:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14236,27 +14236,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4722:16:12",
+                          "src": "4723:16:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                            "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                             "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                           }
                         },
-                        "id": 6420,
+                        "id": 10574,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "spentToday",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 5943,
-                        "src": "4722:27:12",
+                        "referencedDeclaration": 10097,
+                        "src": "4723:27:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "4682:67:12",
+                      "src": "4683:67:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -14270,7 +14270,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 6432,
+                      "id": 10586,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14281,7 +14281,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 6427,
+                        "id": 10581,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14292,26 +14292,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 6422,
+                              "id": 10576,
                               "name": "keepers",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5957,
-                              "src": "4761:7:12",
+                              "referencedDeclaration": 10111,
+                              "src": "4762:7:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                 "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                               }
                             },
-                            "id": 6424,
+                            "id": 10578,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 6423,
+                              "id": 10577,
                               "name": "_keeper",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 6380,
-                              "src": "4769:7:12",
+                              "referencedDeclaration": 10534,
+                              "src": "4770:7:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -14322,21 +14322,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "4761:16:12",
+                            "src": "4762:16:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                              "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                               "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                             }
                           },
-                          "id": 6425,
+                          "id": 10579,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "spentToday",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 5943,
-                          "src": "4761:27:12",
+                          "referencedDeclaration": 10097,
+                          "src": "4762:27:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -14346,18 +14346,18 @@
                         "operator": "+",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 6426,
+                          "id": 10580,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 6382,
-                          "src": "4791:6:12",
+                          "referencedDeclaration": 10536,
+                          "src": "4792:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4761:36:12",
+                        "src": "4762:36:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14371,26 +14371,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 6428,
+                            "id": 10582,
                             "name": "keepers",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5957,
-                            "src": "4801:7:12",
+                            "referencedDeclaration": 10111,
+                            "src": "4802:7:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                              "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                               "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                             }
                           },
-                          "id": 6430,
+                          "id": 10584,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 6429,
+                            "id": 10583,
                             "name": "_keeper",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6380,
-                            "src": "4809:7:12",
+                            "referencedDeclaration": 10534,
+                            "src": "4810:7:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14401,51 +14401,51 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4801:16:12",
+                          "src": "4802:16:13",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                            "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                             "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                           }
                         },
-                        "id": 6431,
+                        "id": 10585,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dayLimit",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 5939,
-                        "src": "4801:25:12",
+                        "referencedDeclaration": 10093,
+                        "src": "4802:25:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "4761:65:12",
+                      "src": "4762:65:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "4682:144:12",
+                    "src": "4683:144:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 6444,
+                  "id": 10598,
                   "nodeType": "IfStatement",
-                  "src": "4678:237:12",
+                  "src": "4679:237:13",
                   "trueBody": {
-                    "id": 6443,
+                    "id": 10597,
                     "nodeType": "Block",
-                    "src": "4828:87:12",
+                    "src": "4829:87:13",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6439,
+                          "id": 10593,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14456,26 +14456,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 6434,
+                                "id": 10588,
                                 "name": "keepers",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5957,
-                                "src": "4842:7:12",
+                                "referencedDeclaration": 10111,
+                                "src": "4843:7:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$5946_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_address_$_t_struct$_Keeper_$10100_storage_$",
                                   "typeString": "mapping(address => struct SimpleGatekeeperWithLimit.Keeper storage ref)"
                                 }
                               },
-                              "id": 6436,
+                              "id": 10590,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 6435,
+                                "id": 10589,
                                 "name": "_keeper",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 6380,
-                                "src": "4850:7:12",
+                                "referencedDeclaration": 10534,
+                                "src": "4851:7:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -14486,21 +14486,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "4842:16:12",
+                              "src": "4843:16:13",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Keeper_$5946_storage",
+                                "typeIdentifier": "t_struct$_Keeper_$10100_storage",
                                 "typeString": "struct SimpleGatekeeperWithLimit.Keeper storage ref"
                               }
                             },
-                            "id": 6437,
+                            "id": 10591,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "spentToday",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 5943,
-                            "src": "4842:27:12",
+                            "referencedDeclaration": 10097,
+                            "src": "4843:27:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14510,39 +14510,39 @@
                           "operator": "+=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 6438,
+                            "id": 10592,
                             "name": "_value",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 6382,
-                            "src": "4873:6:12",
+                            "referencedDeclaration": 10536,
+                            "src": "4874:6:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "4842:37:12",
+                          "src": "4843:37:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 6440,
+                        "id": 10594,
                         "nodeType": "ExpressionStatement",
-                        "src": "4842:37:12"
+                        "src": "4843:37:13"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 6441,
+                          "id": 10595,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4900:4:12",
+                          "src": "4901:4:13",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -14550,10 +14550,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 6386,
-                        "id": 6442,
+                        "functionReturnParameters": 10540,
+                        "id": 10596,
                         "nodeType": "Return",
-                        "src": "4893:11:12"
+                        "src": "4894:11:13"
                       }
                     ]
                   }
@@ -14562,14 +14562,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "66616c7365",
-                    "id": 6445,
+                    "id": 10599,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4931:5:12",
+                    "src": "4932:5:13",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -14577,15 +14577,15 @@
                     },
                     "value": "false"
                   },
-                  "functionReturnParameters": 6386,
-                  "id": 6446,
+                  "functionReturnParameters": 10540,
+                  "id": 10600,
                   "nodeType": "Return",
-                  "src": "4924:12:12"
+                  "src": "4925:12:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6448,
+            "id": 10602,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -14593,16 +14593,16 @@
             "name": "underLimit",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6383,
+              "id": 10537,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6380,
+                  "id": 10534,
                   "name": "_keeper",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4231:15:12",
+                  "scope": 10602,
+                  "src": "4232:15:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14610,10 +14610,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 6379,
+                    "id": 10533,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4231:7:12",
+                    "src": "4232:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14624,11 +14624,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 6382,
+                  "id": 10536,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4248:14:12",
+                  "scope": 10602,
+                  "src": "4249:14:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14636,10 +14636,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6381,
+                    "id": 10535,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4248:7:12",
+                    "src": "4249:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14649,20 +14649,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4230:33:12"
+              "src": "4231:33:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6386,
+              "id": 10540,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6385,
+                  "id": 10539,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6448,
-                  "src": "4282:4:12",
+                  "scope": 10602,
+                  "src": "4283:4:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14670,10 +14670,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 6384,
+                    "id": 10538,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4282:4:12",
+                    "src": "4283:4:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -14683,19 +14683,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4281:6:12"
+              "src": "4282:6:13"
             },
-            "scope": 6488,
-            "src": "4211:732:12",
+            "scope": 10642,
+            "src": "4212:732:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 6458,
+              "id": 10612,
               "nodeType": "Block",
-              "src": "4997:110:12",
+              "src": "4998:110:13",
               "statements": [
                 {
                   "expression": {
@@ -14704,7 +14704,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 6456,
+                    "id": 10610,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14713,18 +14713,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 6453,
+                        "id": 10607,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7759,
-                        "src": "5076:5:12",
+                        "referencedDeclaration": 11305,
+                        "src": "5077:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 6454,
+                      "id": 10608,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14732,7 +14732,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5076:15:12",
+                      "src": "5077:15:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14743,14 +14743,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 6455,
+                      "id": 10609,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "5094:6:12",
+                      "src": "5095:6:13",
                       "subdenomination": "days",
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_86400_by_1",
@@ -14758,21 +14758,21 @@
                       },
                       "value": "1"
                     },
-                    "src": "5076:24:12",
+                    "src": "5077:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 6452,
-                  "id": 6457,
+                  "functionReturnParameters": 10606,
+                  "id": 10611,
                   "nodeType": "Return",
-                  "src": "5069:31:12"
+                  "src": "5070:31:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6459,
+            "id": 10613,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -14780,23 +14780,23 @@
             "name": "today",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6449,
+              "id": 10603,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4963:2:12"
+              "src": "4964:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6452,
+              "id": 10606,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 6451,
+                  "id": 10605,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 6459,
-                  "src": "4988:7:12",
+                  "scope": 10613,
+                  "src": "4989:7:13",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14804,10 +14804,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 6450,
+                    "id": 10604,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4988:7:12",
+                    "src": "4989:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14817,19 +14817,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4987:9:12"
+              "src": "4988:9:13"
             },
-            "scope": 6488,
-            "src": "4949:158:12",
+            "scope": 10642,
+            "src": "4950:158:13",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "private"
           },
           {
             "body": {
-              "id": 6486,
+              "id": 10640,
               "nodeType": "Block",
-              "src": "5146:204:12",
+              "src": "5147:204:13",
               "statements": [
                 {
                   "expression": {
@@ -14840,12 +14840,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 6467,
+                            "id": 10621,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7254,
-                            "src": "5179:5:12",
+                            "referencedDeclaration": 10800,
+                            "src": "5180:5:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14859,14 +14859,14 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 6471,
+                                    "id": 10625,
                                     "name": "this",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7800,
-                                    "src": "5210:4:12",
+                                    "referencedDeclaration": 11348,
+                                    "src": "5211:4:13",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                                       "typeString": "contract SimpleGatekeeperWithLimit"
                                     }
                                   }
@@ -14874,24 +14874,24 @@
                                 "expression": {
                                   "argumentTypes": [
                                     {
-                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$6488",
+                                      "typeIdentifier": "t_contract$_SimpleGatekeeperWithLimit_$10642",
                                       "typeString": "contract SimpleGatekeeperWithLimit"
                                     }
                                   ],
-                                  "id": 6470,
+                                  "id": 10624,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "lValueRequested": false,
                                   "nodeType": "ElementaryTypeNameExpression",
-                                  "src": "5202:7:12",
+                                  "src": "5203:7:13",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_type$_t_address_$",
                                     "typeString": "type(address)"
                                   },
                                   "typeName": "address"
                                 },
-                                "id": 6472,
+                                "id": 10626,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -14899,7 +14899,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "5202:13:12",
+                                "src": "5203:13:13",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -14915,32 +14915,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 6468,
+                                "id": 10622,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 5937,
-                                "src": "5186:5:12",
+                                "referencedDeclaration": 10091,
+                                "src": "5187:5:13",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_StandardToken_$7754",
+                                  "typeIdentifier": "t_contract$_StandardToken_$11300",
                                   "typeString": "contract StandardToken"
                                 }
                               },
-                              "id": 6469,
+                              "id": 10623,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7431,
-                              "src": "5186:15:12",
+                              "referencedDeclaration": 10977,
+                              "src": "5187:15:13",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 6473,
+                            "id": 10627,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14948,7 +14948,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "5186:30:12",
+                            "src": "5187:30:13",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14968,32 +14968,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 6465,
+                            "id": 10619,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 5937,
-                            "src": "5164:5:12",
+                            "referencedDeclaration": 10091,
+                            "src": "5165:5:13",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_StandardToken_$7754",
+                              "typeIdentifier": "t_contract$_StandardToken_$11300",
                               "typeString": "contract StandardToken"
                             }
                           },
-                          "id": 6466,
+                          "id": 10620,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 7419,
-                          "src": "5164:14:12",
+                          "referencedDeclaration": 10965,
+                          "src": "5165:14:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 6474,
+                        "id": 10628,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15001,7 +15001,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5164:53:12",
+                        "src": "5165:53:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15015,21 +15015,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 6464,
+                      "id": 10618,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "5156:7:12",
+                      "referencedDeclaration": 11318,
+                      "src": "5157:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 6475,
+                    "id": 10629,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15037,15 +15037,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5156:62:12",
+                    "src": "5157:62:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6476,
+                  "id": 10630,
                   "nodeType": "ExpressionStatement",
-                  "src": "5156:62:12"
+                  "src": "5157:62:13"
                 },
                 {
                   "eventCall": {
@@ -15055,18 +15055,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 6478,
+                          "id": 10632,
                           "name": "block",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7759,
-                          "src": "5241:5:12",
+                          "referencedDeclaration": 11305,
+                          "src": "5242:5:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_block",
                             "typeString": "block"
                           }
                         },
-                        "id": 6479,
+                        "id": 10633,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15074,7 +15074,7 @@
                         "memberName": "timestamp",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5241:15:12",
+                        "src": "5242:15:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -15088,18 +15088,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 6477,
+                      "id": 10631,
                       "name": "Suicide",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 6025,
-                      "src": "5233:7:12",
+                      "referencedDeclaration": 10179,
+                      "src": "5234:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 6480,
+                    "id": 10634,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15107,15 +15107,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5233:24:12",
+                    "src": "5234:24:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6481,
+                  "id": 10635,
                   "nodeType": "EmitStatement",
-                  "src": "5228:29:12"
+                  "src": "5229:29:13"
                 },
                 {
                   "expression": {
@@ -15123,12 +15123,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 6483,
+                        "id": 10637,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7254,
-                        "src": "5337:5:12",
+                        "referencedDeclaration": 10800,
+                        "src": "5338:5:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -15142,18 +15142,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 6482,
+                      "id": 10636,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7777,
-                      "src": "5324:12:12",
+                      "referencedDeclaration": 11323,
+                      "src": "5325:12:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 6484,
+                    "id": 10638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15161,71 +15161,71 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5324:19:12",
+                    "src": "5325:19:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 6485,
+                  "id": 10639,
                   "nodeType": "ExpressionStatement",
-                  "src": "5324:19:12"
+                  "src": "5325:19:13"
                 }
               ]
             },
             "documentation": null,
-            "id": 6487,
+            "id": 10641,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 6462,
+                "id": 10616,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 6461,
+                  "id": 10615,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 7284,
-                  "src": "5136:9:12",
+                  "referencedDeclaration": 10830,
+                  "src": "5137:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5136:9:12"
+                "src": "5137:9:13"
               }
             ],
             "name": "kill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 6460,
+              "id": 10614,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5126:2:12"
+              "src": "5127:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 6463,
+              "id": 10617,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5146:0:12"
+              "src": "5147:0:13"
             },
-            "scope": 6488,
-            "src": "5113:237:12",
+            "scope": 10642,
+            "src": "5114:237:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 6489,
-        "src": "157:5196:12"
+        "scope": 10643,
+        "src": "157:5197:13"
       }
     ],
-    "src": "0:5354:12"
+    "src": "0:5355:13"
   },
   "compiler": {
     "name": "solc",
@@ -15406,5 +15406,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.355Z"
+  "updatedAt": "2019-01-10T13:57:39.980Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/StandardToken.json b/blockchain/source/migration_artifacts/contracts/StandardToken.json
index 35e8dc8d6..43b343e72 100644
--- a/blockchain/source/migration_artifacts/contracts/StandardToken.json
+++ b/blockchain/source/migration_artifacts/contracts/StandardToken.json
@@ -223,22 +223,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b506106ae806100206000396000f30060806040526004361061008d5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461009257806318160ddd146100ca57806323b872dd146100f1578063661884631461011b57806370a082311461013f578063a9059cbb14610160578063d73dd62314610184578063dd62ed3e146101a8575b600080fd5b34801561009e57600080fd5b506100b6600160a060020a03600435166024356101cf565b604080519115158252519081900360200190f35b3480156100d657600080fd5b506100df610235565b60408051918252519081900360200190f35b3480156100fd57600080fd5b506100b6600160a060020a036004358116906024351660443561023b565b34801561012757600080fd5b506100b6600160a060020a03600435166024356103b0565b34801561014b57600080fd5b506100df600160a060020a036004351661049f565b34801561016c57600080fd5b506100b6600160a060020a03600435166024356104ba565b34801561019057600080fd5b506100b6600160a060020a0360043516602435610599565b3480156101b457600080fd5b506100df600160a060020a0360043581169060243516610632565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561026057600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561029057600080fd5b600160a060020a03831615156102a557600080fd5b600160a060020a0384166000908152602081905260409020546102ce908363ffffffff61065d16565b600160a060020a038086166000908152602081905260408082209390935590851681522054610303908363ffffffff61066f16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610345908363ffffffff61065d16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b336000908152600260209081526040808320600160a060020a038616845290915281205480831061040457336000908152600260209081526040808320600160a060020a0388168452909152812055610439565b610414818463ffffffff61065d16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b336000908152602081905260408120548211156104d657600080fd5b600160a060020a03831615156104eb57600080fd5b3360009081526020819052604090205461050b908363ffffffff61065d16565b3360009081526020819052604080822092909255600160a060020a0385168152205461053d908363ffffffff61066f16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a03861684529091528120546105cd908363ffffffff61066f16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b60008282111561066957fe5b50900390565b8181018281101561067c57fe5b929150505600a165627a7a72305820aef462e65cb5e2ff82873a10fc33d70f06f7ada39991415c65989f4ca98547a80029",
   "deployedBytecode": "0x60806040526004361061008d5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461009257806318160ddd146100ca57806323b872dd146100f1578063661884631461011b57806370a082311461013f578063a9059cbb14610160578063d73dd62314610184578063dd62ed3e146101a8575b600080fd5b34801561009e57600080fd5b506100b6600160a060020a03600435166024356101cf565b604080519115158252519081900360200190f35b3480156100d657600080fd5b506100df610235565b60408051918252519081900360200190f35b3480156100fd57600080fd5b506100b6600160a060020a036004358116906024351660443561023b565b34801561012757600080fd5b506100b6600160a060020a03600435166024356103b0565b34801561014b57600080fd5b506100df600160a060020a036004351661049f565b34801561016c57600080fd5b506100b6600160a060020a03600435166024356104ba565b34801561019057600080fd5b506100b6600160a060020a0360043516602435610599565b3480156101b457600080fd5b506100df600160a060020a0360043581169060243516610632565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561026057600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561029057600080fd5b600160a060020a03831615156102a557600080fd5b600160a060020a0384166000908152602081905260409020546102ce908363ffffffff61065d16565b600160a060020a038086166000908152602081905260408082209390935590851681522054610303908363ffffffff61066f16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610345908363ffffffff61065d16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b336000908152600260209081526040808320600160a060020a038616845290915281205480831061040457336000908152600260209081526040808320600160a060020a0388168452909152812055610439565b610414818463ffffffff61065d16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b336000908152602081905260408120548211156104d657600080fd5b600160a060020a03831615156104eb57600080fd5b3360009081526020819052604090205461050b908363ffffffff61065d16565b3360009081526020819052604080822092909255600160a060020a0385168152205461053d908363ffffffff61066f16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a03861684529091528120546105cd908363ffffffff61066f16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b60008282111561066957fe5b50900390565b8181018281101561067c57fe5b929150505600a165627a7a72305820aef462e65cb5e2ff82873a10fc33d70f06f7ada39991415c65989f4ca98547a80029",
-  "sourceMap": "334:3780:22:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;334:3780:22;;;;;;;",
-  "deployedSourceMap": "334:3780:22:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:22;-1:-1:-1;;;;;1814:188:22;;;;;;;;;;;;;;;;;;;;;;;;;389:83:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:19;;;;;;;;;;;;;;;;;;;;726:470:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:22;-1:-1:-1;;;;;726:470:22;;;;;;;;;;;;3679:432;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:22;-1:-1:-1;;;;;3679:432:22;;;;;;;1149:99:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:19;-1:-1:-1;;;;;1149:99:19;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:19;-1:-1:-1;;;;;626:321:19;;;;;;;2926:296:22;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:22;-1:-1:-1;;;;;2926:296:22;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:22;-1:-1:-1;;;;;2321:153:22;;;;;;;;;;1814:188;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:22;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:22;1814:188;;;;:::o;389:83:19:-;455:12;;389:83;:::o;726:470:22:-;-1:-1:-1;;;;;864:15:22;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:22;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:22;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:22;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:22;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:22;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:22;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:22;726:470;;;;;:::o;3679:432::-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:22;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:22;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:22;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:22;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:22;;3679:432;-1:-1:-1;;;3679:432:22:o;1149:99:19:-;-1:-1:-1;;;;;1227:16:19;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:19;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:19;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:19;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:19;626:321;;;;:::o;2926:296:22:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:22;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:22;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:22;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:22;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1060:116:17:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:17;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
+  "sourceMap": "334:3780:20:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;334:3780:20;;;;;;;",
+  "deployedSourceMap": "334:3780:20:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:20;-1:-1:-1;;;;;1814:188:20;;;;;;;;;;;;;;;;;;;;;;;;;389:83:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;726:470:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:20;-1:-1:-1;;;;;726:470:20;;;;;;;;;;;;3679:432;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:20;-1:-1:-1;;;;;3679:432:20;;;;;;;1149:99:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;-1:-1:-1;;;;;1149:99:17;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;-1:-1:-1;;;;;626:321:17;;;;;;;2926:296:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:20;-1:-1:-1;;;;;2926:296:20;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:20;-1:-1:-1;;;;;2321:153:20;;;;;;;;;;1814:188;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:20;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:20;1814:188;;;;:::o;389:83:17:-;455:12;;389:83;:::o;726:470:20:-;-1:-1:-1;;;;;864:15:20;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:20;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:20;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:20;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:20;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:20;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:20;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:20;726:470;;;;;:::o;3679:432::-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:20;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:20;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:20;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:20;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:20;;3679:432;-1:-1:-1;;;3679:432:20:o;1149:99:17:-;-1:-1:-1;;;;;1227:16:17;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:17;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:17;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:17;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;2926:296:20:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:20;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:20;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:20;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:20;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
   "source": "pragma solidity ^0.4.24;\n\nimport \"./BasicToken.sol\";\nimport \"./ERC20.sol\";\n\n\n/**\n * @title Standard ERC20 token\n *\n * @dev Implementation of the basic standard token.\n * https://github.com/ethereum/EIPs/issues/20\n * Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol\n */\ncontract StandardToken is ERC20, BasicToken {\n\n  mapping (address => mapping (address => uint256)) internal allowed;\n\n\n  /**\n   * @dev Transfer tokens from one address to another\n   * @param _from address The address which you want to send tokens from\n   * @param _to address The address which you want to transfer to\n   * @param _value uint256 the amount of tokens to be transferred\n   */\n  function transferFrom(\n    address _from,\n    address _to,\n    uint256 _value\n  )\n    public\n    returns (bool)\n  {\n    require(_value <= balances[_from]);\n    require(_value <= allowed[_from][msg.sender]);\n    require(_to != address(0));\n\n    balances[_from] = balances[_from].sub(_value);\n    balances[_to] = balances[_to].add(_value);\n    allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_value);\n    emit Transfer(_from, _to, _value);\n    return true;\n  }\n\n  /**\n   * @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\n   * Beware that changing an allowance with this method brings the risk that someone may use both the old\n   * and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\n   * race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\n   * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n   * @param _spender The address which will spend the funds.\n   * @param _value The amount of tokens to be spent.\n   */\n  function approve(address _spender, uint256 _value) public returns (bool) {\n    allowed[msg.sender][_spender] = _value;\n    emit Approval(msg.sender, _spender, _value);\n    return true;\n  }\n\n  /**\n   * @dev Function to check the amount of tokens that an owner allowed to a spender.\n   * @param _owner address The address which owns the funds.\n   * @param _spender address The address which will spend the funds.\n   * @return A uint256 specifying the amount of tokens still available for the spender.\n   */\n  function allowance(\n    address _owner,\n    address _spender\n   )\n    public\n    view\n    returns (uint256)\n  {\n    return allowed[_owner][_spender];\n  }\n\n  /**\n   * @dev Increase the amount of tokens that an owner allowed to a spender.\n   * approve should be called when allowed[_spender] == 0. To increment\n   * allowed value is better to use this function to avoid 2 calls (and wait until\n   * the first transaction is mined)\n   * From MonolithDAO Token.sol\n   * @param _spender The address which will spend the funds.\n   * @param _addedValue The amount of tokens to increase the allowance by.\n   */\n  function increaseApproval(\n    address _spender,\n    uint256 _addedValue\n  )\n    public\n    returns (bool)\n  {\n    allowed[msg.sender][_spender] = (\n      allowed[msg.sender][_spender].add(_addedValue));\n    emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n    return true;\n  }\n\n  /**\n   * @dev Decrease the amount of tokens that an owner allowed to a spender.\n   * approve should be called when allowed[_spender] == 0. To decrement\n   * allowed value is better to use this function to avoid 2 calls (and wait until\n   * the first transaction is mined)\n   * From MonolithDAO Token.sol\n   * @param _spender The address which will spend the funds.\n   * @param _subtractedValue The amount of tokens to decrease the allowance by.\n   */\n  function decreaseApproval(\n    address _spender,\n    uint256 _subtractedValue\n  )\n    public\n    returns (bool)\n  {\n    uint256 oldValue = allowed[msg.sender][_spender];\n    if (_subtractedValue >= oldValue) {\n      allowed[msg.sender][_spender] = 0;\n    } else {\n      allowed[msg.sender][_spender] = oldValue.sub(_subtractedValue);\n    }\n    emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n    return true;\n  }\n\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
     "exportedSymbols": {
       "StandardToken": [
-        7754
+        11300
       ]
     },
-    "id": 7755,
+    "id": 11301,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7509,
+        "id": 11055,
         "literals": [
           "solidity",
           "^",
@@ -246,27 +246,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:22"
+        "src": "0:24:20"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
         "file": "./BasicToken.sol",
-        "id": 7510,
+        "id": 11056,
         "nodeType": "ImportDirective",
-        "scope": 7755,
-        "sourceUnit": 7433,
-        "src": "26:26:22",
+        "scope": 11301,
+        "sourceUnit": 10979,
+        "src": "26:26:20",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
         "file": "./ERC20.sol",
-        "id": 7511,
+        "id": 11057,
         "nodeType": "ImportDirective",
-        "scope": 7755,
-        "sourceUnit": 7476,
-        "src": "53:21:22",
+        "scope": 11301,
+        "sourceUnit": 11022,
+        "src": "53:21:20",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -276,64 +276,64 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7512,
+              "id": 11058,
               "name": "ERC20",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7475,
-              "src": "360:5:22",
+              "referencedDeclaration": 11021,
+              "src": "360:5:20",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20_$7475",
+                "typeIdentifier": "t_contract$_ERC20_$11021",
                 "typeString": "contract ERC20"
               }
             },
-            "id": 7513,
+            "id": 11059,
             "nodeType": "InheritanceSpecifier",
-            "src": "360:5:22"
+            "src": "360:5:20"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7514,
+              "id": 11060,
               "name": "BasicToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7432,
-              "src": "367:10:22",
+              "referencedDeclaration": 10978,
+              "src": "367:10:20",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_BasicToken_$7432",
+                "typeIdentifier": "t_contract$_BasicToken_$10978",
                 "typeString": "contract BasicToken"
               }
             },
-            "id": 7515,
+            "id": 11061,
             "nodeType": "InheritanceSpecifier",
-            "src": "367:10:22"
+            "src": "367:10:20"
           }
         ],
         "contractDependencies": [
-          7432,
-          7475,
-          7507
+          10978,
+          11021,
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol",
         "fullyImplemented": true,
-        "id": 7754,
+        "id": 11300,
         "linearizedBaseContracts": [
-          7754,
-          7432,
-          7475,
-          7507
+          11300,
+          10978,
+          11021,
+          11053
         ],
         "name": "StandardToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 7521,
+            "id": 11067,
             "name": "allowed",
             "nodeType": "VariableDeclaration",
-            "scope": 7754,
-            "src": "383:66:22",
+            "scope": 11300,
+            "src": "383:66:20",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -341,46 +341,46 @@
               "typeString": "mapping(address => mapping(address => uint256))"
             },
             "typeName": {
-              "id": 7520,
+              "id": 11066,
               "keyType": {
-                "id": 7516,
+                "id": 11062,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "392:7:22",
+                "src": "392:7:20",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "383:49:22",
+              "src": "383:49:20",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(address => uint256))"
               },
               "valueType": {
-                "id": 7519,
+                "id": 11065,
                 "keyType": {
-                  "id": 7517,
+                  "id": 11063,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "412:7:22",
+                  "src": "412:7:20",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "403:28:22",
+                "src": "403:28:20",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                   "typeString": "mapping(address => uint256)"
                 },
                 "valueType": {
-                  "id": 7518,
+                  "id": 11064,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "423:7:22",
+                  "src": "423:7:20",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -393,9 +393,9 @@
           },
           {
             "body": {
-              "id": 7606,
+              "id": 11152,
               "nodeType": "Block",
-              "src": "840:356:22",
+              "src": "840:356:20",
               "statements": [
                 {
                   "expression": {
@@ -407,19 +407,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7537,
+                        "id": 11083,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7533,
+                          "id": 11079,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "854:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "854:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -431,26 +431,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7534,
+                            "id": 11080,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "864:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "864:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7536,
+                          "id": 11082,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7535,
+                            "id": 11081,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7523,
-                            "src": "873:5:22",
+                            "referencedDeclaration": 11069,
+                            "src": "873:5:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -461,13 +461,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "864:15:22",
+                          "src": "864:15:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "854:25:22",
+                        "src": "854:25:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -481,21 +481,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7532,
+                      "id": 11078,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "846:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "846:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7538,
+                    "id": 11084,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -503,15 +503,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "846:34:22",
+                    "src": "846:34:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7539,
+                  "id": 11085,
                   "nodeType": "ExpressionStatement",
-                  "src": "846:34:22"
+                  "src": "846:34:20"
                 },
                 {
                   "expression": {
@@ -523,19 +523,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7548,
+                        "id": 11094,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7541,
+                          "id": 11087,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "894:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "894:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -549,26 +549,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 7542,
+                              "id": 11088,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7521,
-                              "src": "904:7:22",
+                              "referencedDeclaration": 11067,
+                              "src": "904:7:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 7544,
+                            "id": 11090,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7543,
+                              "id": 11089,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7523,
-                              "src": "912:5:22",
+                              "referencedDeclaration": 11069,
+                              "src": "912:5:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -579,29 +579,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "904:14:22",
+                            "src": "904:14:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7547,
+                          "id": 11093,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7545,
+                              "id": 11091,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "919:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "919:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7546,
+                            "id": 11092,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -609,7 +609,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "919:10:22",
+                            "src": "919:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -620,13 +620,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "904:26:22",
+                          "src": "904:26:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "894:36:22",
+                        "src": "894:36:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -640,21 +640,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7540,
+                      "id": 11086,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "886:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "886:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7549,
+                    "id": 11095,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -662,15 +662,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "886:45:22",
+                    "src": "886:45:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7550,
+                  "id": 11096,
                   "nodeType": "ExpressionStatement",
-                  "src": "886:45:22"
+                  "src": "886:45:20"
                 },
                 {
                   "expression": {
@@ -682,19 +682,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 7556,
+                        "id": 11102,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7552,
+                          "id": 11098,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7525,
-                          "src": "945:3:22",
+                          "referencedDeclaration": 11071,
+                          "src": "945:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -708,14 +708,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 7554,
+                              "id": 11100,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "960:1:22",
+                              "src": "960:1:20",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -731,20 +731,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 7553,
+                            "id": 11099,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "952:7:22",
+                            "src": "952:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 7555,
+                          "id": 11101,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -752,13 +752,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "952:10:22",
+                          "src": "952:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "945:17:22",
+                        "src": "945:17:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -772,21 +772,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7551,
+                      "id": 11097,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "937:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "937:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7557,
+                    "id": 11103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -794,20 +794,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "937:26:22",
+                    "src": "937:26:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7558,
+                  "id": 11104,
                   "nodeType": "ExpressionStatement",
-                  "src": "937:26:22"
+                  "src": "937:26:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7568,
+                    "id": 11114,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -816,26 +816,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7559,
+                        "id": 11105,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "970:8:22",
+                        "referencedDeclaration": 10895,
+                        "src": "970:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7561,
+                      "id": 11107,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7560,
+                        "id": 11106,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7523,
-                        "src": "979:5:22",
+                        "referencedDeclaration": 11069,
+                        "src": "979:5:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -846,7 +846,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "970:15:22",
+                      "src": "970:15:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -859,12 +859,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7566,
+                          "id": 11112,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1008:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1008:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -882,26 +882,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7562,
+                            "id": 11108,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "988:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "988:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7564,
+                          "id": 11110,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7563,
+                            "id": 11109,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7523,
-                            "src": "997:5:22",
+                            "referencedDeclaration": 11069,
+                            "src": "997:5:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -912,27 +912,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "988:15:22",
+                          "src": "988:15:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7565,
+                        "id": 11111,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "988:19:22",
+                        "referencedDeclaration": 10771,
+                        "src": "988:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7567,
+                      "id": 11113,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -940,26 +940,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "988:27:22",
+                      "src": "988:27:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "970:45:22",
+                    "src": "970:45:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7569,
+                  "id": 11115,
                   "nodeType": "ExpressionStatement",
-                  "src": "970:45:22"
+                  "src": "970:45:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7579,
+                    "id": 11125,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -968,26 +968,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7570,
+                        "id": 11116,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "1021:8:22",
+                        "referencedDeclaration": 10895,
+                        "src": "1021:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7572,
+                      "id": 11118,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7571,
+                        "id": 11117,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7525,
-                        "src": "1030:3:22",
+                        "referencedDeclaration": 11071,
+                        "src": "1030:3:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -998,7 +998,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1021:13:22",
+                      "src": "1021:13:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1011,12 +1011,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7577,
+                          "id": 11123,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1055:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1055:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1034,26 +1034,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7573,
+                            "id": 11119,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "1037:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "1037:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7575,
+                          "id": 11121,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7574,
+                            "id": 11120,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7525,
-                            "src": "1046:3:22",
+                            "referencedDeclaration": 11071,
+                            "src": "1046:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1064,27 +1064,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1037:13:22",
+                          "src": "1037:13:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7576,
+                        "id": 11122,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "1037:17:22",
+                        "referencedDeclaration": 10795,
+                        "src": "1037:17:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7578,
+                      "id": 11124,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1092,26 +1092,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1037:25:22",
+                      "src": "1037:25:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1021:41:22",
+                    "src": "1021:41:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7580,
+                  "id": 11126,
                   "nodeType": "ExpressionStatement",
-                  "src": "1021:41:22"
+                  "src": "1021:41:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7596,
+                    "id": 11142,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1122,26 +1122,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7581,
+                          "id": 11127,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "1068:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "1068:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7585,
+                        "id": 11131,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7582,
+                          "id": 11128,
                           "name": "_from",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7523,
-                          "src": "1076:5:22",
+                          "referencedDeclaration": 11069,
+                          "src": "1076:5:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1152,29 +1152,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1068:14:22",
+                        "src": "1068:14:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7586,
+                      "id": 11132,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7583,
+                          "id": 11129,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1083:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "1083:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7584,
+                        "id": 11130,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1182,7 +1182,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1083:10:22",
+                        "src": "1083:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1193,7 +1193,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1068:26:22",
+                      "src": "1068:26:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1206,12 +1206,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7594,
+                          "id": 11140,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1128:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1128:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1231,26 +1231,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 7587,
+                              "id": 11133,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7521,
-                              "src": "1097:7:22",
+                              "referencedDeclaration": 11067,
+                              "src": "1097:7:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 7589,
+                            "id": 11135,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7588,
+                              "id": 11134,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7523,
-                              "src": "1105:5:22",
+                              "referencedDeclaration": 11069,
+                              "src": "1105:5:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1261,29 +1261,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1097:14:22",
+                            "src": "1097:14:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7592,
+                          "id": 11138,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7590,
+                              "id": 11136,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "1112:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "1112:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7591,
+                            "id": 11137,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1291,7 +1291,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "1112:10:22",
+                            "src": "1112:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1302,27 +1302,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1097:26:22",
+                          "src": "1097:26:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7593,
+                        "id": 11139,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "1097:30:22",
+                        "referencedDeclaration": 10771,
+                        "src": "1097:30:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7595,
+                      "id": 11141,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1330,21 +1330,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:38:22",
+                      "src": "1097:38:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1068:67:22",
+                    "src": "1068:67:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7597,
+                  "id": 11143,
                   "nodeType": "ExpressionStatement",
-                  "src": "1068:67:22"
+                  "src": "1068:67:20"
                 },
                 {
                   "eventCall": {
@@ -1352,12 +1352,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7599,
+                        "id": 11145,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7523,
-                        "src": "1155:5:22",
+                        "referencedDeclaration": 11069,
+                        "src": "1155:5:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1365,12 +1365,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7600,
+                        "id": 11146,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7525,
-                        "src": "1162:3:22",
+                        "referencedDeclaration": 11071,
+                        "src": "1162:3:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1378,12 +1378,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7601,
+                        "id": 11147,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7527,
-                        "src": "1167:6:22",
+                        "referencedDeclaration": 11073,
+                        "src": "1167:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1405,18 +1405,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7598,
+                      "id": 11144,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7506,
-                      "src": "1146:8:22",
+                      "referencedDeclaration": 11052,
+                      "src": "1146:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7602,
+                    "id": 11148,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1424,28 +1424,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1146:28:22",
+                    "src": "1146:28:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7603,
+                  "id": 11149,
                   "nodeType": "EmitStatement",
-                  "src": "1141:33:22"
+                  "src": "1141:33:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7604,
+                    "id": 11150,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1187:4:22",
+                    "src": "1187:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1453,15 +1453,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7531,
-                  "id": 7605,
+                  "functionReturnParameters": 11077,
+                  "id": 11151,
                   "nodeType": "Return",
-                  "src": "1180:11:22"
+                  "src": "1180:11:20"
                 }
               ]
             },
             "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred",
-            "id": 7607,
+            "id": 11153,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1469,16 +1469,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7528,
+              "id": 11074,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7523,
+                  "id": 11069,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "753:13:22",
+                  "scope": 11153,
+                  "src": "753:13:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1486,10 +1486,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7522,
+                    "id": 11068,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:22",
+                    "src": "753:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1500,11 +1500,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7525,
+                  "id": 11071,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "772:11:22",
+                  "scope": 11153,
+                  "src": "772:11:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1512,10 +1512,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7524,
+                    "id": 11070,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:22",
+                    "src": "772:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1526,11 +1526,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7527,
+                  "id": 11073,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "789:14:22",
+                  "scope": 11153,
+                  "src": "789:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1538,10 +1538,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7526,
+                    "id": 11072,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "789:7:22",
+                    "src": "789:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1551,20 +1551,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "747:60:22"
+              "src": "747:60:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7531,
+              "id": 11077,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7530,
+                  "id": 11076,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "832:4:22",
+                  "scope": 11153,
+                  "src": "832:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1572,10 +1572,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7529,
+                    "id": 11075,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "832:4:22",
+                    "src": "832:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1585,24 +1585,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "831:6:22"
+              "src": "831:6:20"
             },
-            "scope": 7754,
-            "src": "726:470:22",
+            "scope": 11300,
+            "src": "726:470:20",
             "stateMutability": "nonpayable",
-            "superFunction": 7457,
+            "superFunction": 11003,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7634,
+              "id": 11180,
               "nodeType": "Block",
-              "src": "1887:115:22",
+              "src": "1887:115:20",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7623,
+                    "id": 11169,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1613,34 +1613,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7616,
+                          "id": 11162,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "1893:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "1893:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7620,
+                        "id": 11166,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 7617,
+                            "id": 11163,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1901:3:22",
+                            "referencedDeclaration": 11315,
+                            "src": "1901:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 7618,
+                          "id": 11164,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1648,7 +1648,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1901:10:22",
+                          "src": "1901:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1659,21 +1659,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1893:19:22",
+                        "src": "1893:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7621,
+                      "id": 11167,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7619,
+                        "id": 11165,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7609,
-                        "src": "1913:8:22",
+                        "referencedDeclaration": 11155,
+                        "src": "1913:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1684,7 +1684,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1893:29:22",
+                      "src": "1893:29:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1694,26 +1694,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 7622,
+                      "id": 11168,
                       "name": "_value",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7611,
-                      "src": "1925:6:22",
+                      "referencedDeclaration": 11157,
+                      "src": "1925:6:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1893:38:22",
+                    "src": "1893:38:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7624,
+                  "id": 11170,
                   "nodeType": "ExpressionStatement",
-                  "src": "1893:38:22"
+                  "src": "1893:38:20"
                 },
                 {
                   "eventCall": {
@@ -1723,18 +1723,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7626,
+                          "id": 11172,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1951:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "1951:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7627,
+                        "id": 11173,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1742,7 +1742,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1951:10:22",
+                        "src": "1951:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1750,12 +1750,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7628,
+                        "id": 11174,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7609,
-                        "src": "1963:8:22",
+                        "referencedDeclaration": 11155,
+                        "src": "1963:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1763,12 +1763,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7629,
+                        "id": 11175,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7611,
-                        "src": "1973:6:22",
+                        "referencedDeclaration": 11157,
+                        "src": "1973:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1790,18 +1790,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7625,
+                      "id": 11171,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "1942:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "1942:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7630,
+                    "id": 11176,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1809,28 +1809,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1942:38:22",
+                    "src": "1942:38:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7631,
+                  "id": 11177,
                   "nodeType": "EmitStatement",
-                  "src": "1937:43:22"
+                  "src": "1937:43:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7632,
+                    "id": 11178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1993:4:22",
+                    "src": "1993:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1838,15 +1838,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7615,
-                  "id": 7633,
+                  "functionReturnParameters": 11161,
+                  "id": 11179,
                   "nodeType": "Return",
-                  "src": "1986:11:22"
+                  "src": "1986:11:20"
                 }
               ]
             },
             "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.",
-            "id": 7635,
+            "id": 11181,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1854,16 +1854,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7612,
+              "id": 11158,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7609,
+                  "id": 11155,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1831:16:22",
+                  "scope": 11181,
+                  "src": "1831:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1871,10 +1871,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7608,
+                    "id": 11154,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1831:7:22",
+                    "src": "1831:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1885,11 +1885,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7611,
+                  "id": 11157,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1849:14:22",
+                  "scope": 11181,
+                  "src": "1849:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1897,10 +1897,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7610,
+                    "id": 11156,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1849:7:22",
+                    "src": "1849:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1910,20 +1910,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1830:34:22"
+              "src": "1830:34:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7615,
+              "id": 11161,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7614,
+                  "id": 11160,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1881:4:22",
+                  "scope": 11181,
+                  "src": "1881:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1931,10 +1931,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7613,
+                    "id": 11159,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1881:4:22",
+                    "src": "1881:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1944,19 +1944,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1880:6:22"
+              "src": "1880:6:20"
             },
-            "scope": 7754,
-            "src": "1814:188:22",
+            "scope": 11300,
+            "src": "1814:188:20",
             "stateMutability": "nonpayable",
-            "superFunction": 7466,
+            "superFunction": 11012,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7650,
+              "id": 11196,
               "nodeType": "Block",
-              "src": "2431:43:22",
+              "src": "2431:43:20",
               "statements": [
                 {
                   "expression": {
@@ -1965,26 +1965,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7644,
+                        "id": 11190,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7521,
-                        "src": "2444:7:22",
+                        "referencedDeclaration": 11067,
+                        "src": "2444:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 7646,
+                      "id": 11192,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7645,
+                        "id": 11191,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7637,
-                        "src": "2452:6:22",
+                        "referencedDeclaration": 11183,
+                        "src": "2452:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1995,21 +1995,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "2444:15:22",
+                      "src": "2444:15:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7648,
+                    "id": 11194,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7647,
+                      "id": 11193,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7639,
-                      "src": "2460:8:22",
+                      "referencedDeclaration": 11185,
+                      "src": "2460:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2020,21 +2020,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2444:25:22",
+                    "src": "2444:25:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7643,
-                  "id": 7649,
+                  "functionReturnParameters": 11189,
+                  "id": 11195,
                   "nodeType": "Return",
-                  "src": "2437:32:22"
+                  "src": "2437:32:20"
                 }
               ]
             },
             "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.",
-            "id": 7651,
+            "id": 11197,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2042,16 +2042,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7640,
+              "id": 11186,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7637,
+                  "id": 11183,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2345:14:22",
+                  "scope": 11197,
+                  "src": "2345:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2059,10 +2059,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7636,
+                    "id": 11182,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:22",
+                    "src": "2345:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2073,11 +2073,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7639,
+                  "id": 11185,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2365:16:22",
+                  "scope": 11197,
+                  "src": "2365:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2085,10 +2085,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7638,
+                    "id": 11184,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2365:7:22",
+                    "src": "2365:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2098,20 +2098,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2339:47:22"
+              "src": "2339:47:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7643,
+              "id": 11189,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7642,
+                  "id": 11188,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2420:7:22",
+                  "scope": 11197,
+                  "src": "2420:7:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2119,10 +2119,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7641,
+                    "id": 11187,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2420:7:22",
+                    "src": "2420:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2132,24 +2132,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2419:9:22"
+              "src": "2419:9:20"
             },
-            "scope": 7754,
-            "src": "2321:153:22",
+            "scope": 11300,
+            "src": "2321:153:20",
             "stateMutability": "view",
-            "superFunction": 7446,
+            "superFunction": 10992,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7692,
+              "id": 11238,
               "nodeType": "Block",
-              "src": "3035:187:22",
+              "src": "3035:187:20",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7676,
+                    "id": 11222,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2160,34 +2160,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7660,
+                          "id": 11206,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "3041:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "3041:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7664,
+                        "id": 11210,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 7661,
+                            "id": 11207,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "3049:3:22",
+                            "referencedDeclaration": 11315,
+                            "src": "3049:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 7662,
+                          "id": 11208,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2195,7 +2195,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "3049:10:22",
+                          "src": "3049:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2206,21 +2206,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3041:19:22",
+                        "src": "3041:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7665,
+                      "id": 11211,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7663,
+                        "id": 11209,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7653,
-                        "src": "3061:8:22",
+                        "referencedDeclaration": 11199,
+                        "src": "3061:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2231,7 +2231,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3041:29:22",
+                      "src": "3041:29:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2247,12 +2247,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 7673,
+                              "id": 11219,
                               "name": "_addedValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7655,
-                              "src": "3115:11:22",
+                              "referencedDeclaration": 11201,
+                              "src": "3115:11:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2272,34 +2272,34 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 7666,
+                                  "id": 11212,
                                   "name": "allowed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7521,
-                                  "src": "3081:7:22",
+                                  "referencedDeclaration": 11067,
+                                  "src": "3081:7:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                     "typeString": "mapping(address => mapping(address => uint256))"
                                   }
                                 },
-                                "id": 7669,
+                                "id": 11215,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 7667,
+                                    "id": 11213,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "3089:3:22",
+                                    "referencedDeclaration": 11315,
+                                    "src": "3089:3:20",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 7668,
+                                  "id": 11214,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -2307,7 +2307,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3089:10:22",
+                                  "src": "3089:10:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -2318,21 +2318,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "3081:19:22",
+                                "src": "3081:19:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                   "typeString": "mapping(address => uint256)"
                                 }
                               },
-                              "id": 7671,
+                              "id": 11217,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 7670,
+                                "id": 11216,
                                 "name": "_spender",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7653,
-                                "src": "3101:8:22",
+                                "referencedDeclaration": 11199,
+                                "src": "3101:8:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2343,27 +2343,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3081:29:22",
+                              "src": "3081:29:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 7672,
+                            "id": 11218,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7249,
-                            "src": "3081:33:22",
+                            "referencedDeclaration": 10795,
+                            "src": "3081:33:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 7674,
+                          "id": 11220,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2371,35 +2371,35 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3081:46:22",
+                          "src": "3081:46:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         }
                       ],
-                      "id": 7675,
+                      "id": 11221,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "TupleExpression",
-                      "src": "3073:55:22",
+                      "src": "3073:55:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3041:87:22",
+                    "src": "3041:87:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7677,
+                  "id": 11223,
                   "nodeType": "ExpressionStatement",
-                  "src": "3041:87:22"
+                  "src": "3041:87:20"
                 },
                 {
                   "eventCall": {
@@ -2409,18 +2409,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7679,
+                          "id": 11225,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "3148:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "3148:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7680,
+                        "id": 11226,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2428,7 +2428,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3148:10:22",
+                        "src": "3148:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2436,12 +2436,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7681,
+                        "id": 11227,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7653,
-                        "src": "3160:8:22",
+                        "referencedDeclaration": 11199,
+                        "src": "3160:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2453,34 +2453,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7682,
+                            "id": 11228,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7521,
-                            "src": "3170:7:22",
+                            "referencedDeclaration": 11067,
+                            "src": "3170:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 7685,
+                          "id": 11231,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7683,
+                              "id": 11229,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "3178:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "3178:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7684,
+                            "id": 11230,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2488,7 +2488,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3178:10:22",
+                            "src": "3178:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2499,21 +2499,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3170:19:22",
+                          "src": "3170:19:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 7687,
+                        "id": 11233,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7686,
+                          "id": 11232,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7653,
-                          "src": "3190:8:22",
+                          "referencedDeclaration": 11199,
+                          "src": "3190:8:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2524,7 +2524,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3170:29:22",
+                        "src": "3170:29:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2546,18 +2546,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7678,
+                      "id": 11224,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "3139:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "3139:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7688,
+                    "id": 11234,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2565,28 +2565,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3139:61:22",
+                    "src": "3139:61:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7689,
+                  "id": 11235,
                   "nodeType": "EmitStatement",
-                  "src": "3134:66:22"
+                  "src": "3134:66:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7690,
+                    "id": 11236,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "3213:4:22",
+                    "src": "3213:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2594,15 +2594,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7659,
-                  "id": 7691,
+                  "functionReturnParameters": 11205,
+                  "id": 11237,
                   "nodeType": "Return",
-                  "src": "3206:11:22"
+                  "src": "3206:11:20"
                 }
               ]
             },
             "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.",
-            "id": 7693,
+            "id": 11239,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2610,16 +2610,16 @@
             "name": "increaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7656,
+              "id": 11202,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7653,
+                  "id": 11199,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "2957:16:22",
+                  "scope": 11239,
+                  "src": "2957:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2627,10 +2627,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7652,
+                    "id": 11198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2957:7:22",
+                    "src": "2957:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2641,11 +2641,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7655,
+                  "id": 11201,
                   "name": "_addedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "2979:19:22",
+                  "scope": 11239,
+                  "src": "2979:19:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2653,10 +2653,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7654,
+                    "id": 11200,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2979:7:22",
+                    "src": "2979:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2666,20 +2666,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2951:51:22"
+              "src": "2951:51:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7659,
+              "id": 11205,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7658,
+                  "id": 11204,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "3027:4:22",
+                  "scope": 11239,
+                  "src": "3027:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2687,10 +2687,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7657,
+                    "id": 11203,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3027:4:22",
+                    "src": "3027:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2700,32 +2700,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3026:6:22"
+              "src": "3026:6:20"
             },
-            "scope": 7754,
-            "src": "2926:296:22",
+            "scope": 11300,
+            "src": "2926:296:20",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7752,
+              "id": 11298,
               "nodeType": "Block",
-              "src": "3793:318:22",
+              "src": "3793:318:20",
               "statements": [
                 {
                   "assignments": [
-                    7703
+                    11249
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 7703,
+                      "id": 11249,
                       "name": "oldValue",
                       "nodeType": "VariableDeclaration",
-                      "scope": 7753,
-                      "src": "3799:16:22",
+                      "scope": 11299,
+                      "src": "3799:16:20",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -2733,10 +2733,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 7702,
+                        "id": 11248,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "3799:7:22",
+                        "src": "3799:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2746,41 +2746,41 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 7710,
+                  "id": 11256,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7704,
+                        "id": 11250,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7521,
-                        "src": "3818:7:22",
+                        "referencedDeclaration": 11067,
+                        "src": "3818:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 7707,
+                      "id": 11253,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7705,
+                          "id": 11251,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "3826:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "3826:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7706,
+                        "id": 11252,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2788,7 +2788,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3826:10:22",
+                        "src": "3826:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2799,21 +2799,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3818:19:22",
+                      "src": "3818:19:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7709,
+                    "id": 11255,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7708,
+                      "id": 11254,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7695,
-                      "src": "3838:8:22",
+                      "referencedDeclaration": 11241,
+                      "src": "3838:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2824,14 +2824,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3818:29:22",
+                    "src": "3818:29:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "3799:48:22"
+                  "src": "3799:48:20"
                 },
                 {
                   "condition": {
@@ -2840,19 +2840,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 7713,
+                    "id": 11259,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 7711,
+                      "id": 11257,
                       "name": "_subtractedValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7697,
-                      "src": "3857:16:22",
+                      "referencedDeclaration": 11243,
+                      "src": "3857:16:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2862,32 +2862,32 @@
                     "operator": ">=",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 7712,
+                      "id": 11258,
                       "name": "oldValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7703,
-                      "src": "3877:8:22",
+                      "referencedDeclaration": 11249,
+                      "src": "3877:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3857:28:22",
+                    "src": "3857:28:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 7736,
+                    "id": 11282,
                     "nodeType": "Block",
-                    "src": "3941:77:22",
+                    "src": "3941:77:20",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7734,
+                          "id": 11280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2898,34 +2898,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 7724,
+                                "id": 11270,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7521,
-                                "src": "3949:7:22",
+                                "referencedDeclaration": 11067,
+                                "src": "3949:7:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 7728,
+                              "id": 11274,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 7725,
+                                  "id": 11271,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3957:3:22",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3957:3:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 7726,
+                                "id": 11272,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -2933,7 +2933,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3957:10:22",
+                                "src": "3957:10:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2944,21 +2944,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3949:19:22",
+                              "src": "3949:19:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 7729,
+                            "id": 11275,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7727,
+                              "id": 11273,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7695,
-                              "src": "3969:8:22",
+                              "referencedDeclaration": 11241,
+                              "src": "3969:8:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2969,7 +2969,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3949:29:22",
+                            "src": "3949:29:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -2982,12 +2982,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 7732,
+                                "id": 11278,
                                 "name": "_subtractedValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7697,
-                                "src": "3994:16:22",
+                                "referencedDeclaration": 11243,
+                                "src": "3994:16:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -3003,32 +3003,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 7730,
+                                "id": 11276,
                                 "name": "oldValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7703,
-                                "src": "3981:8:22",
+                                "referencedDeclaration": 11249,
+                                "src": "3981:8:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 7731,
+                              "id": 11277,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "3981:12:22",
+                              "referencedDeclaration": 10771,
+                              "src": "3981:12:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 7733,
+                            "id": 11279,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3036,36 +3036,36 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3981:30:22",
+                            "src": "3981:30:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3949:62:22",
+                          "src": "3949:62:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7735,
+                        "id": 11281,
                         "nodeType": "ExpressionStatement",
-                        "src": "3949:62:22"
+                        "src": "3949:62:20"
                       }
                     ]
                   },
-                  "id": 7737,
+                  "id": 11283,
                   "nodeType": "IfStatement",
-                  "src": "3853:165:22",
+                  "src": "3853:165:20",
                   "trueBody": {
-                    "id": 7723,
+                    "id": 11269,
                     "nodeType": "Block",
-                    "src": "3887:48:22",
+                    "src": "3887:48:20",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7721,
+                          "id": 11267,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3076,34 +3076,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 7714,
+                                "id": 11260,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7521,
-                                "src": "3895:7:22",
+                                "referencedDeclaration": 11067,
+                                "src": "3895:7:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 7718,
+                              "id": 11264,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 7715,
+                                  "id": 11261,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3903:3:22",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3903:3:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 7716,
+                                "id": 11262,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3111,7 +3111,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3903:10:22",
+                                "src": "3903:10:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -3122,21 +3122,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3895:19:22",
+                              "src": "3895:19:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 7719,
+                            "id": 11265,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7717,
+                              "id": 11263,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7695,
-                              "src": "3915:8:22",
+                              "referencedDeclaration": 11241,
+                              "src": "3915:8:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3147,7 +3147,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3895:29:22",
+                            "src": "3895:29:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3158,14 +3158,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 7720,
+                            "id": 11266,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3927:1:22",
+                            "src": "3927:1:20",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -3173,15 +3173,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "3895:33:22",
+                          "src": "3895:33:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7722,
+                        "id": 11268,
                         "nodeType": "ExpressionStatement",
-                        "src": "3895:33:22"
+                        "src": "3895:33:20"
                       }
                     ]
                   }
@@ -3194,18 +3194,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7739,
+                          "id": 11285,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "4037:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "4037:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7740,
+                        "id": 11286,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3213,7 +3213,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4037:10:22",
+                        "src": "4037:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3221,12 +3221,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7741,
+                        "id": 11287,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7695,
-                        "src": "4049:8:22",
+                        "referencedDeclaration": 11241,
+                        "src": "4049:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3238,34 +3238,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7742,
+                            "id": 11288,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7521,
-                            "src": "4059:7:22",
+                            "referencedDeclaration": 11067,
+                            "src": "4059:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 7745,
+                          "id": 11291,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7743,
+                              "id": 11289,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "4067:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "4067:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7744,
+                            "id": 11290,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3273,7 +3273,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4067:10:22",
+                            "src": "4067:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3284,21 +3284,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4059:19:22",
+                          "src": "4059:19:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 7747,
+                        "id": 11293,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7746,
+                          "id": 11292,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7695,
-                          "src": "4079:8:22",
+                          "referencedDeclaration": 11241,
+                          "src": "4079:8:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3309,7 +3309,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4059:29:22",
+                        "src": "4059:29:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3331,18 +3331,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7738,
+                      "id": 11284,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "4028:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "4028:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7748,
+                    "id": 11294,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3350,28 +3350,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4028:61:22",
+                    "src": "4028:61:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7749,
+                  "id": 11295,
                   "nodeType": "EmitStatement",
-                  "src": "4023:66:22"
+                  "src": "4023:66:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7750,
+                    "id": 11296,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4102:4:22",
+                    "src": "4102:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -3379,15 +3379,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7701,
-                  "id": 7751,
+                  "functionReturnParameters": 11247,
+                  "id": 11297,
                   "nodeType": "Return",
-                  "src": "4095:11:22"
+                  "src": "4095:11:20"
                 }
               ]
             },
             "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.",
-            "id": 7753,
+            "id": 11299,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3395,16 +3395,16 @@
             "name": "decreaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7698,
+              "id": 11244,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7695,
+                  "id": 11241,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3710:16:22",
+                  "scope": 11299,
+                  "src": "3710:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3412,10 +3412,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7694,
+                    "id": 11240,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3710:7:22",
+                    "src": "3710:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3426,11 +3426,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7697,
+                  "id": 11243,
                   "name": "_subtractedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3732:24:22",
+                  "scope": 11299,
+                  "src": "3732:24:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3438,10 +3438,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7696,
+                    "id": 11242,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3732:7:22",
+                    "src": "3732:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3451,20 +3451,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3704:56:22"
+              "src": "3704:56:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7701,
+              "id": 11247,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7700,
+                  "id": 11246,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3785:4:22",
+                  "scope": 11299,
+                  "src": "3785:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3472,10 +3472,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7699,
+                    "id": 11245,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3785:4:22",
+                    "src": "3785:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -3485,33 +3485,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3784:6:22"
+              "src": "3784:6:20"
             },
-            "scope": 7754,
-            "src": "3679:432:22",
+            "scope": 11300,
+            "src": "3679:432:20",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 7755,
-        "src": "334:3780:22"
+        "scope": 11301,
+        "src": "334:3780:20"
       }
     ],
-    "src": "0:4115:22"
+    "src": "0:4115:20"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
     "exportedSymbols": {
       "StandardToken": [
-        7754
+        11300
       ]
     },
-    "id": 7755,
+    "id": 11301,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 7509,
+        "id": 11055,
         "literals": [
           "solidity",
           "^",
@@ -3519,27 +3519,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:22"
+        "src": "0:24:20"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
         "file": "./BasicToken.sol",
-        "id": 7510,
+        "id": 11056,
         "nodeType": "ImportDirective",
-        "scope": 7755,
-        "sourceUnit": 7433,
-        "src": "26:26:22",
+        "scope": 11301,
+        "sourceUnit": 10979,
+        "src": "26:26:20",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
         "file": "./ERC20.sol",
-        "id": 7511,
+        "id": 11057,
         "nodeType": "ImportDirective",
-        "scope": 7755,
-        "sourceUnit": 7476,
-        "src": "53:21:22",
+        "scope": 11301,
+        "sourceUnit": 11022,
+        "src": "53:21:20",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -3549,64 +3549,64 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7512,
+              "id": 11058,
               "name": "ERC20",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7475,
-              "src": "360:5:22",
+              "referencedDeclaration": 11021,
+              "src": "360:5:20",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20_$7475",
+                "typeIdentifier": "t_contract$_ERC20_$11021",
                 "typeString": "contract ERC20"
               }
             },
-            "id": 7513,
+            "id": 11059,
             "nodeType": "InheritanceSpecifier",
-            "src": "360:5:22"
+            "src": "360:5:20"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 7514,
+              "id": 11060,
               "name": "BasicToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 7432,
-              "src": "367:10:22",
+              "referencedDeclaration": 10978,
+              "src": "367:10:20",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_BasicToken_$7432",
+                "typeIdentifier": "t_contract$_BasicToken_$10978",
                 "typeString": "contract BasicToken"
               }
             },
-            "id": 7515,
+            "id": 11061,
             "nodeType": "InheritanceSpecifier",
-            "src": "367:10:22"
+            "src": "367:10:20"
           }
         ],
         "contractDependencies": [
-          7432,
-          7475,
-          7507
+          10978,
+          11021,
+          11053
         ],
         "contractKind": "contract",
         "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol",
         "fullyImplemented": true,
-        "id": 7754,
+        "id": 11300,
         "linearizedBaseContracts": [
-          7754,
-          7432,
-          7475,
-          7507
+          11300,
+          10978,
+          11021,
+          11053
         ],
         "name": "StandardToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 7521,
+            "id": 11067,
             "name": "allowed",
             "nodeType": "VariableDeclaration",
-            "scope": 7754,
-            "src": "383:66:22",
+            "scope": 11300,
+            "src": "383:66:20",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3614,46 +3614,46 @@
               "typeString": "mapping(address => mapping(address => uint256))"
             },
             "typeName": {
-              "id": 7520,
+              "id": 11066,
               "keyType": {
-                "id": 7516,
+                "id": 11062,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "392:7:22",
+                "src": "392:7:20",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "383:49:22",
+              "src": "383:49:20",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(address => uint256))"
               },
               "valueType": {
-                "id": 7519,
+                "id": 11065,
                 "keyType": {
-                  "id": 7517,
+                  "id": 11063,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "412:7:22",
+                  "src": "412:7:20",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "403:28:22",
+                "src": "403:28:20",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                   "typeString": "mapping(address => uint256)"
                 },
                 "valueType": {
-                  "id": 7518,
+                  "id": 11064,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "423:7:22",
+                  "src": "423:7:20",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -3666,9 +3666,9 @@
           },
           {
             "body": {
-              "id": 7606,
+              "id": 11152,
               "nodeType": "Block",
-              "src": "840:356:22",
+              "src": "840:356:20",
               "statements": [
                 {
                   "expression": {
@@ -3680,19 +3680,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7537,
+                        "id": 11083,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7533,
+                          "id": 11079,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "854:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "854:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3704,26 +3704,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7534,
+                            "id": 11080,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "864:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "864:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7536,
+                          "id": 11082,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7535,
+                            "id": 11081,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7523,
-                            "src": "873:5:22",
+                            "referencedDeclaration": 11069,
+                            "src": "873:5:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3734,13 +3734,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "864:15:22",
+                          "src": "864:15:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "854:25:22",
+                        "src": "854:25:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3754,21 +3754,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7532,
+                      "id": 11078,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "846:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "846:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7538,
+                    "id": 11084,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3776,15 +3776,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "846:34:22",
+                    "src": "846:34:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7539,
+                  "id": 11085,
                   "nodeType": "ExpressionStatement",
-                  "src": "846:34:22"
+                  "src": "846:34:20"
                 },
                 {
                   "expression": {
@@ -3796,19 +3796,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 7548,
+                        "id": 11094,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7541,
+                          "id": 11087,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "894:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "894:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3822,26 +3822,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 7542,
+                              "id": 11088,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7521,
-                              "src": "904:7:22",
+                              "referencedDeclaration": 11067,
+                              "src": "904:7:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 7544,
+                            "id": 11090,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7543,
+                              "id": 11089,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7523,
-                              "src": "912:5:22",
+                              "referencedDeclaration": 11069,
+                              "src": "912:5:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3852,29 +3852,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "904:14:22",
+                            "src": "904:14:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7547,
+                          "id": 11093,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7545,
+                              "id": 11091,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "919:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "919:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7546,
+                            "id": 11092,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3882,7 +3882,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "919:10:22",
+                            "src": "919:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3893,13 +3893,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "904:26:22",
+                          "src": "904:26:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "894:36:22",
+                        "src": "894:36:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3913,21 +3913,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7540,
+                      "id": 11086,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "886:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "886:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7549,
+                    "id": 11095,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3935,15 +3935,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "886:45:22",
+                    "src": "886:45:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7550,
+                  "id": 11096,
                   "nodeType": "ExpressionStatement",
-                  "src": "886:45:22"
+                  "src": "886:45:20"
                 },
                 {
                   "expression": {
@@ -3955,19 +3955,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 7556,
+                        "id": 11102,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 7552,
+                          "id": 11098,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7525,
-                          "src": "945:3:22",
+                          "referencedDeclaration": 11071,
+                          "src": "945:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3981,14 +3981,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 7554,
+                              "id": 11100,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "960:1:22",
+                              "src": "960:1:20",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -4004,20 +4004,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 7553,
+                            "id": 11099,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "952:7:22",
+                            "src": "952:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 7555,
+                          "id": 11101,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4025,13 +4025,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "952:10:22",
+                          "src": "952:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "945:17:22",
+                        "src": "945:17:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4045,21 +4045,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 7551,
+                      "id": 11097,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11318,
+                        11319
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "937:7:22",
+                      "referencedDeclaration": 11318,
+                      "src": "937:7:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 7557,
+                    "id": 11103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4067,20 +4067,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "937:26:22",
+                    "src": "937:26:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7558,
+                  "id": 11104,
                   "nodeType": "ExpressionStatement",
-                  "src": "937:26:22"
+                  "src": "937:26:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7568,
+                    "id": 11114,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4089,26 +4089,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7559,
+                        "id": 11105,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "970:8:22",
+                        "referencedDeclaration": 10895,
+                        "src": "970:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7561,
+                      "id": 11107,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7560,
+                        "id": 11106,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7523,
-                        "src": "979:5:22",
+                        "referencedDeclaration": 11069,
+                        "src": "979:5:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4119,7 +4119,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "970:15:22",
+                      "src": "970:15:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4132,12 +4132,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7566,
+                          "id": 11112,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1008:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1008:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4155,26 +4155,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7562,
+                            "id": 11108,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "988:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "988:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7564,
+                          "id": 11110,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7563,
+                            "id": 11109,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7523,
-                            "src": "997:5:22",
+                            "referencedDeclaration": 11069,
+                            "src": "997:5:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4185,27 +4185,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "988:15:22",
+                          "src": "988:15:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7565,
+                        "id": 11111,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "988:19:22",
+                        "referencedDeclaration": 10771,
+                        "src": "988:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7567,
+                      "id": 11113,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4213,26 +4213,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "988:27:22",
+                      "src": "988:27:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "970:45:22",
+                    "src": "970:45:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7569,
+                  "id": 11115,
                   "nodeType": "ExpressionStatement",
-                  "src": "970:45:22"
+                  "src": "970:45:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7579,
+                    "id": 11125,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4241,26 +4241,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7570,
+                        "id": 11116,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7349,
-                        "src": "1021:8:22",
+                        "referencedDeclaration": 10895,
+                        "src": "1021:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7572,
+                      "id": 11118,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7571,
+                        "id": 11117,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7525,
-                        "src": "1030:3:22",
+                        "referencedDeclaration": 11071,
+                        "src": "1030:3:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4271,7 +4271,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1021:13:22",
+                      "src": "1021:13:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4284,12 +4284,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7577,
+                          "id": 11123,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1055:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1055:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4307,26 +4307,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7573,
+                            "id": 11119,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7349,
-                            "src": "1037:8:22",
+                            "referencedDeclaration": 10895,
+                            "src": "1037:8:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7575,
+                          "id": 11121,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 7574,
+                            "id": 11120,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7525,
-                            "src": "1046:3:22",
+                            "referencedDeclaration": 11071,
+                            "src": "1046:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4337,27 +4337,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1037:13:22",
+                          "src": "1037:13:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7576,
+                        "id": 11122,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7249,
-                        "src": "1037:17:22",
+                        "referencedDeclaration": 10795,
+                        "src": "1037:17:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7578,
+                      "id": 11124,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4365,26 +4365,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1037:25:22",
+                      "src": "1037:25:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1021:41:22",
+                    "src": "1021:41:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7580,
+                  "id": 11126,
                   "nodeType": "ExpressionStatement",
-                  "src": "1021:41:22"
+                  "src": "1021:41:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7596,
+                    "id": 11142,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4395,26 +4395,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7581,
+                          "id": 11127,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "1068:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "1068:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7585,
+                        "id": 11131,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7582,
+                          "id": 11128,
                           "name": "_from",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7523,
-                          "src": "1076:5:22",
+                          "referencedDeclaration": 11069,
+                          "src": "1076:5:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4425,29 +4425,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1068:14:22",
+                        "src": "1068:14:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7586,
+                      "id": 11132,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7583,
+                          "id": 11129,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1083:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "1083:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7584,
+                        "id": 11130,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4455,7 +4455,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1083:10:22",
+                        "src": "1083:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4466,7 +4466,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1068:26:22",
+                      "src": "1068:26:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4479,12 +4479,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 7594,
+                          "id": 11140,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7527,
-                          "src": "1128:6:22",
+                          "referencedDeclaration": 11073,
+                          "src": "1128:6:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4504,26 +4504,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 7587,
+                              "id": 11133,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7521,
-                              "src": "1097:7:22",
+                              "referencedDeclaration": 11067,
+                              "src": "1097:7:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 7589,
+                            "id": 11135,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7588,
+                              "id": 11134,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7523,
-                              "src": "1105:5:22",
+                              "referencedDeclaration": 11069,
+                              "src": "1105:5:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4534,29 +4534,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1097:14:22",
+                            "src": "1097:14:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 7592,
+                          "id": 11138,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7590,
+                              "id": 11136,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "1112:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "1112:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7591,
+                            "id": 11137,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4564,7 +4564,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "1112:10:22",
+                            "src": "1112:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4575,27 +4575,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1097:26:22",
+                          "src": "1097:26:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7593,
+                        "id": 11139,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 7225,
-                        "src": "1097:30:22",
+                        "referencedDeclaration": 10771,
+                        "src": "1097:30:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 7595,
+                      "id": 11141,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4603,21 +4603,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:38:22",
+                      "src": "1097:38:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1068:67:22",
+                    "src": "1068:67:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7597,
+                  "id": 11143,
                   "nodeType": "ExpressionStatement",
-                  "src": "1068:67:22"
+                  "src": "1068:67:20"
                 },
                 {
                   "eventCall": {
@@ -4625,12 +4625,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 7599,
+                        "id": 11145,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7523,
-                        "src": "1155:5:22",
+                        "referencedDeclaration": 11069,
+                        "src": "1155:5:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4638,12 +4638,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7600,
+                        "id": 11146,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7525,
-                        "src": "1162:3:22",
+                        "referencedDeclaration": 11071,
+                        "src": "1162:3:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4651,12 +4651,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7601,
+                        "id": 11147,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7527,
-                        "src": "1167:6:22",
+                        "referencedDeclaration": 11073,
+                        "src": "1167:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4678,18 +4678,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7598,
+                      "id": 11144,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7506,
-                      "src": "1146:8:22",
+                      "referencedDeclaration": 11052,
+                      "src": "1146:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7602,
+                    "id": 11148,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4697,28 +4697,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1146:28:22",
+                    "src": "1146:28:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7603,
+                  "id": 11149,
                   "nodeType": "EmitStatement",
-                  "src": "1141:33:22"
+                  "src": "1141:33:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7604,
+                    "id": 11150,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1187:4:22",
+                    "src": "1187:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4726,15 +4726,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7531,
-                  "id": 7605,
+                  "functionReturnParameters": 11077,
+                  "id": 11151,
                   "nodeType": "Return",
-                  "src": "1180:11:22"
+                  "src": "1180:11:20"
                 }
               ]
             },
             "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred",
-            "id": 7607,
+            "id": 11153,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4742,16 +4742,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7528,
+              "id": 11074,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7523,
+                  "id": 11069,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "753:13:22",
+                  "scope": 11153,
+                  "src": "753:13:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4759,10 +4759,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7522,
+                    "id": 11068,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:22",
+                    "src": "753:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4773,11 +4773,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7525,
+                  "id": 11071,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "772:11:22",
+                  "scope": 11153,
+                  "src": "772:11:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4785,10 +4785,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7524,
+                    "id": 11070,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:22",
+                    "src": "772:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4799,11 +4799,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7527,
+                  "id": 11073,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "789:14:22",
+                  "scope": 11153,
+                  "src": "789:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4811,10 +4811,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7526,
+                    "id": 11072,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "789:7:22",
+                    "src": "789:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4824,20 +4824,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "747:60:22"
+              "src": "747:60:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7531,
+              "id": 11077,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7530,
+                  "id": 11076,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7607,
-                  "src": "832:4:22",
+                  "scope": 11153,
+                  "src": "832:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4845,10 +4845,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7529,
+                    "id": 11075,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "832:4:22",
+                    "src": "832:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4858,24 +4858,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "831:6:22"
+              "src": "831:6:20"
             },
-            "scope": 7754,
-            "src": "726:470:22",
+            "scope": 11300,
+            "src": "726:470:20",
             "stateMutability": "nonpayable",
-            "superFunction": 7457,
+            "superFunction": 11003,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7634,
+              "id": 11180,
               "nodeType": "Block",
-              "src": "1887:115:22",
+              "src": "1887:115:20",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7623,
+                    "id": 11169,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4886,34 +4886,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7616,
+                          "id": 11162,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "1893:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "1893:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7620,
+                        "id": 11166,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 7617,
+                            "id": 11163,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1901:3:22",
+                            "referencedDeclaration": 11315,
+                            "src": "1901:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 7618,
+                          "id": 11164,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4921,7 +4921,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1901:10:22",
+                          "src": "1901:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4932,21 +4932,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1893:19:22",
+                        "src": "1893:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7621,
+                      "id": 11167,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7619,
+                        "id": 11165,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7609,
-                        "src": "1913:8:22",
+                        "referencedDeclaration": 11155,
+                        "src": "1913:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4957,7 +4957,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1893:29:22",
+                      "src": "1893:29:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4967,26 +4967,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 7622,
+                      "id": 11168,
                       "name": "_value",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7611,
-                      "src": "1925:6:22",
+                      "referencedDeclaration": 11157,
+                      "src": "1925:6:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1893:38:22",
+                    "src": "1893:38:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7624,
+                  "id": 11170,
                   "nodeType": "ExpressionStatement",
-                  "src": "1893:38:22"
+                  "src": "1893:38:20"
                 },
                 {
                   "eventCall": {
@@ -4996,18 +4996,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7626,
+                          "id": 11172,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "1951:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "1951:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7627,
+                        "id": 11173,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -5015,7 +5015,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1951:10:22",
+                        "src": "1951:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5023,12 +5023,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7628,
+                        "id": 11174,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7609,
-                        "src": "1963:8:22",
+                        "referencedDeclaration": 11155,
+                        "src": "1963:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5036,12 +5036,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7629,
+                        "id": 11175,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7611,
-                        "src": "1973:6:22",
+                        "referencedDeclaration": 11157,
+                        "src": "1973:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5063,18 +5063,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7625,
+                      "id": 11171,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "1942:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "1942:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7630,
+                    "id": 11176,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5082,28 +5082,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1942:38:22",
+                    "src": "1942:38:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7631,
+                  "id": 11177,
                   "nodeType": "EmitStatement",
-                  "src": "1937:43:22"
+                  "src": "1937:43:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7632,
+                    "id": 11178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1993:4:22",
+                    "src": "1993:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5111,15 +5111,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7615,
-                  "id": 7633,
+                  "functionReturnParameters": 11161,
+                  "id": 11179,
                   "nodeType": "Return",
-                  "src": "1986:11:22"
+                  "src": "1986:11:20"
                 }
               ]
             },
             "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.",
-            "id": 7635,
+            "id": 11181,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -5127,16 +5127,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7612,
+              "id": 11158,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7609,
+                  "id": 11155,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1831:16:22",
+                  "scope": 11181,
+                  "src": "1831:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5144,10 +5144,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7608,
+                    "id": 11154,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1831:7:22",
+                    "src": "1831:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5158,11 +5158,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7611,
+                  "id": 11157,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1849:14:22",
+                  "scope": 11181,
+                  "src": "1849:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5170,10 +5170,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7610,
+                    "id": 11156,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1849:7:22",
+                    "src": "1849:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5183,20 +5183,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1830:34:22"
+              "src": "1830:34:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7615,
+              "id": 11161,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7614,
+                  "id": 11160,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7635,
-                  "src": "1881:4:22",
+                  "scope": 11181,
+                  "src": "1881:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5204,10 +5204,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7613,
+                    "id": 11159,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1881:4:22",
+                    "src": "1881:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5217,19 +5217,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1880:6:22"
+              "src": "1880:6:20"
             },
-            "scope": 7754,
-            "src": "1814:188:22",
+            "scope": 11300,
+            "src": "1814:188:20",
             "stateMutability": "nonpayable",
-            "superFunction": 7466,
+            "superFunction": 11012,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7650,
+              "id": 11196,
               "nodeType": "Block",
-              "src": "2431:43:22",
+              "src": "2431:43:20",
               "statements": [
                 {
                   "expression": {
@@ -5238,26 +5238,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7644,
+                        "id": 11190,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7521,
-                        "src": "2444:7:22",
+                        "referencedDeclaration": 11067,
+                        "src": "2444:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 7646,
+                      "id": 11192,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7645,
+                        "id": 11191,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7637,
-                        "src": "2452:6:22",
+                        "referencedDeclaration": 11183,
+                        "src": "2452:6:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5268,21 +5268,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "2444:15:22",
+                      "src": "2444:15:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7648,
+                    "id": 11194,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7647,
+                      "id": 11193,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7639,
-                      "src": "2460:8:22",
+                      "referencedDeclaration": 11185,
+                      "src": "2460:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -5293,21 +5293,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2444:25:22",
+                    "src": "2444:25:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 7643,
-                  "id": 7649,
+                  "functionReturnParameters": 11189,
+                  "id": 11195,
                   "nodeType": "Return",
-                  "src": "2437:32:22"
+                  "src": "2437:32:20"
                 }
               ]
             },
             "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.",
-            "id": 7651,
+            "id": 11197,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -5315,16 +5315,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7640,
+              "id": 11186,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7637,
+                  "id": 11183,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2345:14:22",
+                  "scope": 11197,
+                  "src": "2345:14:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5332,10 +5332,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7636,
+                    "id": 11182,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:22",
+                    "src": "2345:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5346,11 +5346,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7639,
+                  "id": 11185,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2365:16:22",
+                  "scope": 11197,
+                  "src": "2365:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5358,10 +5358,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7638,
+                    "id": 11184,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2365:7:22",
+                    "src": "2365:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5371,20 +5371,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2339:47:22"
+              "src": "2339:47:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7643,
+              "id": 11189,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7642,
+                  "id": 11188,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7651,
-                  "src": "2420:7:22",
+                  "scope": 11197,
+                  "src": "2420:7:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5392,10 +5392,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7641,
+                    "id": 11187,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2420:7:22",
+                    "src": "2420:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5405,24 +5405,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2419:9:22"
+              "src": "2419:9:20"
             },
-            "scope": 7754,
-            "src": "2321:153:22",
+            "scope": 11300,
+            "src": "2321:153:20",
             "stateMutability": "view",
-            "superFunction": 7446,
+            "superFunction": 10992,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7692,
+              "id": 11238,
               "nodeType": "Block",
-              "src": "3035:187:22",
+              "src": "3035:187:20",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 7676,
+                    "id": 11222,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5433,34 +5433,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 7660,
+                          "id": 11206,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7521,
-                          "src": "3041:7:22",
+                          "referencedDeclaration": 11067,
+                          "src": "3041:7:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 7664,
+                        "id": 11210,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 7661,
+                            "id": 11207,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "3049:3:22",
+                            "referencedDeclaration": 11315,
+                            "src": "3049:3:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 7662,
+                          "id": 11208,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5468,7 +5468,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "3049:10:22",
+                          "src": "3049:10:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5479,21 +5479,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3041:19:22",
+                        "src": "3041:19:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 7665,
+                      "id": 11211,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 7663,
+                        "id": 11209,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7653,
-                        "src": "3061:8:22",
+                        "referencedDeclaration": 11199,
+                        "src": "3061:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5504,7 +5504,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3041:29:22",
+                      "src": "3041:29:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5520,12 +5520,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 7673,
+                              "id": 11219,
                               "name": "_addedValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7655,
-                              "src": "3115:11:22",
+                              "referencedDeclaration": 11201,
+                              "src": "3115:11:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5545,34 +5545,34 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 7666,
+                                  "id": 11212,
                                   "name": "allowed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7521,
-                                  "src": "3081:7:22",
+                                  "referencedDeclaration": 11067,
+                                  "src": "3081:7:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                     "typeString": "mapping(address => mapping(address => uint256))"
                                   }
                                 },
-                                "id": 7669,
+                                "id": 11215,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 7667,
+                                    "id": 11213,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 7769,
-                                    "src": "3089:3:22",
+                                    "referencedDeclaration": 11315,
+                                    "src": "3089:3:20",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 7668,
+                                  "id": 11214,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5580,7 +5580,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3089:10:22",
+                                  "src": "3089:10:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -5591,21 +5591,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "3081:19:22",
+                                "src": "3081:19:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                   "typeString": "mapping(address => uint256)"
                                 }
                               },
-                              "id": 7671,
+                              "id": 11217,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 7670,
+                                "id": 11216,
                                 "name": "_spender",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7653,
-                                "src": "3101:8:22",
+                                "referencedDeclaration": 11199,
+                                "src": "3101:8:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -5616,27 +5616,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3081:29:22",
+                              "src": "3081:29:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 7672,
+                            "id": 11218,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 7249,
-                            "src": "3081:33:22",
+                            "referencedDeclaration": 10795,
+                            "src": "3081:33:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 7674,
+                          "id": 11220,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5644,35 +5644,35 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3081:46:22",
+                          "src": "3081:46:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         }
                       ],
-                      "id": 7675,
+                      "id": 11221,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "TupleExpression",
-                      "src": "3073:55:22",
+                      "src": "3073:55:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3041:87:22",
+                    "src": "3041:87:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 7677,
+                  "id": 11223,
                   "nodeType": "ExpressionStatement",
-                  "src": "3041:87:22"
+                  "src": "3041:87:20"
                 },
                 {
                   "eventCall": {
@@ -5682,18 +5682,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7679,
+                          "id": 11225,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "3148:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "3148:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7680,
+                        "id": 11226,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -5701,7 +5701,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3148:10:22",
+                        "src": "3148:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5709,12 +5709,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7681,
+                        "id": 11227,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7653,
-                        "src": "3160:8:22",
+                        "referencedDeclaration": 11199,
+                        "src": "3160:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5726,34 +5726,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7682,
+                            "id": 11228,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7521,
-                            "src": "3170:7:22",
+                            "referencedDeclaration": 11067,
+                            "src": "3170:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 7685,
+                          "id": 11231,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7683,
+                              "id": 11229,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "3178:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "3178:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7684,
+                            "id": 11230,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -5761,7 +5761,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3178:10:22",
+                            "src": "3178:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5772,21 +5772,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3170:19:22",
+                          "src": "3170:19:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 7687,
+                        "id": 11233,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7686,
+                          "id": 11232,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7653,
-                          "src": "3190:8:22",
+                          "referencedDeclaration": 11199,
+                          "src": "3190:8:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5797,7 +5797,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3170:29:22",
+                        "src": "3170:29:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5819,18 +5819,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7678,
+                      "id": 11224,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "3139:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "3139:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7688,
+                    "id": 11234,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5838,28 +5838,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3139:61:22",
+                    "src": "3139:61:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7689,
+                  "id": 11235,
                   "nodeType": "EmitStatement",
-                  "src": "3134:66:22"
+                  "src": "3134:66:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7690,
+                    "id": 11236,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "3213:4:22",
+                    "src": "3213:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5867,15 +5867,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7659,
-                  "id": 7691,
+                  "functionReturnParameters": 11205,
+                  "id": 11237,
                   "nodeType": "Return",
-                  "src": "3206:11:22"
+                  "src": "3206:11:20"
                 }
               ]
             },
             "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.",
-            "id": 7693,
+            "id": 11239,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -5883,16 +5883,16 @@
             "name": "increaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7656,
+              "id": 11202,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7653,
+                  "id": 11199,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "2957:16:22",
+                  "scope": 11239,
+                  "src": "2957:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5900,10 +5900,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7652,
+                    "id": 11198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2957:7:22",
+                    "src": "2957:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5914,11 +5914,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7655,
+                  "id": 11201,
                   "name": "_addedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "2979:19:22",
+                  "scope": 11239,
+                  "src": "2979:19:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5926,10 +5926,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7654,
+                    "id": 11200,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2979:7:22",
+                    "src": "2979:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5939,20 +5939,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2951:51:22"
+              "src": "2951:51:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7659,
+              "id": 11205,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7658,
+                  "id": 11204,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7693,
-                  "src": "3027:4:22",
+                  "scope": 11239,
+                  "src": "3027:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5960,10 +5960,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7657,
+                    "id": 11203,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3027:4:22",
+                    "src": "3027:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5973,32 +5973,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3026:6:22"
+              "src": "3026:6:20"
             },
-            "scope": 7754,
-            "src": "2926:296:22",
+            "scope": 11300,
+            "src": "2926:296:20",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 7752,
+              "id": 11298,
               "nodeType": "Block",
-              "src": "3793:318:22",
+              "src": "3793:318:20",
               "statements": [
                 {
                   "assignments": [
-                    7703
+                    11249
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 7703,
+                      "id": 11249,
                       "name": "oldValue",
                       "nodeType": "VariableDeclaration",
-                      "scope": 7753,
-                      "src": "3799:16:22",
+                      "scope": 11299,
+                      "src": "3799:16:20",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -6006,10 +6006,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 7702,
+                        "id": 11248,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "3799:7:22",
+                        "src": "3799:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6019,41 +6019,41 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 7710,
+                  "id": 11256,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 7704,
+                        "id": 11250,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7521,
-                        "src": "3818:7:22",
+                        "referencedDeclaration": 11067,
+                        "src": "3818:7:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 7707,
+                      "id": 11253,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7705,
+                          "id": 11251,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "3826:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "3826:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7706,
+                        "id": 11252,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6061,7 +6061,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3826:10:22",
+                        "src": "3826:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6072,21 +6072,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3818:19:22",
+                      "src": "3818:19:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 7709,
+                    "id": 11255,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 7708,
+                      "id": 11254,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7695,
-                      "src": "3838:8:22",
+                      "referencedDeclaration": 11241,
+                      "src": "3838:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -6097,14 +6097,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3818:29:22",
+                    "src": "3818:29:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "3799:48:22"
+                  "src": "3799:48:20"
                 },
                 {
                   "condition": {
@@ -6113,19 +6113,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 7713,
+                    "id": 11259,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 7711,
+                      "id": 11257,
                       "name": "_subtractedValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7697,
-                      "src": "3857:16:22",
+                      "referencedDeclaration": 11243,
+                      "src": "3857:16:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6135,32 +6135,32 @@
                     "operator": ">=",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 7712,
+                      "id": 11258,
                       "name": "oldValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7703,
-                      "src": "3877:8:22",
+                      "referencedDeclaration": 11249,
+                      "src": "3877:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3857:28:22",
+                    "src": "3857:28:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 7736,
+                    "id": 11282,
                     "nodeType": "Block",
-                    "src": "3941:77:22",
+                    "src": "3941:77:20",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7734,
+                          "id": 11280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6171,34 +6171,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 7724,
+                                "id": 11270,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7521,
-                                "src": "3949:7:22",
+                                "referencedDeclaration": 11067,
+                                "src": "3949:7:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 7728,
+                              "id": 11274,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 7725,
+                                  "id": 11271,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3957:3:22",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3957:3:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 7726,
+                                "id": 11272,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6206,7 +6206,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3957:10:22",
+                                "src": "3957:10:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6217,21 +6217,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3949:19:22",
+                              "src": "3949:19:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 7729,
+                            "id": 11275,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7727,
+                              "id": 11273,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7695,
-                              "src": "3969:8:22",
+                              "referencedDeclaration": 11241,
+                              "src": "3969:8:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6242,7 +6242,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3949:29:22",
+                            "src": "3949:29:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6255,12 +6255,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 7732,
+                                "id": 11278,
                                 "name": "_subtractedValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7697,
-                                "src": "3994:16:22",
+                                "referencedDeclaration": 11243,
+                                "src": "3994:16:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -6276,32 +6276,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 7730,
+                                "id": 11276,
                                 "name": "oldValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7703,
-                                "src": "3981:8:22",
+                                "referencedDeclaration": 11249,
+                                "src": "3981:8:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 7731,
+                              "id": 11277,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 7225,
-                              "src": "3981:12:22",
+                              "referencedDeclaration": 10771,
+                              "src": "3981:12:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 7733,
+                            "id": 11279,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6309,36 +6309,36 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3981:30:22",
+                            "src": "3981:30:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3949:62:22",
+                          "src": "3949:62:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7735,
+                        "id": 11281,
                         "nodeType": "ExpressionStatement",
-                        "src": "3949:62:22"
+                        "src": "3949:62:20"
                       }
                     ]
                   },
-                  "id": 7737,
+                  "id": 11283,
                   "nodeType": "IfStatement",
-                  "src": "3853:165:22",
+                  "src": "3853:165:20",
                   "trueBody": {
-                    "id": 7723,
+                    "id": 11269,
                     "nodeType": "Block",
-                    "src": "3887:48:22",
+                    "src": "3887:48:20",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7721,
+                          "id": 11267,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6349,34 +6349,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 7714,
+                                "id": 11260,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 7521,
-                                "src": "3895:7:22",
+                                "referencedDeclaration": 11067,
+                                "src": "3895:7:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 7718,
+                              "id": 11264,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 7715,
+                                  "id": 11261,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 7769,
-                                  "src": "3903:3:22",
+                                  "referencedDeclaration": 11315,
+                                  "src": "3903:3:20",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 7716,
+                                "id": 11262,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6384,7 +6384,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3903:10:22",
+                                "src": "3903:10:20",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6395,21 +6395,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3895:19:22",
+                              "src": "3895:19:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 7719,
+                            "id": 11265,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 7717,
+                              "id": 11263,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7695,
-                              "src": "3915:8:22",
+                              "referencedDeclaration": 11241,
+                              "src": "3915:8:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6420,7 +6420,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3895:29:22",
+                            "src": "3895:29:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6431,14 +6431,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 7720,
+                            "id": 11266,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3927:1:22",
+                            "src": "3927:1:20",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -6446,15 +6446,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "3895:33:22",
+                          "src": "3895:33:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 7722,
+                        "id": 11268,
                         "nodeType": "ExpressionStatement",
-                        "src": "3895:33:22"
+                        "src": "3895:33:20"
                       }
                     ]
                   }
@@ -6467,18 +6467,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 7739,
+                          "id": 11285,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "4037:3:22",
+                          "referencedDeclaration": 11315,
+                          "src": "4037:3:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 7740,
+                        "id": 11286,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6486,7 +6486,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4037:10:22",
+                        "src": "4037:10:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6494,12 +6494,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 7741,
+                        "id": 11287,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7695,
-                        "src": "4049:8:22",
+                        "referencedDeclaration": 11241,
+                        "src": "4049:8:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6511,34 +6511,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 7742,
+                            "id": 11288,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7521,
-                            "src": "4059:7:22",
+                            "referencedDeclaration": 11067,
+                            "src": "4059:7:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 7745,
+                          "id": 11291,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 7743,
+                              "id": 11289,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7769,
-                              "src": "4067:3:22",
+                              "referencedDeclaration": 11315,
+                              "src": "4067:3:20",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 7744,
+                            "id": 11290,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6546,7 +6546,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4067:10:22",
+                            "src": "4067:10:20",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -6557,21 +6557,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4059:19:22",
+                          "src": "4059:19:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 7747,
+                        "id": 11293,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 7746,
+                          "id": 11292,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7695,
-                          "src": "4079:8:22",
+                          "referencedDeclaration": 11241,
+                          "src": "4079:8:20",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6582,7 +6582,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4059:29:22",
+                        "src": "4059:29:20",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6604,18 +6604,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 7738,
+                      "id": 11284,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7474,
-                      "src": "4028:8:22",
+                      "referencedDeclaration": 11020,
+                      "src": "4028:8:20",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 7748,
+                    "id": 11294,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6623,28 +6623,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4028:61:22",
+                    "src": "4028:61:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 7749,
+                  "id": 11295,
                   "nodeType": "EmitStatement",
-                  "src": "4023:66:22"
+                  "src": "4023:66:20"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 7750,
+                    "id": 11296,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4102:4:22",
+                    "src": "4102:4:20",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -6652,15 +6652,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 7701,
-                  "id": 7751,
+                  "functionReturnParameters": 11247,
+                  "id": 11297,
                   "nodeType": "Return",
-                  "src": "4095:11:22"
+                  "src": "4095:11:20"
                 }
               ]
             },
             "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.",
-            "id": 7753,
+            "id": 11299,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -6668,16 +6668,16 @@
             "name": "decreaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 7698,
+              "id": 11244,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7695,
+                  "id": 11241,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3710:16:22",
+                  "scope": 11299,
+                  "src": "3710:16:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6685,10 +6685,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 7694,
+                    "id": 11240,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3710:7:22",
+                    "src": "3710:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6699,11 +6699,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 7697,
+                  "id": 11243,
                   "name": "_subtractedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3732:24:22",
+                  "scope": 11299,
+                  "src": "3732:24:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6711,10 +6711,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 7696,
+                    "id": 11242,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3732:7:22",
+                    "src": "3732:7:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6724,20 +6724,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3704:56:22"
+              "src": "3704:56:20"
             },
             "payable": false,
             "returnParameters": {
-              "id": 7701,
+              "id": 11247,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 7700,
+                  "id": 11246,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 7753,
-                  "src": "3785:4:22",
+                  "scope": 11299,
+                  "src": "3785:4:20",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6745,10 +6745,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 7699,
+                    "id": 11245,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3785:4:22",
+                    "src": "3785:4:20",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -6758,20 +6758,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3784:6:22"
+              "src": "3784:6:20"
             },
-            "scope": 7754,
-            "src": "3679:432:22",
+            "scope": 11300,
+            "src": "3679:432:20",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 7755,
-        "src": "334:3780:22"
+        "scope": 11301,
+        "src": "334:3780:20"
       }
     ],
-    "src": "0:4115:22"
+    "src": "0:4115:20"
   },
   "compiler": {
     "name": "solc",
@@ -6779,5 +6779,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-06T13:22:53.163Z"
+  "updatedAt": "2019-01-10T13:57:39.973Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index 1a46aebd7..d07507412 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -92,13 +92,11 @@ async function deploySidechain (deployer, network, accounts) {
 
     console.log('and submitted all theese addresses to registry');
 
-    await registry.write('migrationMultiSigAddress', ms.address);
     await registry.write('administratumAddress', adm.address);
     await registry.write('ordersCrudAddress', orders.address);
     await registry.write('dealsCrudAddress', deals.address);
     await registry.write('administratumCrudAddress', ac.address);
-    await registry.write('administratumAddress', adm.address);
-    await registry.write('marketAddress', market.address);
+    await registry.write('marketV2Address', market.address);
 }
 
 module.exports = function (deployer, network, accounts) {

From ecef01192ba2fde26355c8d38de2f0ff80c5b692 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Fri, 11 Jan 2019 17:25:58 +0300
Subject: [PATCH 15/23] fix: redeployed to testnet

---
 blockchain/addresses.go                                         | 2 +-
 .../source/migration_artifacts/contracts/AddressHashMap.json    | 2 +-
 blockchain/source/migration_artifacts/contracts/Blacklist.json  | 2 +-
 blockchain/source/migration_artifacts/contracts/Migrations.json | 2 +-
 .../source/migration_artifacts/contracts/MultiSigWallet.json    | 2 +-
 blockchain/source/migration_artifacts/contracts/OracleUSD.json  | 2 +-
 .../source/migration_artifacts/contracts/ProfileRegistry.json   | 2 +-
 blockchain/source/migration_artifacts/contracts/SNM.json        | 2 +-
 .../source/migrations/4_deploy_new_market_with_old_api.js       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/blockchain/addresses.go b/blockchain/addresses.go
index 55da7f3a1..0bf9e9396 100644
--- a/blockchain/addresses.go
+++ b/blockchain/addresses.go
@@ -6,7 +6,7 @@ const (
 	sidechainSNMAddressKey          = "sidechainSNMAddress"
 	masterchainSNMAddressKey        = "masterchainSNMAddress"
 	blacklistAddressKey             = "blacklistAddress"
-	marketAddressKey                = "marketAddress"
+	marketAddressKey                = "marketV2Address"
 	profileRegistryAddressKey       = "profileRegistryAddress"
 	oracleUsdAddressKey             = "oracleUsdAddress"
 	gatekeeperMasterchainAddressKey = "gatekeeperMasterchainAddress"
diff --git a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
index 9ae4af79a..6c1cf46b1 100644
--- a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
+++ b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
@@ -1259,5 +1259,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.054Z"
+  "updatedAt": "2019-01-11T13:07:54.408Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Blacklist.json b/blockchain/source/migration_artifacts/contracts/Blacklist.json
index 91a47c8ea..1e4399e7b 100644
--- a/blockchain/source/migration_artifacts/contracts/Blacklist.json
+++ b/blockchain/source/migration_artifacts/contracts/Blacklist.json
@@ -5551,5 +5551,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.066Z"
+  "updatedAt": "2019-01-11T13:07:54.421Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Migrations.json b/blockchain/source/migration_artifacts/contracts/Migrations.json
index 3fd184654..aa7a6b9c9 100644
--- a/blockchain/source/migration_artifacts/contracts/Migrations.json
+++ b/blockchain/source/migration_artifacts/contracts/Migrations.json
@@ -1281,5 +1281,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.056Z"
+  "updatedAt": "2019-01-11T13:07:54.409Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
index b9cba3ea3..35227a0a4 100644
--- a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
+++ b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
@@ -25734,5 +25734,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.125Z"
+  "updatedAt": "2019-01-11T13:07:54.475Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/OracleUSD.json b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
index b75fcf386..ace11f811 100644
--- a/blockchain/source/migration_artifacts/contracts/OracleUSD.json
+++ b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
@@ -1401,5 +1401,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.057Z"
+  "updatedAt": "2019-01-11T13:07:54.410Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
index a862758e4..f7ddb0b2e 100644
--- a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
+++ b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
@@ -15436,5 +15436,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.098Z"
+  "updatedAt": "2019-01-11T13:07:54.443Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SNM.json b/blockchain/source/migration_artifacts/contracts/SNM.json
index f77ff01cb..c638ab210 100644
--- a/blockchain/source/migration_artifacts/contracts/SNM.json
+++ b/blockchain/source/migration_artifacts/contracts/SNM.json
@@ -1584,5 +1584,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T14:00:11.059Z"
+  "updatedAt": "2019-01-11T13:07:54.412Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index d07507412..fc39e64b3 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -28,7 +28,7 @@ async function deploySidechain (deployer, network, accounts) {
     console.log('profile registry initialized');
 
     let bl = await registry.resolve(Blacklist, 'blacklistAddress');
-    console.log('blacklist initialized')
+    console.log('blacklist initialized');
 
     let snm = await registry.resolve(SNM, 'sidechainSNMAddress');
     console.log('snm initialized');

From 51bdd6757774988bf38e5f2b5ca8a82ec0ac4be7 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Fri, 11 Jan 2019 18:19:52 +0300
Subject: [PATCH 16/23] fix: lint

---
 blockchain/source/contracts/Administratum.sol |  2 +-
 blockchain/source/contracts/Market.sol        | 78 ++++++++++++------
 blockchain/source/contracts/MarketV2.sol      | 82 +++++++++++--------
 .../source/contracts/MultiSigWallet.sol       |  1 +
 .../source/migration_utils/address_hashmap.js |  2 +-
 .../4_deploy_new_market_with_old_api.js       | 12 ++-
 6 files changed, 108 insertions(+), 69 deletions(-)

diff --git a/blockchain/source/contracts/Administratum.sol b/blockchain/source/contracts/Administratum.sol
index 7bdecfe21..894102d39 100644
--- a/blockchain/source/contracts/Administratum.sol
+++ b/blockchain/source/contracts/Administratum.sol
@@ -56,7 +56,7 @@ contract Administratum is Ownable {
 
     function Migrate (address _newAdministratum) public onlyOwner {
         crud.transferOwnership(_newAdministratum);
-        suicide(msg.sender);
+        selfdestruct(msg.sender);
     }
 
     //INTERNAL
diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/Market.sol
index 35decf30a..84982063f 100644
--- a/blockchain/source/contracts/Market.sol
+++ b/blockchain/source/contracts/Market.sol
@@ -150,7 +150,13 @@ contract Market is Ownable, Pausable {
 
     // INIT
 
-    constructor(address _token, address _blacklist, address _oracle, address _profileRegistry, uint _benchmarksQuantity, uint _netflagsQuantity) public {
+    constructor(address _token,
+                address _blacklist,
+                address _oracle,
+                address _profileRegistry,
+                uint _benchmarksQuantity,
+                uint _netflagsQuantity
+    ) public {
         token = SNM(_token);
         bl = Blacklist(_blacklist);
         oracle = OracleUSD(_oracle);
@@ -173,7 +179,7 @@ contract Market is Ownable, Pausable {
         address _blacklist,
         bytes32 _tag,
         uint64[] _benchmarks
-    ) whenNotPaused public returns (uint){
+    ) public whenNotPaused returns (uint){
 
         require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);
         require(_netflags.length <= netflagsQuantity);
@@ -258,22 +264,22 @@ contract Market is Ownable, Pausable {
 
     // Deal functions
 
-    function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {
+    function OpenDeal(uint _askID, uint _bidID) public whenNotPaused {
         Order memory ask = orders[_askID];
         Order memory bid = orders[_bidID];
 
         require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);
-        require((ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author)) && (bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author)));
+        require(ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author));
+        require(bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author));
         require(ask.orderType == OrderType.ORDER_ASK);
         require(bid.orderType == OrderType.ORDER_BID);
-        require(
-            bl.Check(bid.blacklist, GetMaster(ask.author)) == false
-            && bl.Check(bid.blacklist, ask.author) == false
-            && bl.Check(bid.author, GetMaster(ask.author)) == false
-            && bl.Check(bid.author, ask.author) == false
-            && bl.Check(ask.blacklist, bid.author) == false
-            && bl.Check(GetMaster(ask.author), bid.author) == false
-            && bl.Check(ask.author, bid.author) == false);
+        require(bl.Check(bid.blacklist, GetMaster(ask.author)) == false);
+        require(bl.Check(bid.blacklist, ask.author) == false);
+        require(bl.Check(bid.author, GetMaster(ask.author)) == false);
+        require(bl.Check(bid.author, ask.author) == false);
+        require(bl.Check(ask.blacklist, bid.author) == false);
+        require(bl.Check(GetMaster(ask.author), bid.author) == false);
+        require(bl.Check(ask.author, bid.author) == false);
         require(ask.price <= bid.price);
         require(ask.duration >= bid.duration);
         // profile level check
@@ -325,7 +331,22 @@ contract Market is Ownable, Pausable {
             endTime = startTime.add(bid.duration);
         }
         uint blockedBalance = bid.frozenSum;
-        deals[dealAmount] = Deal(ask.benchmarks, ask.author, bid.author, master, _askID, _bidID, bid.duration, ask.price, startTime, endTime, DealStatus.STATUS_ACCEPTED, blockedBalance, 0, block.timestamp);
+        deals[dealAmount] = Deal(
+            ask.benchmarks,
+            ask.author,
+            bid.author,
+            master,
+            _askID,
+            _bidID,
+            bid.duration,
+            ask.price,
+            startTime,
+            endTime,
+            DealStatus.STATUS_ACCEPTED,
+            blockedBalance,
+            0,
+            block.timestamp
+        );
         emit DealOpened(dealAmount);
     }
 
@@ -434,7 +455,12 @@ contract Market is Ownable, Pausable {
 
     function CancelChangeRequest(uint changeRequestID) public returns (bool) {
         ChangeRequest memory request = requests[changeRequestID];
-        require(msg.sender == deals[request.dealID].supplierID || msg.sender == deals[request.dealID].masterID || msg.sender == deals[request.dealID].consumerID);
+
+        require(
+            msg.sender == deals[request.dealID].supplierID ||
+            msg.sender == deals[request.dealID].masterID ||
+            msg.sender == deals[request.dealID].consumerID
+        );
         require(request.status != RequestStatus.REQUEST_ACCEPTED);
 
         if (request.requestType == OrderType.ORDER_ASK) {
@@ -488,7 +514,7 @@ contract Market is Ownable, Pausable {
 
     // GETTERS
 
-    function GetOrderInfo(uint orderID) view public
+    function GetOrderInfo(uint orderID) public view
     returns (
         OrderType orderType,
         address author,
@@ -519,7 +545,7 @@ contract Market is Ownable, Pausable {
     }
 
 
-    function GetOrderParams(uint orderID) view public
+    function GetOrderParams(uint orderID) public view
     returns (
         OrderStatus orderStatus,
         uint dealID
@@ -531,7 +557,7 @@ contract Market is Ownable, Pausable {
         );
     }
 
-    function GetDealInfo(uint dealID) view public
+    function GetDealInfo(uint dealID) public view
     returns (
         uint64[] benchmarks,
         address supplierID,
@@ -553,7 +579,7 @@ contract Market is Ownable, Pausable {
         );
     }
 
-    function GetDealParams(uint dealID) view public
+    function GetDealParams(uint dealID) public view
     returns (
         uint duration,
         uint price,
@@ -574,7 +600,7 @@ contract Market is Ownable, Pausable {
         );
     }
 
-    function GetMaster(address _worker) view public returns (address master) {
+    function GetMaster(address _worker) public view returns (address master) {
         if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {
             master = _worker;
         } else {
@@ -582,7 +608,7 @@ contract Market is Ownable, Pausable {
         }
     }
 
-    function GetChangeRequestInfo(uint changeRequestID) view public
+    function GetChangeRequestInfo(uint changeRequestID) public view
     returns (
         uint dealID,
         OrderType requestType,
@@ -753,37 +779,37 @@ contract Market is Ownable, Pausable {
 
     // SETTERS
 
-    function SetProfileRegistryAddress(address _newPR) onlyOwner public returns (bool) {
+    function SetProfileRegistryAddress(address _newPR) public onlyOwner returns (bool) {
         pr = ProfileRegistry(_newPR);
         return true;
     }
 
-    function SetBlacklistAddress(address _newBL) onlyOwner public returns (bool) {
+    function SetBlacklistAddress(address _newBL) public onlyOwner returns (bool) {
         bl = Blacklist(_newBL);
         return true;
     }
 
-    function SetOracleAddress(address _newOracle) onlyOwner public returns (bool) {
+    function SetOracleAddress(address _newOracle) public onlyOwner returns (bool) {
         require(OracleUSD(_newOracle).getCurrentPrice() != 0);
         oracle = OracleUSD(_newOracle);
         return true;
     }
 
-    function SetBenchmarksQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+    function SetBenchmarksQuantity(uint _newQuantity) public onlyOwner returns (bool) {
         require(_newQuantity > benchmarksQuantity);
         emit NumBenchmarksUpdated(_newQuantity);
         benchmarksQuantity = _newQuantity;
         return true;
     }
 
-    function SetNetflagsQuantity(uint _newQuantity) onlyOwner public returns (bool) {
+    function SetNetflagsQuantity(uint _newQuantity) public onlyOwner returns (bool) {
         require(_newQuantity > netflagsQuantity);
         emit NumNetflagsUpdated(_newQuantity);
         netflagsQuantity = _newQuantity;
         return true;
     }
 
-    function KillMarket() onlyOwner public {
+    function KillMarket() public onlyOwner {
         token.transfer(owner, token.balanceOf(address(this)));
         selfdestruct(owner);
     }
diff --git a/blockchain/source/contracts/MarketV2.sol b/blockchain/source/contracts/MarketV2.sol
index 90524803d..095651ee3 100644
--- a/blockchain/source/contracts/MarketV2.sol
+++ b/blockchain/source/contracts/MarketV2.sol
@@ -112,7 +112,7 @@ contract MarketV2 is Ownable, Pausable {
         address _blacklist,
         bytes32 _tag,
         uint64[] _benchmarks
-    ) whenNotPaused public returns (uint) {
+    ) public whenNotPaused returns (uint) {
 
         require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);
         require(_netflags.length <= netflagsQuantity);
@@ -187,9 +187,8 @@ contract MarketV2 is Ownable, Pausable {
         require(ordersCrud.GetOrderDuration(askID) >= buyoutDuration);
         require(profiles.GetProfileLevel(msg.sender) >= ordersCrud.GetOrderIdentityLevel(askID));
         require(bl.Check(ordersCrud.GetOrderBlacklist(askID), msg.sender) == false);
-        require(
-            bl.Check(msg.sender, GetMaster(ordersCrud.GetOrderAuthor(askID))) == false
-            && bl.Check(ordersCrud.GetOrderAuthor(askID), msg.sender) == false);
+        require(bl.Check(msg.sender, GetMaster(ordersCrud.GetOrderAuthor(askID))) == false);
+        require(bl.Check(ordersCrud.GetOrderAuthor(askID), msg.sender) == false);
 
         PlaceOrder(
             Orders.OrderType.ORDER_BID,
@@ -207,15 +206,18 @@ contract MarketV2 is Ownable, Pausable {
 
     // Deal functions
 
-    function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {
+    function OpenDeal(uint _askID, uint _bidID) public whenNotPaused {
+        require(ordersCrud.GetOrderStatus(_askID) == Orders.OrderStatus.ORDER_ACTIVE);
+        require(ordersCrud.GetOrderStatus(_bidID) == Orders.OrderStatus.ORDER_ACTIVE);
         require(
-            ordersCrud.GetOrderStatus(_askID) == Orders.OrderStatus.ORDER_ACTIVE
-            && ordersCrud.GetOrderStatus(_bidID) == Orders.OrderStatus.ORDER_ACTIVE);
-        require(ordersCrud.GetOrderCounterparty(_askID) == 0x0 || ordersCrud.GetOrderCounterparty(_askID) == ordersCrud.GetOrderAuthor(_bidID));
+            ordersCrud.GetOrderCounterparty(_askID) == 0x0 ||
+            ordersCrud.GetOrderCounterparty(_askID) == ordersCrud.GetOrderAuthor(_bidID)
+        );
         require(
-            ordersCrud.GetOrderCounterparty(_bidID) == 0x0
-            || ordersCrud.GetOrderCounterparty(_bidID) == GetMaster(ordersCrud.GetOrderAuthor(_askID))
-            || ordersCrud.GetOrderCounterparty(_bidID) == ordersCrud.GetOrderAuthor(_askID));
+            ordersCrud.GetOrderCounterparty(_bidID) == 0x0 ||
+            ordersCrud.GetOrderCounterparty(_bidID) == GetMaster(ordersCrud.GetOrderAuthor(_askID)) ||
+            ordersCrud.GetOrderCounterparty(_bidID) == ordersCrud.GetOrderAuthor(_askID)
+        );
         require(ordersCrud.GetOrderType(_askID) == Orders.OrderType.ORDER_ASK);
         require(ordersCrud.GetOrderType(_bidID) == Orders.OrderType.ORDER_BID);
         require(!bl.Check(ordersCrud.GetOrderBlacklist(_bidID), GetMaster(ordersCrud.GetOrderAuthor(_askID))));
@@ -304,8 +306,12 @@ contract MarketV2 is Ownable, Pausable {
     }
 
     function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){
-        require((dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED));
-        require(msg.sender == dealsCrud.GetDealSupplierID(dealID) || msg.sender == dealsCrud.GetDealConsumerID(dealID) || msg.sender == dealsCrud.GetDealMasterID(dealID));
+        require(dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED);
+        require(
+            msg.sender == dealsCrud.GetDealSupplierID(dealID) ||
+            msg.sender == dealsCrud.GetDealConsumerID(dealID) ||
+            msg.sender == dealsCrud.GetDealMasterID(dealID)
+        );
 
         if (block.timestamp <= dealsCrud.GetDealStartTime(dealID).add(dealsCrud.GetDealDuration(dealID))) {
             // after endTime
@@ -327,9 +333,10 @@ contract MarketV2 is Ownable, Pausable {
     function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {
 
         require(
-            msg.sender == dealsCrud.GetDealConsumerID(dealID)
-            || msg.sender ==  dealsCrud.GetDealMasterID(dealID)
-            || msg.sender == dealsCrud.GetDealSupplierID(dealID));
+            msg.sender == dealsCrud.GetDealConsumerID(dealID) ||
+            msg.sender == dealsCrud.GetDealMasterID(dealID) ||
+            msg.sender == dealsCrud.GetDealSupplierID(dealID)
+        );
         require(dealsCrud.GetDealStatus(dealID) == Deals.DealStatus.STATUS_ACCEPTED);
 
         if (dealsCrud.GetDealDuration(dealID) == 0) {
@@ -364,9 +371,9 @@ contract MarketV2 is Ownable, Pausable {
                 dealsCrud.SetDealPrice(dealID, newPrice);
                 changeRequestsCrud.SetActualChangeRequest(dealID, 1, 0);
                 emit DealChangeRequestUpdated(requestsAmount);
-            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED
-                    && changeRequestsCrud.GetChangeRequestDuration(matchingID) >= newDuration
-                    && changeRequestsCrud.GetChangeRequestPrice(matchingID) <= newPrice) {
+            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED &&
+                    changeRequestsCrud.GetChangeRequestDuration(matchingID) >= newDuration &&
+                    changeRequestsCrud.GetChangeRequestPrice(matchingID) <= newPrice) {
 
                 changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
                 changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
@@ -402,9 +409,10 @@ contract MarketV2 is Ownable, Pausable {
                 dealsCrud.SetDealPrice(dealID, newPrice);
                 changeRequestsCrud.SetActualChangeRequest(dealID, 0, 0);
                 emit DealChangeRequestUpdated(currentID);
-            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED
-                && changeRequestsCrud.GetChangeRequestDuration(matchingID) <= newDuration
-                && changeRequestsCrud.GetChangeRequestPrice(matchingID) >= newPrice) {
+            } else if (changeRequestsCrud.GetChangeRequestStatus(matchingID) == ChangeRequests.RequestStatus.REQUEST_CREATED &&
+                changeRequestsCrud.GetChangeRequestDuration(matchingID) <= newDuration &&
+                changeRequestsCrud.GetChangeRequestPrice(matchingID) >= newPrice
+            ) {
 
                 changeRequestsCrud.SetChangeRequestStatus(currentID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
                 changeRequestsCrud.SetChangeRequestStatus(matchingID, ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
@@ -426,7 +434,11 @@ contract MarketV2 is Ownable, Pausable {
 
     function CancelChangeRequest(uint changeRequestID) public returns (bool) {
         uint dealID = changeRequestsCrud.GetChangeRequestDealID(changeRequestID);
-        require(msg.sender == dealsCrud.GetDealSupplierID(dealID) || msg.sender == dealsCrud.GetDealMasterID(dealID) || msg.sender == dealsCrud.GetDealConsumerID(dealID));
+        require(
+            msg.sender == dealsCrud.GetDealSupplierID(dealID) ||
+            msg.sender == dealsCrud.GetDealMasterID(dealID) ||
+            msg.sender == dealsCrud.GetDealConsumerID(dealID)
+        );
         require(changeRequestsCrud.GetChangeRequestStatus(changeRequestID) != ChangeRequests.RequestStatus.REQUEST_ACCEPTED);
 
         if (changeRequestsCrud.GetChangeRequestType(changeRequestID) == Orders.OrderType.ORDER_ASK) {
@@ -476,9 +488,11 @@ contract MarketV2 is Ownable, Pausable {
         if (dealsCrud.GetDealDuration(dealID) != 0 && dealsCrud.GetDealLastBillTS(dealID) >= dealsCrud.GetDealEndTime(dealID)) {
             // means we already billed deal after endTime
             return true;
-        } else if (dealsCrud.GetDealDuration(dealID) != 0
-            && block.timestamp > dealsCrud.GetDealEndTime(dealID)
-            && dealsCrud.GetDealLastBillTS(dealID) < dealsCrud.GetDealEndTime(dealID)) {
+        } else if (
+            dealsCrud.GetDealDuration(dealID) != 0 &&
+            block.timestamp > dealsCrud.GetDealEndTime(dealID) &&
+            dealsCrud.GetDealLastBillTS(dealID) < dealsCrud.GetDealEndTime(dealID)
+        ) {
             paidAmount = CalculatePayment(dealsCrud.GetDealPrice(dealID), dealsCrud.GetDealEndTime(dealID).sub(dealsCrud.GetDealLastBillTS(dealID)));
         } else {
             paidAmount = CalculatePayment(dealsCrud.GetDealPrice(dealID), block.timestamp.sub(dealsCrud.GetDealLastBillTS(dealID)));
@@ -650,7 +664,7 @@ contract MarketV2 is Ownable, Pausable {
         return true;
     }
 
-    function KillMarket() onlyOwner public {
+    function KillMarket() public onlyOwner {
         token.transfer(owner, token.balanceOf(address(this)));
         selfdestruct(owner);
     }
@@ -696,12 +710,12 @@ contract MarketV2 is Ownable, Pausable {
         return changeRequestsCrud.GetChangeRequestsAmount();
     }
 
-    function GetMaster(address _worker) view public returns (address master) {
+    function GetMaster(address _worker) public view returns (address master) {
         return administratum.GetMaster(_worker);
     }
 
 
-    function GetChangeRequestInfo(uint changeRequestID) view public
+    function GetChangeRequestInfo(uint changeRequestID) public view
     returns (
         uint dealID,
         Orders.OrderType requestType,
@@ -718,7 +732,7 @@ contract MarketV2 is Ownable, Pausable {
         );
     }
 
-    function GetOrderInfo(uint orderID) view public
+    function GetOrderInfo(uint orderID) public view
     returns (
         Orders.OrderType orderType,
         address author,
@@ -735,7 +749,7 @@ contract MarketV2 is Ownable, Pausable {
         orderType = ordersCrud.GetOrderType(orderID);
         author = ordersCrud.GetOrderAuthor(orderID);
         counterparty = ordersCrud.GetOrderCounterparty(orderID);
-        duration =  ordersCrud.GetOrderDuration(orderID);
+        duration = ordersCrud.GetOrderDuration(orderID);
         price = ordersCrud.GetOrderPrice(orderID);
         netflags = ordersCrud.GetOrderNetflags(orderID);
         identityLevel = ordersCrud.GetOrderIdentityLevel(orderID);
@@ -746,7 +760,7 @@ contract MarketV2 is Ownable, Pausable {
     }
 
 
-    function GetOrderParams(uint orderID) view public
+    function GetOrderParams(uint orderID) public view
     returns (
         Orders.OrderStatus orderStatus,
         uint dealID
@@ -755,7 +769,7 @@ contract MarketV2 is Ownable, Pausable {
         dealID = ordersCrud.GetOrderDealID(orderID);
     }
 
-    function GetDealInfo(uint dealID) view public
+    function GetDealInfo(uint dealID) public view
     returns (
         uint64[] benchmarks,
         address supplierID,
@@ -774,7 +788,7 @@ contract MarketV2 is Ownable, Pausable {
         startTime = dealsCrud.GetDealStartTime(dealID);
     }
 
-    function GetDealParams(uint dealID) view public
+    function GetDealParams(uint dealID) public view
     returns (
         uint duration,
         uint price,
diff --git a/blockchain/source/contracts/MultiSigWallet.sol b/blockchain/source/contracts/MultiSigWallet.sol
index 833e62f8f..541f1ab6a 100644
--- a/blockchain/source/contracts/MultiSigWallet.sol
+++ b/blockchain/source/contracts/MultiSigWallet.sol
@@ -1,5 +1,6 @@
 pragma solidity ^0.4.15;
 
+// solium-disable
 
 /// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.
 /// @author Stefan George - <stefan.george@consensys.net>
diff --git a/blockchain/source/migration_utils/address_hashmap.js b/blockchain/source/migration_utils/address_hashmap.js
index 3aeca3118..fe087df4d 100644
--- a/blockchain/source/migration_utils/address_hashmap.js
+++ b/blockchain/source/migration_utils/address_hashmap.js
@@ -26,7 +26,7 @@ class ContractRegistry {
         let address = await this.hm.read(name);
         console.log('resolved', name, 'to', address);
         if (address === '0x0000000000000000000000000000000000000000') {
-            throw new Error('failed to resolve ' + name + ' in registry')
+            throw new Error('failed to resolve ' + name + ' in registry');
         }
         return contract.at(address);
     }
diff --git a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
index fc39e64b3..69b45188c 100644
--- a/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
+++ b/blockchain/source/migrations/4_deploy_new_market_with_old_api.js
@@ -37,7 +37,7 @@ async function deploySidechain (deployer, network, accounts) {
     console.log('oracle initialized');
 
     // deploy crud
-    await deployer.deploy(Orders, { gasPrice:  0 });
+    await deployer.deploy(Orders, { gasPrice: 0 });
     let orders = await Orders.deployed();
     console.log('orders crud deployed');
 
@@ -63,20 +63,20 @@ async function deploySidechain (deployer, network, accounts) {
 
     // deploy market
     await deployer.deploy(Market, snm.address, bl.address, oracle.address, pr.address, adm.address,
-        orders.address, deals.address, cr.address, benchmarksNum, netflagsNum, { gas: 100000000} );
+        orders.address, deals.address, cr.address, benchmarksNum, netflagsNum, { gas: 100000000 });
     console.log('market deployed');
     let market = await Market.deployed();
     console.log('deployed object fetched');
 
     // link market to administratum
-    await adm.SetMarketAddress(market.address, { gasPrice:0 });
+    await adm.SetMarketAddress(market.address, { gasPrice: 0 });
     let ms = await registry.resolve(Multisig, 'migrationMultSigAddress');
     console.log('ms resolved');
 
     // link administratum crud to its contract
     await ac.transferOwnership(adm.address, { gasPrice: 0 });
 
-    //transfer crud ownerships
+    // transfer crud ownerships
     await orders.transferOwnership(market.address, { gasPrice: 0 });
     await deals.transferOwnership(market.address, { gasPrice: 0 });
     await cr.transferOwnership(market.address, { gasPrice: 0 });
@@ -89,14 +89,12 @@ async function deploySidechain (deployer, network, accounts) {
     await market.transferOwnership(ms.address, { gasPrice: 0 });
     console.log('ownerships transferred');
 
-
-    console.log('and submitted all theese addresses to registry');
-
     await registry.write('administratumAddress', adm.address);
     await registry.write('ordersCrudAddress', orders.address);
     await registry.write('dealsCrudAddress', deals.address);
     await registry.write('administratumCrudAddress', ac.address);
     await registry.write('marketV2Address', market.address);
+    console.log('and submitted all theese addresses to registry');
 }
 
 module.exports = function (deployer, network, accounts) {

From 69a1f75eb50c8d4f8834949085ca4611fc0c07b0 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Fri, 11 Jan 2019 19:13:33 +0300
Subject: [PATCH 17/23] fix: redeployed to testnet

---
 .../contracts/AddressHashMap.json             |     6 +-
 .../contracts/Administratable.json            |    86 +-
 .../contracts/BasicToken.json                 |  1010 +-
 .../contracts/Blacklist.json                  |  2070 +-
 .../contracts/DevicesStorage.json             |     6 +-
 .../migration_artifacts/contracts/ERC20.json  |   446 +-
 .../contracts/ERC20Basic.json                 |   318 +-
 .../migration_artifacts/contracts/Market.json | 41932 ++++++++--------
 .../contracts/Migrations.json                 |    10 +-
 .../contracts/MultiSigWallet.json             |  9920 ++--
 .../contracts/OracleUSD.json                  |   334 +-
 .../contracts/Ownable.json                    |   838 +-
 .../contracts/Pausable.json                   |   598 +-
 .../contracts/ProfileRegistry.json            |  3526 +-
 .../migration_artifacts/contracts/SNM.json    |   322 +-
 .../contracts/SafeMath.json                   |   946 +-
 .../contracts/SimpleGatekeeperWithLimit.json  |     6 +-
 .../SimpleGatekeeperWithLimitLive.json        |     6 +-
 .../contracts/StandardToken.json              |  2522 +-
 .../contracts/TestnetFaucet.json              |     6 +-
 blockchain/source/migrations/2_deploy_v1.js   |    20 +-
 21 files changed, 32610 insertions(+), 32318 deletions(-)

diff --git a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
index 6c1cf46b1..d1a3123da 100644
--- a/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
+++ b/blockchain/source/migration_artifacts/contracts/AddressHashMap.json
@@ -1254,10 +1254,10 @@
         }
       },
       "links": {},
-      "address": "0x5dfdf389afca3eff479686a8a141ebcc74151434",
-      "transactionHash": "0x786c0c9e8d6eb7a885e827309633ec2c8da680fd6f8817b588b16433a9a045da"
+      "address": "0x5d8af0883a3bca3c98c8b8ca6fc9a2011de3898f",
+      "transactionHash": "0xb8172f7dc3bfcdbcc1101379a142e9bc42e43d7b181667b043760e58640977ea"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.408Z"
+  "updatedAt": "2019-01-11T16:10:01.964Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Administratable.json b/blockchain/source/migration_artifacts/contracts/Administratable.json
index 33fff1fae..117326954 100644
--- a/blockchain/source/migration_artifacts/contracts/Administratable.json
+++ b/blockchain/source/migration_artifacts/contracts/Administratable.json
@@ -428,7 +428,7 @@
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "422:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
@@ -490,7 +490,7 @@
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "458:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
@@ -579,7 +579,7 @@
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "520:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
@@ -633,10 +633,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "512:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -721,7 +721,7 @@
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
+                              "referencedDeclaration": 11599,
                               "src": "614:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
@@ -784,7 +784,7 @@
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
+                              "referencedDeclaration": 11599,
                               "src": "637:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
@@ -844,10 +844,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "606:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -921,7 +921,7 @@
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "736:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
@@ -975,10 +975,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "728:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -1467,10 +1467,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1118:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -1914,10 +1914,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1480:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -2425,7 +2425,7 @@
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "422:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
@@ -2487,7 +2487,7 @@
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "458:3:0",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
@@ -2576,7 +2576,7 @@
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "520:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
@@ -2630,10 +2630,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "512:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -2718,7 +2718,7 @@
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
+                              "referencedDeclaration": 11599,
                               "src": "614:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
@@ -2781,7 +2781,7 @@
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
+                              "referencedDeclaration": 11599,
                               "src": "637:3:0",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
@@ -2841,10 +2841,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "606:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -2918,7 +2918,7 @@
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "736:3:0",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
@@ -2972,10 +2972,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "728:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -3464,10 +3464,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1118:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -3911,10 +3911,10 @@
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1480:7:0",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
@@ -4125,5 +4125,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.958Z"
+  "updatedAt": "2019-01-11T15:59:13.132Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/BasicToken.json b/blockchain/source/migration_artifacts/contracts/BasicToken.json
index 22dc8c68c..d0f0db970 100644
--- a/blockchain/source/migration_artifacts/contracts/BasicToken.json
+++ b/blockchain/source/migration_artifacts/contracts/BasicToken.json
@@ -82,22 +82,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b5061027a806100206000396000f3006080604052600436106100565763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318160ddd811461005b57806370a0823114610082578063a9059cbb146100b0575b600080fd5b34801561006757600080fd5b506100706100f5565b60408051918252519081900360200190f35b34801561008e57600080fd5b5061007073ffffffffffffffffffffffffffffffffffffffff600435166100fb565b3480156100bc57600080fd5b506100e173ffffffffffffffffffffffffffffffffffffffff60043516602435610123565b604080519115158252519081900360200190f35b60015490565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561013f57600080fd5b73ffffffffffffffffffffffffffffffffffffffff8316151561016157600080fd5b33600090815260208190526040902054610181908363ffffffff61022916565b336000908152602081905260408082209290925573ffffffffffffffffffffffffffffffffffffffff8516815220546101c0908363ffffffff61023b16565b73ffffffffffffffffffffffffffffffffffffffff8416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b60008282111561023557fe5b50900390565b8181018281101561024857fe5b929150505600a165627a7a72305820a73f6f448cf69fbe26f0b7d655baa07795e7ba05810e585a35162fdf09634a9f0029",
   "deployedBytecode": "0x6080604052600436106100565763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318160ddd811461005b57806370a0823114610082578063a9059cbb146100b0575b600080fd5b34801561006757600080fd5b506100706100f5565b60408051918252519081900360200190f35b34801561008e57600080fd5b5061007073ffffffffffffffffffffffffffffffffffffffff600435166100fb565b3480156100bc57600080fd5b506100e173ffffffffffffffffffffffffffffffffffffffff60043516602435610123565b604080519115158252519081900360200190f35b60015490565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561013f57600080fd5b73ffffffffffffffffffffffffffffffffffffffff8316151561016157600080fd5b33600090815260208190526040902054610181908363ffffffff61022916565b336000908152602081905260408082209290925573ffffffffffffffffffffffffffffffffffffffff8516815220546101c0908363ffffffff61023b16565b73ffffffffffffffffffffffffffffffffffffffff8416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b60008282111561023557fe5b50900390565b8181018281101561024857fe5b929150505600a165627a7a72305820a73f6f448cf69fbe26f0b7d655baa07795e7ba05810e585a35162fdf09634a9f0029",
-  "sourceMap": "180:1071:17:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;180:1071:17;;;;;;;",
-  "deployedSourceMap": "180:1071:17:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;1149:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;;;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;455:12;;389:83;:::o;1149:99::-;1227:16;;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;754:17;;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;:20;856:13;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;840:13;;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
+  "sourceMap": "180:1071:16:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;180:1071:16;;;;;;;",
+  "deployedSourceMap": "180:1071:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:16;;;;;;;;;;;;;;;;;;;;1149:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:16;;;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:16;;;;;;;;;;;;;;;;;;;;;;;;;;;389:83;455:12;;389:83;:::o;1149:99::-;1227:16;;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;754:17;;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;:20;856:13;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;840:13;;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:16;626:321;;;;:::o;1060:116:14:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:14;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
   "source": "pragma solidity ^0.4.24;\n\n\nimport \"./ERC20Basic.sol\";\nimport \"../../math/SafeMath.sol\";\n\n\n/**\n * @title Basic token\n * @dev Basic version of StandardToken, with no allowances.\n */\ncontract BasicToken is ERC20Basic {\n  using SafeMath for uint256;\n\n  mapping(address => uint256) internal balances;\n\n  uint256 internal totalSupply_;\n\n  /**\n  * @dev Total number of tokens in existence\n  */\n  function totalSupply() public view returns (uint256) {\n    return totalSupply_;\n  }\n\n  /**\n  * @dev Transfer token for a specified address\n  * @param _to The address to transfer to.\n  * @param _value The amount to be transferred.\n  */\n  function transfer(address _to, uint256 _value) public returns (bool) {\n    require(_value <= balances[msg.sender]);\n    require(_to != address(0));\n\n    balances[msg.sender] = balances[msg.sender].sub(_value);\n    balances[_to] = balances[_to].add(_value);\n    emit Transfer(msg.sender, _to, _value);\n    return true;\n  }\n\n  /**\n  * @dev Gets the balance of the specified address.\n  * @param _owner The address to query the the balance of.\n  * @return An uint256 representing the amount owned by the passed address.\n  */\n  function balanceOf(address _owner) public view returns (uint256) {\n    return balances[_owner];\n  }\n\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
     "exportedSymbols": {
       "BasicToken": [
-        10978
+        11262
       ]
     },
-    "id": 10979,
+    "id": 11263,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10884,
+        "id": 11168,
         "literals": [
           "solidity",
           "^",
@@ -105,27 +105,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:17"
+        "src": "0:24:16"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 10885,
+        "id": 11169,
         "nodeType": "ImportDirective",
-        "scope": 10979,
-        "sourceUnit": 11054,
-        "src": "27:26:17",
+        "scope": 11263,
+        "sourceUnit": 11338,
+        "src": "27:26:16",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
         "file": "../../math/SafeMath.sol",
-        "id": 10886,
+        "id": 11170,
         "nodeType": "ImportDirective",
-        "scope": 10979,
-        "sourceUnit": 10797,
-        "src": "54:33:17",
+        "scope": 11263,
+        "sourceUnit": 11081,
+        "src": "54:33:16",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -135,56 +135,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10887,
+              "id": 11171,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11053,
-              "src": "203:10:17",
+              "referencedDeclaration": 11337,
+              "src": "203:10:16",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11337",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 10888,
+            "id": 11172,
             "nodeType": "InheritanceSpecifier",
-            "src": "203:10:17"
+            "src": "203:10:16"
           }
         ],
         "contractDependencies": [
-          11053
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.",
         "fullyImplemented": true,
-        "id": 10978,
+        "id": 11262,
         "linearizedBaseContracts": [
-          10978,
-          11053
+          11262,
+          11337
         ],
         "name": "BasicToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 10891,
+            "id": 11175,
             "libraryName": {
               "contractScope": null,
-              "id": 10889,
+              "id": 11173,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
-              "src": "224:8:17",
+              "referencedDeclaration": 11080,
+              "src": "224:8:16",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "218:27:17",
+            "src": "218:27:16",
             "typeName": {
-              "id": 10890,
+              "id": 11174,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "237:7:17",
+              "src": "237:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -193,11 +193,11 @@
           },
           {
             "constant": false,
-            "id": 10895,
+            "id": 11179,
             "name": "balances",
             "nodeType": "VariableDeclaration",
-            "scope": 10978,
-            "src": "249:45:17",
+            "scope": 11262,
+            "src": "249:45:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -205,28 +205,28 @@
               "typeString": "mapping(address => uint256)"
             },
             "typeName": {
-              "id": 10894,
+              "id": 11178,
               "keyType": {
-                "id": 10892,
+                "id": 11176,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "257:7:17",
+                "src": "257:7:16",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "249:27:17",
+              "src": "249:27:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                 "typeString": "mapping(address => uint256)"
               },
               "valueType": {
-                "id": 10893,
+                "id": 11177,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "268:7:17",
+                "src": "268:7:16",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
@@ -238,11 +238,11 @@
           },
           {
             "constant": false,
-            "id": 10897,
+            "id": 11181,
             "name": "totalSupply_",
             "nodeType": "VariableDeclaration",
-            "scope": 10978,
-            "src": "299:29:17",
+            "scope": 11262,
+            "src": "299:29:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -250,10 +250,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 10896,
+              "id": 11180,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "299:7:17",
+              "src": "299:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -264,33 +264,33 @@
           },
           {
             "body": {
-              "id": 10904,
+              "id": 11188,
               "nodeType": "Block",
-              "src": "442:30:17",
+              "src": "442:30:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10902,
+                    "id": 11186,
                     "name": "totalSupply_",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10897,
-                    "src": "455:12:17",
+                    "referencedDeclaration": 11181,
+                    "src": "455:12:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10901,
-                  "id": 10903,
+                  "functionReturnParameters": 11185,
+                  "id": 11187,
                   "nodeType": "Return",
-                  "src": "448:19:17"
+                  "src": "448:19:16"
                 }
               ]
             },
             "documentation": "@dev Total number of tokens in existence",
-            "id": 10905,
+            "id": 11189,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -298,23 +298,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10898,
+              "id": 11182,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "409:2:17"
+              "src": "409:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10901,
+              "id": 11185,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10900,
+                  "id": 11184,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10905,
-                  "src": "433:7:17",
+                  "scope": 11189,
+                  "src": "433:7:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -322,10 +322,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10899,
+                    "id": 11183,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "433:7:17",
+                    "src": "433:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -335,19 +335,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "432:9:17"
+              "src": "432:9:16"
             },
-            "scope": 10978,
-            "src": "389:83:17",
+            "scope": 11262,
+            "src": "389:83:16",
             "stateMutability": "view",
-            "superFunction": 11028,
+            "superFunction": 11312,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10964,
+              "id": 11248,
               "nodeType": "Block",
-              "src": "695:252:17",
+              "src": "695:252:16",
               "statements": [
                 {
                   "expression": {
@@ -359,19 +359,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10920,
+                        "id": 11204,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10915,
+                          "id": 11199,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "709:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "709:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -383,34 +383,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10916,
+                            "id": 11200,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "719:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "719:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10919,
+                          "id": 11203,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 10917,
+                              "id": 11201,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "728:3:17",
+                              "referencedDeclaration": 11599,
+                              "src": "728:3:16",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 10918,
+                            "id": 11202,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -418,7 +418,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "728:10:17",
+                            "src": "728:10:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -429,13 +429,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "719:20:17",
+                          "src": "719:20:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "709:30:17",
+                        "src": "709:30:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -449,21 +449,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10914,
+                      "id": 11198,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "701:7:17",
+                      "referencedDeclaration": 11602,
+                      "src": "701:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10921,
+                    "id": 11205,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -471,15 +471,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "701:39:17",
+                    "src": "701:39:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10922,
+                  "id": 11206,
                   "nodeType": "ExpressionStatement",
-                  "src": "701:39:17"
+                  "src": "701:39:16"
                 },
                 {
                   "expression": {
@@ -491,19 +491,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10928,
+                        "id": 11212,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10924,
+                          "id": 11208,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10907,
-                          "src": "754:3:17",
+                          "referencedDeclaration": 11191,
+                          "src": "754:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -517,14 +517,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 10926,
+                              "id": 11210,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "769:1:17",
+                              "src": "769:1:16",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -540,20 +540,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 10925,
+                            "id": 11209,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "761:7:17",
+                            "src": "761:7:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 10927,
+                          "id": 11211,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -561,13 +561,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "761:10:17",
+                          "src": "761:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "754:17:17",
+                        "src": "754:17:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -581,21 +581,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10923,
+                      "id": 11207,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "746:7:17",
+                      "referencedDeclaration": 11602,
+                      "src": "746:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10929,
+                    "id": 11213,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -603,20 +603,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "746:26:17",
+                    "src": "746:26:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10930,
+                  "id": 11214,
                   "nodeType": "ExpressionStatement",
-                  "src": "746:26:17"
+                  "src": "746:26:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10942,
+                    "id": 11226,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -625,34 +625,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10931,
+                        "id": 11215,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "779:8:17",
+                        "referencedDeclaration": 11179,
+                        "src": "779:8:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10934,
+                      "id": 11218,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10932,
+                          "id": 11216,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "788:3:17",
+                          "referencedDeclaration": 11599,
+                          "src": "788:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10933,
+                        "id": 11217,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -660,7 +660,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "788:10:17",
+                        "src": "788:10:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -671,7 +671,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "779:20:17",
+                      "src": "779:20:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -684,12 +684,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 10940,
+                          "id": 11224,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "827:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "827:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -707,34 +707,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10935,
+                            "id": 11219,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "802:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "802:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10938,
+                          "id": 11222,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 10936,
+                              "id": 11220,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "811:3:17",
+                              "referencedDeclaration": 11599,
+                              "src": "811:3:16",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 10937,
+                            "id": 11221,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -742,7 +742,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "811:10:17",
+                            "src": "811:10:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -753,27 +753,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "802:20:17",
+                          "src": "802:20:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 10939,
+                        "id": 11223,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "802:24:17",
+                        "referencedDeclaration": 11055,
+                        "src": "802:24:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 10941,
+                      "id": 11225,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -781,26 +781,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "802:32:17",
+                      "src": "802:32:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "779:55:17",
+                    "src": "779:55:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10943,
+                  "id": 11227,
                   "nodeType": "ExpressionStatement",
-                  "src": "779:55:17"
+                  "src": "779:55:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10953,
+                    "id": 11237,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -809,26 +809,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10944,
+                        "id": 11228,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "840:8:17",
+                        "referencedDeclaration": 11179,
+                        "src": "840:8:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10946,
+                      "id": 11230,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 10945,
+                        "id": 11229,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10907,
-                        "src": "849:3:17",
+                        "referencedDeclaration": 11191,
+                        "src": "849:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -839,7 +839,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "840:13:17",
+                      "src": "840:13:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -852,12 +852,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 10951,
+                          "id": 11235,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "874:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "874:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -875,26 +875,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10947,
+                            "id": 11231,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "856:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "856:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10949,
+                          "id": 11233,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 10948,
+                            "id": 11232,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10907,
-                            "src": "865:3:17",
+                            "referencedDeclaration": 11191,
+                            "src": "865:3:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -905,27 +905,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "856:13:17",
+                          "src": "856:13:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 10950,
+                        "id": 11234,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "856:17:17",
+                        "referencedDeclaration": 11079,
+                        "src": "856:17:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 10952,
+                      "id": 11236,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -933,21 +933,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "856:25:17",
+                      "src": "856:25:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "840:41:17",
+                    "src": "840:41:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10954,
+                  "id": 11238,
                   "nodeType": "ExpressionStatement",
-                  "src": "840:41:17"
+                  "src": "840:41:16"
                 },
                 {
                   "eventCall": {
@@ -957,18 +957,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10956,
+                          "id": 11240,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "901:3:17",
+                          "referencedDeclaration": 11599,
+                          "src": "901:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10957,
+                        "id": 11241,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -976,7 +976,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "901:10:17",
+                        "src": "901:10:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -984,12 +984,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10958,
+                        "id": 11242,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10907,
-                        "src": "913:3:17",
+                        "referencedDeclaration": 11191,
+                        "src": "913:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -997,12 +997,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10959,
+                        "id": 11243,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10909,
-                        "src": "918:6:17",
+                        "referencedDeclaration": 11193,
+                        "src": "918:6:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1024,18 +1024,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 10955,
+                      "id": 11239,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11052,
-                      "src": "892:8:17",
+                      "referencedDeclaration": 11336,
+                      "src": "892:8:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 10960,
+                    "id": 11244,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1043,28 +1043,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "892:33:17",
+                    "src": "892:33:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10961,
+                  "id": 11245,
                   "nodeType": "EmitStatement",
-                  "src": "887:38:17"
+                  "src": "887:38:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10962,
+                    "id": 11246,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "938:4:17",
+                    "src": "938:4:16",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1072,15 +1072,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 10913,
-                  "id": 10963,
+                  "functionReturnParameters": 11197,
+                  "id": 11247,
                   "nodeType": "Return",
-                  "src": "931:11:17"
+                  "src": "931:11:16"
                 }
               ]
             },
             "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.",
-            "id": 10965,
+            "id": 11249,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1088,16 +1088,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10910,
+              "id": 11194,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10907,
+                  "id": 11191,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "644:11:17",
+                  "scope": 11249,
+                  "src": "644:11:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1105,10 +1105,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10906,
+                    "id": 11190,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "644:7:17",
+                    "src": "644:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1119,11 +1119,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10909,
+                  "id": 11193,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "657:14:17",
+                  "scope": 11249,
+                  "src": "657:14:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1131,10 +1131,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10908,
+                    "id": 11192,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "657:7:17",
+                    "src": "657:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1144,20 +1144,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "643:29:17"
+              "src": "643:29:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10913,
+              "id": 11197,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10912,
+                  "id": 11196,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "689:4:17",
+                  "scope": 11249,
+                  "src": "689:4:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1165,10 +1165,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 10911,
+                    "id": 11195,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "689:4:17",
+                    "src": "689:4:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1178,45 +1178,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "688:6:17"
+              "src": "688:6:16"
             },
-            "scope": 10978,
-            "src": "626:321:17",
+            "scope": 11262,
+            "src": "626:321:16",
             "stateMutability": "nonpayable",
-            "superFunction": 11044,
+            "superFunction": 11328,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10976,
+              "id": 11260,
               "nodeType": "Block",
-              "src": "1214:34:17",
+              "src": "1214:34:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 10972,
+                      "id": 11256,
                       "name": "balances",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10895,
-                      "src": "1227:8:17",
+                      "referencedDeclaration": 11179,
+                      "src": "1227:8:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 10974,
+                    "id": 11258,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 10973,
+                      "id": 11257,
                       "name": "_owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10967,
-                      "src": "1236:6:17",
+                      "referencedDeclaration": 11251,
+                      "src": "1236:6:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1227,21 +1227,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1227:16:17",
+                    "src": "1227:16:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10971,
-                  "id": 10975,
+                  "functionReturnParameters": 11255,
+                  "id": 11259,
                   "nodeType": "Return",
-                  "src": "1220:23:17"
+                  "src": "1220:23:16"
                 }
               ]
             },
             "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.",
-            "id": 10977,
+            "id": 11261,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1249,16 +1249,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10968,
+              "id": 11252,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10967,
+                  "id": 11251,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10977,
-                  "src": "1168:14:17",
+                  "scope": 11261,
+                  "src": "1168:14:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1266,10 +1266,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10966,
+                    "id": 11250,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1168:7:17",
+                    "src": "1168:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1279,20 +1279,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1167:16:17"
+              "src": "1167:16:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10971,
+              "id": 11255,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10970,
+                  "id": 11254,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10977,
-                  "src": "1205:7:17",
+                  "scope": 11261,
+                  "src": "1205:7:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1300,10 +1300,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10969,
+                    "id": 11253,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1205:7:17",
+                    "src": "1205:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1313,33 +1313,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1204:9:17"
+              "src": "1204:9:16"
             },
-            "scope": 10978,
-            "src": "1149:99:17",
+            "scope": 11262,
+            "src": "1149:99:16",
             "stateMutability": "view",
-            "superFunction": 11035,
+            "superFunction": 11319,
             "visibility": "public"
           }
         ],
-        "scope": 10979,
-        "src": "180:1071:17"
+        "scope": 11263,
+        "src": "180:1071:16"
       }
     ],
-    "src": "0:1252:17"
+    "src": "0:1252:16"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
     "exportedSymbols": {
       "BasicToken": [
-        10978
+        11262
       ]
     },
-    "id": 10979,
+    "id": 11263,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10884,
+        "id": 11168,
         "literals": [
           "solidity",
           "^",
@@ -1347,27 +1347,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:17"
+        "src": "0:24:16"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 10885,
+        "id": 11169,
         "nodeType": "ImportDirective",
-        "scope": 10979,
-        "sourceUnit": 11054,
-        "src": "27:26:17",
+        "scope": 11263,
+        "sourceUnit": 11338,
+        "src": "27:26:16",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
         "file": "../../math/SafeMath.sol",
-        "id": 10886,
+        "id": 11170,
         "nodeType": "ImportDirective",
-        "scope": 10979,
-        "sourceUnit": 10797,
-        "src": "54:33:17",
+        "scope": 11263,
+        "sourceUnit": 11081,
+        "src": "54:33:16",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -1377,56 +1377,56 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10887,
+              "id": 11171,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11053,
-              "src": "203:10:17",
+              "referencedDeclaration": 11337,
+              "src": "203:10:16",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11337",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 10888,
+            "id": 11172,
             "nodeType": "InheritanceSpecifier",
-            "src": "203:10:17"
+            "src": "203:10:16"
           }
         ],
         "contractDependencies": [
-          11053
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title Basic token\n@dev Basic version of StandardToken, with no allowances.",
         "fullyImplemented": true,
-        "id": 10978,
+        "id": 11262,
         "linearizedBaseContracts": [
-          10978,
-          11053
+          11262,
+          11337
         ],
         "name": "BasicToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 10891,
+            "id": 11175,
             "libraryName": {
               "contractScope": null,
-              "id": 10889,
+              "id": 11173,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
-              "src": "224:8:17",
+              "referencedDeclaration": 11080,
+              "src": "224:8:16",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "218:27:17",
+            "src": "218:27:16",
             "typeName": {
-              "id": 10890,
+              "id": 11174,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "237:7:17",
+              "src": "237:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1435,11 +1435,11 @@
           },
           {
             "constant": false,
-            "id": 10895,
+            "id": 11179,
             "name": "balances",
             "nodeType": "VariableDeclaration",
-            "scope": 10978,
-            "src": "249:45:17",
+            "scope": 11262,
+            "src": "249:45:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1447,28 +1447,28 @@
               "typeString": "mapping(address => uint256)"
             },
             "typeName": {
-              "id": 10894,
+              "id": 11178,
               "keyType": {
-                "id": 10892,
+                "id": 11176,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "257:7:17",
+                "src": "257:7:16",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "249:27:17",
+              "src": "249:27:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                 "typeString": "mapping(address => uint256)"
               },
               "valueType": {
-                "id": 10893,
+                "id": 11177,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
-                "src": "268:7:17",
+                "src": "268:7:16",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
@@ -1480,11 +1480,11 @@
           },
           {
             "constant": false,
-            "id": 10897,
+            "id": 11181,
             "name": "totalSupply_",
             "nodeType": "VariableDeclaration",
-            "scope": 10978,
-            "src": "299:29:17",
+            "scope": 11262,
+            "src": "299:29:16",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1492,10 +1492,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 10896,
+              "id": 11180,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "299:7:17",
+              "src": "299:7:16",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1506,33 +1506,33 @@
           },
           {
             "body": {
-              "id": 10904,
+              "id": 11188,
               "nodeType": "Block",
-              "src": "442:30:17",
+              "src": "442:30:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10902,
+                    "id": 11186,
                     "name": "totalSupply_",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10897,
-                    "src": "455:12:17",
+                    "referencedDeclaration": 11181,
+                    "src": "455:12:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10901,
-                  "id": 10903,
+                  "functionReturnParameters": 11185,
+                  "id": 11187,
                   "nodeType": "Return",
-                  "src": "448:19:17"
+                  "src": "448:19:16"
                 }
               ]
             },
             "documentation": "@dev Total number of tokens in existence",
-            "id": 10905,
+            "id": 11189,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1540,23 +1540,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10898,
+              "id": 11182,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "409:2:17"
+              "src": "409:2:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10901,
+              "id": 11185,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10900,
+                  "id": 11184,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10905,
-                  "src": "433:7:17",
+                  "scope": 11189,
+                  "src": "433:7:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1564,10 +1564,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10899,
+                    "id": 11183,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "433:7:17",
+                    "src": "433:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1577,19 +1577,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "432:9:17"
+              "src": "432:9:16"
             },
-            "scope": 10978,
-            "src": "389:83:17",
+            "scope": 11262,
+            "src": "389:83:16",
             "stateMutability": "view",
-            "superFunction": 11028,
+            "superFunction": 11312,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10964,
+              "id": 11248,
               "nodeType": "Block",
-              "src": "695:252:17",
+              "src": "695:252:16",
               "statements": [
                 {
                   "expression": {
@@ -1601,19 +1601,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10920,
+                        "id": 11204,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10915,
+                          "id": 11199,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "709:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "709:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1625,34 +1625,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10916,
+                            "id": 11200,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "719:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "719:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10919,
+                          "id": 11203,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 10917,
+                              "id": 11201,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "728:3:17",
+                              "referencedDeclaration": 11599,
+                              "src": "728:3:16",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 10918,
+                            "id": 11202,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1660,7 +1660,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "728:10:17",
+                            "src": "728:10:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1671,13 +1671,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "719:20:17",
+                          "src": "719:20:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "709:30:17",
+                        "src": "709:30:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1691,21 +1691,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10914,
+                      "id": 11198,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "701:7:17",
+                      "referencedDeclaration": 11602,
+                      "src": "701:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10921,
+                    "id": 11205,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1713,15 +1713,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "701:39:17",
+                    "src": "701:39:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10922,
+                  "id": 11206,
                   "nodeType": "ExpressionStatement",
-                  "src": "701:39:17"
+                  "src": "701:39:16"
                 },
                 {
                   "expression": {
@@ -1733,19 +1733,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10928,
+                        "id": 11212,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10924,
+                          "id": 11208,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10907,
-                          "src": "754:3:17",
+                          "referencedDeclaration": 11191,
+                          "src": "754:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1759,14 +1759,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 10926,
+                              "id": 11210,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "769:1:17",
+                              "src": "769:1:16",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1782,20 +1782,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 10925,
+                            "id": 11209,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "761:7:17",
+                            "src": "761:7:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 10927,
+                          "id": 11211,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1803,13 +1803,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "761:10:17",
+                          "src": "761:10:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "754:17:17",
+                        "src": "754:17:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1823,21 +1823,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10923,
+                      "id": 11207,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "746:7:17",
+                      "referencedDeclaration": 11602,
+                      "src": "746:7:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10929,
+                    "id": 11213,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1845,20 +1845,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "746:26:17",
+                    "src": "746:26:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10930,
+                  "id": 11214,
                   "nodeType": "ExpressionStatement",
-                  "src": "746:26:17"
+                  "src": "746:26:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10942,
+                    "id": 11226,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1867,34 +1867,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10931,
+                        "id": 11215,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "779:8:17",
+                        "referencedDeclaration": 11179,
+                        "src": "779:8:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10934,
+                      "id": 11218,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10932,
+                          "id": 11216,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "788:3:17",
+                          "referencedDeclaration": 11599,
+                          "src": "788:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10933,
+                        "id": 11217,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1902,7 +1902,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "788:10:17",
+                        "src": "788:10:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1913,7 +1913,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "779:20:17",
+                      "src": "779:20:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1926,12 +1926,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 10940,
+                          "id": 11224,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "827:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "827:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1949,34 +1949,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10935,
+                            "id": 11219,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "802:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "802:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10938,
+                          "id": 11222,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 10936,
+                              "id": 11220,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "811:3:17",
+                              "referencedDeclaration": 11599,
+                              "src": "811:3:16",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 10937,
+                            "id": 11221,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1984,7 +1984,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "811:10:17",
+                            "src": "811:10:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1995,27 +1995,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "802:20:17",
+                          "src": "802:20:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 10939,
+                        "id": 11223,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "802:24:17",
+                        "referencedDeclaration": 11055,
+                        "src": "802:24:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 10941,
+                      "id": 11225,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2023,26 +2023,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "802:32:17",
+                      "src": "802:32:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "779:55:17",
+                    "src": "779:55:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10943,
+                  "id": 11227,
                   "nodeType": "ExpressionStatement",
-                  "src": "779:55:17"
+                  "src": "779:55:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10953,
+                    "id": 11237,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2051,26 +2051,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10944,
+                        "id": 11228,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "840:8:17",
+                        "referencedDeclaration": 11179,
+                        "src": "840:8:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10946,
+                      "id": 11230,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 10945,
+                        "id": 11229,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10907,
-                        "src": "849:3:17",
+                        "referencedDeclaration": 11191,
+                        "src": "849:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2081,7 +2081,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "840:13:17",
+                      "src": "840:13:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2094,12 +2094,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 10951,
+                          "id": 11235,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10909,
-                          "src": "874:6:17",
+                          "referencedDeclaration": 11193,
+                          "src": "874:6:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2117,26 +2117,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 10947,
+                            "id": 11231,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "856:8:17",
+                            "referencedDeclaration": 11179,
+                            "src": "856:8:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 10949,
+                          "id": 11233,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 10948,
+                            "id": 11232,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10907,
-                            "src": "865:3:17",
+                            "referencedDeclaration": 11191,
+                            "src": "865:3:16",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2147,27 +2147,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "856:13:17",
+                          "src": "856:13:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 10950,
+                        "id": 11234,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "856:17:17",
+                        "referencedDeclaration": 11079,
+                        "src": "856:17:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 10952,
+                      "id": 11236,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -2175,21 +2175,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "856:25:17",
+                      "src": "856:25:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "840:41:17",
+                    "src": "840:41:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10954,
+                  "id": 11238,
                   "nodeType": "ExpressionStatement",
-                  "src": "840:41:17"
+                  "src": "840:41:16"
                 },
                 {
                   "eventCall": {
@@ -2199,18 +2199,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10956,
+                          "id": 11240,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "901:3:17",
+                          "referencedDeclaration": 11599,
+                          "src": "901:3:16",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10957,
+                        "id": 11241,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2218,7 +2218,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "901:10:17",
+                        "src": "901:10:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2226,12 +2226,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10958,
+                        "id": 11242,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10907,
-                        "src": "913:3:17",
+                        "referencedDeclaration": 11191,
+                        "src": "913:3:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2239,12 +2239,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10959,
+                        "id": 11243,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10909,
-                        "src": "918:6:17",
+                        "referencedDeclaration": 11193,
+                        "src": "918:6:16",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2266,18 +2266,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 10955,
+                      "id": 11239,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11052,
-                      "src": "892:8:17",
+                      "referencedDeclaration": 11336,
+                      "src": "892:8:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 10960,
+                    "id": 11244,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2285,28 +2285,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "892:33:17",
+                    "src": "892:33:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10961,
+                  "id": 11245,
                   "nodeType": "EmitStatement",
-                  "src": "887:38:17"
+                  "src": "887:38:16"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10962,
+                    "id": 11246,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "938:4:17",
+                    "src": "938:4:16",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2314,15 +2314,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 10913,
-                  "id": 10963,
+                  "functionReturnParameters": 11197,
+                  "id": 11247,
                   "nodeType": "Return",
-                  "src": "931:11:17"
+                  "src": "931:11:16"
                 }
               ]
             },
             "documentation": "@dev Transfer token for a specified address\n@param _to The address to transfer to.\n@param _value The amount to be transferred.",
-            "id": 10965,
+            "id": 11249,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2330,16 +2330,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10910,
+              "id": 11194,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10907,
+                  "id": 11191,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "644:11:17",
+                  "scope": 11249,
+                  "src": "644:11:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2347,10 +2347,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10906,
+                    "id": 11190,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "644:7:17",
+                    "src": "644:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2361,11 +2361,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10909,
+                  "id": 11193,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "657:14:17",
+                  "scope": 11249,
+                  "src": "657:14:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2373,10 +2373,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10908,
+                    "id": 11192,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "657:7:17",
+                    "src": "657:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2386,20 +2386,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "643:29:17"
+              "src": "643:29:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10913,
+              "id": 11197,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10912,
+                  "id": 11196,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10965,
-                  "src": "689:4:17",
+                  "scope": 11249,
+                  "src": "689:4:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2407,10 +2407,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 10911,
+                    "id": 11195,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "689:4:17",
+                    "src": "689:4:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2420,45 +2420,45 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "688:6:17"
+              "src": "688:6:16"
             },
-            "scope": 10978,
-            "src": "626:321:17",
+            "scope": 11262,
+            "src": "626:321:16",
             "stateMutability": "nonpayable",
-            "superFunction": 11044,
+            "superFunction": 11328,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10976,
+              "id": 11260,
               "nodeType": "Block",
-              "src": "1214:34:17",
+              "src": "1214:34:16",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 10972,
+                      "id": 11256,
                       "name": "balances",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10895,
-                      "src": "1227:8:17",
+                      "referencedDeclaration": 11179,
+                      "src": "1227:8:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 10974,
+                    "id": 11258,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 10973,
+                      "id": 11257,
                       "name": "_owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10967,
-                      "src": "1236:6:17",
+                      "referencedDeclaration": 11251,
+                      "src": "1236:6:16",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2469,21 +2469,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "1227:16:17",
+                    "src": "1227:16:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10971,
-                  "id": 10975,
+                  "functionReturnParameters": 11255,
+                  "id": 11259,
                   "nodeType": "Return",
-                  "src": "1220:23:17"
+                  "src": "1220:23:16"
                 }
               ]
             },
             "documentation": "@dev Gets the balance of the specified address.\n@param _owner The address to query the the balance of.\n@return An uint256 representing the amount owned by the passed address.",
-            "id": 10977,
+            "id": 11261,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2491,16 +2491,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10968,
+              "id": 11252,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10967,
+                  "id": 11251,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10977,
-                  "src": "1168:14:17",
+                  "scope": 11261,
+                  "src": "1168:14:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2508,10 +2508,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10966,
+                    "id": 11250,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1168:7:17",
+                    "src": "1168:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2521,20 +2521,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1167:16:17"
+              "src": "1167:16:16"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10971,
+              "id": 11255,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10970,
+                  "id": 11254,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10977,
-                  "src": "1205:7:17",
+                  "scope": 11261,
+                  "src": "1205:7:16",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2542,10 +2542,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10969,
+                    "id": 11253,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1205:7:17",
+                    "src": "1205:7:16",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2555,20 +2555,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1204:9:17"
+              "src": "1204:9:16"
             },
-            "scope": 10978,
-            "src": "1149:99:17",
+            "scope": 11262,
+            "src": "1149:99:16",
             "stateMutability": "view",
-            "superFunction": 11035,
+            "superFunction": 11319,
             "visibility": "public"
           }
         ],
-        "scope": 10979,
-        "src": "180:1071:17"
+        "scope": 11263,
+        "src": "180:1071:16"
       }
     ],
-    "src": "0:1252:17"
+    "src": "0:1252:16"
   },
   "compiler": {
     "name": "solc",
@@ -2576,5 +2576,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.955Z"
+  "updatedAt": "2019-01-11T15:59:13.127Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Blacklist.json b/blockchain/source/migration_artifacts/contracts/Blacklist.json
index 1e4399e7b..e6cfabeda 100644
--- a/blockchain/source/migration_artifacts/contracts/Blacklist.json
+++ b/blockchain/source/migration_artifacts/contracts/Blacklist.json
@@ -246,22 +246,22 @@
   ],
   "bytecode": "0x608060405260038054600160a060020a031916905534801561002057600080fd5b5060008054600160a060020a0319908116339081179091161790556105e68061004a6000396000f3006080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663473b736f81146100a8578063584720f5146100e3578063715018a61461010457806377d58a151461011b57806380f556051461013c5780638a1051f81461016d5780638da5cb5b1461018e578063968f600c146101a3578063be7c7ac3146101ca578063f2fde38b146101eb575b600080fd5b3480156100b457600080fd5b506100cf600160a060020a036004358116906024351661020c565b604080519115158252519081900360200190f35b3480156100ef57600080fd5b506100cf600160a060020a03600435166102bc565b34801561011057600080fd5b50610119610323565b005b34801561012757600080fd5b506100cf600160a060020a036004351661038f565b34801561014857600080fd5b506101516103d9565b60408051600160a060020a039092168252519081900360200190f35b34801561017957600080fd5b506100cf600160a060020a03600435166103e8565b34801561019a57600080fd5b5061015161044f565b3480156101af57600080fd5b506100cf600160a060020a036004358116906024351661045e565b3480156101d657600080fd5b506100cf600160a060020a036004351661048c565b3480156101f757600080fd5b50610119600160a060020a036004351661051a565b600354600090600160a060020a0316151561022657600080fd5b600354600160a060020a031633148061024e57503360009081526002602052604090205460ff165b151561025957600080fd5b600160a060020a03808416600081815260016020818152604080842095881680855295909152808320805460ff1916909217909155517f708802ac7da0a63d9f6b2df693b53345ad263e42d74c245110e1ec1e03a1567e9190a350600192915050565b60008054600160a060020a031633146102d457600080fd5b600160a060020a03821660009081526002602052604090205460ff1615156001146102fe57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600054600160a060020a0316331461033a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008054600160a060020a031633146103a757600080fd5b5060038054600160a060020a03831673ffffffffffffffffffffffffffffffffffffffff199091161790556001919050565b600354600160a060020a031681565b60008054600160a060020a0316331461040057600080fd5b600160a060020a03821660009081526002602052604090205460ff161561042657600080fd5b50600160a060020a03166000908152600260205260409020805460ff1916600190811790915590565b600054600160a060020a031681565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205460ff1690565b336000908152600160208181526040808420600160a060020a038616855290915282205460ff161515146104bf57600080fd5b336000818152600160209081526040808320600160a060020a0387168085529252808320805460ff19169055519092917f576a9aef294e1b4baf3617fde4cbc80ba5344d5eb508222f29e558981704a45791a3506001919050565b600054600160a060020a0316331461053157600080fd5b61053a8161053d565b50565b600160a060020a038116151561055257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820464d7612eb697c84e91586dcfd1cadb3322d3aa9c03146de08040a490ef5fd2b0029",
   "deployedBytecode": "0x6080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663473b736f81146100a8578063584720f5146100e3578063715018a61461010457806377d58a151461011b57806380f556051461013c5780638a1051f81461016d5780638da5cb5b1461018e578063968f600c146101a3578063be7c7ac3146101ca578063f2fde38b146101eb575b600080fd5b3480156100b457600080fd5b506100cf600160a060020a036004358116906024351661020c565b604080519115158252519081900360200190f35b3480156100ef57600080fd5b506100cf600160a060020a03600435166102bc565b34801561011057600080fd5b50610119610323565b005b34801561012757600080fd5b506100cf600160a060020a036004351661038f565b34801561014857600080fd5b506101516103d9565b60408051600160a060020a039092168252519081900360200190f35b34801561017957600080fd5b506100cf600160a060020a03600435166103e8565b34801561019a57600080fd5b5061015161044f565b3480156101af57600080fd5b506100cf600160a060020a036004358116906024351661045e565b3480156101d657600080fd5b506100cf600160a060020a036004351661048c565b3480156101f757600080fd5b50610119600160a060020a036004351661051a565b600354600090600160a060020a0316151561022657600080fd5b600354600160a060020a031633148061024e57503360009081526002602052604090205460ff165b151561025957600080fd5b600160a060020a03808416600081815260016020818152604080842095881680855295909152808320805460ff1916909217909155517f708802ac7da0a63d9f6b2df693b53345ad263e42d74c245110e1ec1e03a1567e9190a350600192915050565b60008054600160a060020a031633146102d457600080fd5b600160a060020a03821660009081526002602052604090205460ff1615156001146102fe57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600054600160a060020a0316331461033a57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b60008054600160a060020a031633146103a757600080fd5b5060038054600160a060020a03831673ffffffffffffffffffffffffffffffffffffffff199091161790556001919050565b600354600160a060020a031681565b60008054600160a060020a0316331461040057600080fd5b600160a060020a03821660009081526002602052604090205460ff161561042657600080fd5b50600160a060020a03166000908152600260205260409020805460ff1916600190811790915590565b600054600160a060020a031681565b600160a060020a03918216600090815260016020908152604080832093909416825291909152205460ff1690565b336000908152600160208181526040808420600160a060020a038616855290915282205460ff161515146104bf57600080fd5b336000818152600160209081526040808320600160a060020a0387168085529252808320805460ff19169055519092917f576a9aef294e1b4baf3617fde4cbc80ba5344d5eb508222f29e558981704a45791a3506001919050565b600054600160a060020a0316331461053157600080fd5b61053a8161053d565b50565b600160a060020a038116151561055257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820464d7612eb697c84e91586dcfd1cadb3322d3aa9c03146de08040a490ef5fd2b0029",
-  "sourceMap": "89:1574:4:-;;;524:27;;;-1:-1:-1;;;;;;524:27:4;;;558:56;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;589::4;;;;;;89:1574;;;;;;",
-  "deployedSourceMap": "89:1574:4:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;745:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;745:190:4;-1:-1:-1;;;;;745:190:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;1358:168;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1358:168:4;-1:-1:-1;;;;;1358:168:4;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;1532:129:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1532:129:4;-1:-1:-1;;;;;1532:129:4;;;;;524:27;;8:9:-1;5:2;;;30:1;27;20:12;5:2;524:27:4;;;;;;;;-1:-1:-1;;;;;524:27:4;;;;;;;;;;;;;;1187:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1187:165:4;-1:-1:-1;;;;;1187:165:4;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;620:119:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;620:119:4;-1:-1:-1;;;;;620:119:4;;;;;;;;;;941:240;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;941:240:4;-1:-1:-1;;;;;941:240:4;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;745:190:4;166:6;;816:4;;-1:-1:-1;;;;;166:6:4;:13;;158:22;;;;;;212:6;;-1:-1:-1;;;;;212:6:4;198:10;:20;;:42;;-1:-1:-1;229:10:4;222:18;;;;:6;:18;;;;;;;;198:42;190:51;;;;;;;;-1:-1:-1;;;;;832:17:4;;;;;;;859:4;832:17;;;;;;;;:24;;;;;;;;;;;;;:31;;-1:-1:-1;;832:31:4;;;;;;;878:29;;;832:17;878:29;-1:-1:-1;924:4:4;745:190;;;;:::o;1358:168::-;1421:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1445:13:4;;;;;;:6;:13;;;;;;;;:21;;:13;:21;1437:30;;;;;;-1:-1:-1;;;;;;1477:13:4;1493:5;1477:13;;;:6;:13;;;;;:21;;-1:-1:-1;;1477:21:4;;;-1:-1:-1;;1358:168:4:o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;1532:129:4:-;1601:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;1617:6:4;:16;;-1:-1:-1;;;;;1617:16:4;;-1:-1:-1;;1617:16:4;;;;;;;1532:129;;;:::o;524:27::-;;;-1:-1:-1;;;;;524:27:4;;:::o;1187:165::-;1247:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1271:13:4;;;;;;:6;:13;;;;;;;;:22;1263:31;;;;;;-1:-1:-1;;;;;;1304:13:4;;;;;:6;:13;;;;;:20;;-1:-1:-1;;1304:20:4;1320:4;1304:20;;;;;;1320:4;1187:165::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;620:119:4:-;-1:-1:-1;;;;;708:17:4;;;685:4;708:17;;;:11;:17;;;;;;;;:24;;;;;;;;;;;;;;;620:119::o;941:240::-;1024:10;988:4;1012:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1012:30:4;;;;;;;;;;;;:38;;;1004:47;;;;;;1073:10;1094:5;1061:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1061:30:4;;;;;;;;;;:38;;-1:-1:-1;;1061:38:4;;;1114:39;1061:30;;1073:10;1114:39;;;-1:-1:-1;1170:4:4;941:240;;;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "sourceMap": "89:1574:3:-;;;524:27;;;-1:-1:-1;;;;;;524:27:3;;;558:56;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:15;:18;;-1:-1:-1;;;;;;567:18:15;;;575:10;567:18;;;589::3;;;;;;89:1574;;;;;;",
+  "deployedSourceMap": "89:1574:3:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;745:190;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;745:190:3;-1:-1:-1;;;;;745:190:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;1358:168;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1358:168:3;-1:-1:-1;;;;;1358:168:3;;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;;;1532:129:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1532:129:3;-1:-1:-1;;;;;1532:129:3;;;;;524:27;;8:9:-1;5:2;;;30:1;27;20:12;5:2;524:27:3;;;;;;;;-1:-1:-1;;;;;524:27:3;;;;;;;;;;;;;;1187:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1187:165:3;-1:-1:-1;;;;;1187:165:3;;;;;238:20:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;620:119:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;620:119:3;-1:-1:-1;;;;;620:119:3;;;;;;;;;;941:240;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;941:240:3;-1:-1:-1;;;;;941:240:3;;;;;1274:103:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;745:190:3;166:6;;816:4;;-1:-1:-1;;;;;166:6:3;:13;;158:22;;;;;;212:6;;-1:-1:-1;;;;;212:6:3;198:10;:20;;:42;;-1:-1:-1;229:10:3;222:18;;;;:6;:18;;;;;;;;198:42;190:51;;;;;;;;-1:-1:-1;;;;;832:17:3;;;;;;;859:4;832:17;;;;;;;;:24;;;;;;;;;;;;;:31;;-1:-1:-1;;832:31:3;;;;;;;878:29;;;832:17;878:29;-1:-1:-1;924:4:3;745:190;;;;:::o;1358:168::-;1421:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1445:13:3;;;;;;:6;:13;;;;;;;;:21;;:13;:21;1437:30;;;;;;-1:-1:-1;;;;;;1477:13:3;1493:5;1477:13;;;:6;:13;;;;;:21;;-1:-1:-1;;1477:21:3;;;-1:-1:-1;;1358:168:3:o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;1532:129:3:-;1601:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;1617:6:3;:16;;-1:-1:-1;;;;;1617:16:3;;-1:-1:-1;;1617:16:3;;;;;;;1532:129;;;:::o;524:27::-;;;-1:-1:-1;;;;;524:27:3;;:::o;1187:165::-;1247:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;1271:13:3;;;;;;:6;:13;;;;;;;;:22;1263:31;;;;;;-1:-1:-1;;;;;;1304:13:3;;;;;:6;:13;;;;;:20;;-1:-1:-1;;1304:20:3;1320:4;1304:20;;;;;;1320:4;1187:165::o;238:20:15:-;;;-1:-1:-1;;;;;238:20:15;;:::o;620:119:3:-;-1:-1:-1;;;;;708:17:3;;;685:4;708:17;;;:11;:17;;;;;;;;:24;;;;;;;;;;;;;;;620:119::o;941:240::-;1024:10;988:4;1012:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1012:30:3;;;;;;;;;;;;:38;;;1004:47;;;;;;1073:10;1094:5;1061:23;;;:11;:23;;;;;;;;-1:-1:-1;;;;;1061:30:3;;;;;;;;;;:38;;-1:-1:-1;;1061:38:3;;;1114:39;1061:30;;1073:10;1114:39;;;-1:-1:-1;1170:4:3;941:240;;;:::o;1274:103:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract Blacklist is Ownable {\n\n    modifier OnlyMarket() {\n        require(market != 0x0);\n        require(msg.sender == market || master[msg.sender]);\n        _;\n    }\n\n    event AddedToBlacklist(address indexed adder, address indexed addee);\n\n    event RemovedFromBlacklist(address indexed remover, address indexed removee);\n\n    mapping(address => mapping(address => bool)) blacklisted;\n\n    mapping(address => bool) master;\n\n    address public market = 0x0;\n\n    constructor() public {\n        owner = msg.sender;\n    }\n\n    function Check(address _who, address _whom) public view returns (bool) {\n        return blacklisted[_who][_whom];\n    }\n\n    function Add(address _who, address _whom) external OnlyMarket returns (bool) {\n        blacklisted[_who][_whom] = true;\n        emit AddedToBlacklist(_who, _whom);\n        return true;\n    }\n\n    function Remove(address _whom) public returns (bool) {\n        require(blacklisted[msg.sender][_whom] == true);\n        blacklisted[msg.sender][_whom] = false;\n        emit RemovedFromBlacklist(msg.sender, _whom);\n        return true;\n    }\n\n    function AddMaster(address _root) public onlyOwner returns (bool) {\n        require(master[_root] == false);\n        master[_root] = true;\n        return true;\n    }\n\n    function RemoveMaster(address _root) public onlyOwner returns (bool) {\n        require(master[_root] == true);\n        master[_root] = false;\n        return true;\n    }\n\n    function SetMarketAddress(address _market) public onlyOwner returns (bool) {\n        market = _market;\n        return true;\n    }\n}\n",
   "sourcePath": "contracts/Blacklist.sol",
   "ast": {
     "absolutePath": "contracts/Blacklist.sol",
     "exportedSymbols": {
       "Blacklist": [
-        1161
+        985
       ]
     },
-    "id": 1162,
+    "id": 986,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 954,
+        "id": 778,
         "literals": [
           "solidity",
           "^",
@@ -269,16 +269,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:4"
+        "src": "0:24:3"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 955,
+        "id": 779,
         "nodeType": "ImportDirective",
-        "scope": 1162,
-        "sourceUnit": 10883,
-        "src": "27:59:4",
+        "scope": 986,
+        "sourceUnit": 11167,
+        "src": "27:59:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -288,40 +288,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 956,
+              "id": 780,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "111:7:4",
+              "referencedDeclaration": 11166,
+              "src": "111:7:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 957,
+            "id": 781,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:4"
+            "src": "111:7:3"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 1161,
+        "id": 985,
         "linearizedBaseContracts": [
-          1161,
-          10882
+          985,
+          11166
         ],
         "name": "Blacklist",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 978,
+              "id": 802,
               "nodeType": "Block",
-              "src": "148:111:4",
+              "src": "148:111:3",
               "statements": [
                 {
                   "expression": {
@@ -333,19 +333,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 962,
+                        "id": 786,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 960,
+                          "id": 784,
                           "name": "market",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1004,
-                          "src": "166:6:4",
+                          "referencedDeclaration": 828,
+                          "src": "166:6:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -356,14 +356,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "307830",
-                          "id": 961,
+                          "id": 785,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "176:3:4",
+                          "src": "176:3:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -371,7 +371,7 @@
                           },
                           "value": "0x0"
                         },
-                        "src": "166:13:4",
+                        "src": "166:13:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -385,21 +385,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 959,
+                      "id": 783,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "158:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "158:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 963,
+                    "id": 787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -407,15 +407,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "158:22:4",
+                    "src": "158:22:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 964,
+                  "id": 788,
                   "nodeType": "ExpressionStatement",
-                  "src": "158:22:4"
+                  "src": "158:22:3"
                 },
                 {
                   "expression": {
@@ -427,7 +427,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 974,
+                        "id": 798,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -438,7 +438,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 969,
+                          "id": 793,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -447,18 +447,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 966,
+                              "id": 790,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "198:3:4",
+                              "referencedDeclaration": 11599,
+                              "src": "198:3:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 967,
+                            "id": 791,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -466,7 +466,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "198:10:4",
+                            "src": "198:10:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -476,18 +476,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 968,
+                            "id": 792,
                             "name": "market",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1004,
-                            "src": "212:6:4",
+                            "referencedDeclaration": 828,
+                            "src": "212:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "198:20:4",
+                          "src": "198:20:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -499,34 +499,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 970,
+                            "id": 794,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "222:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "222:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 973,
+                          "id": 797,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 971,
+                              "id": 795,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "229:3:4",
+                              "referencedDeclaration": 11599,
+                              "src": "229:3:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 972,
+                            "id": 796,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -534,7 +534,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "229:10:4",
+                            "src": "229:10:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -545,13 +545,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "222:18:4",
+                          "src": "222:18:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "198:42:4",
+                        "src": "198:42:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -565,21 +565,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 965,
+                      "id": 789,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "190:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "190:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 975,
+                    "id": 799,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -587,54 +587,54 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "190:51:4",
+                    "src": "190:51:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 976,
+                  "id": 800,
                   "nodeType": "ExpressionStatement",
-                  "src": "190:51:4"
+                  "src": "190:51:3"
                 },
                 {
-                  "id": 977,
+                  "id": 801,
                   "nodeType": "PlaceholderStatement",
-                  "src": "251:1:4"
+                  "src": "251:1:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 979,
+            "id": 803,
             "name": "OnlyMarket",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 958,
+              "id": 782,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "145:2:4"
+              "src": "145:2:3"
             },
-            "src": "126:133:4",
+            "src": "126:133:3",
             "visibility": "internal"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 985,
+            "id": 809,
             "name": "AddedToBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 984,
+              "id": 808,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 981,
+                  "id": 805,
                   "indexed": true,
                   "name": "adder",
                   "nodeType": "VariableDeclaration",
-                  "scope": 985,
-                  "src": "288:21:4",
+                  "scope": 809,
+                  "src": "288:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -642,10 +642,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 980,
+                    "id": 804,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "288:7:4",
+                    "src": "288:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -656,12 +656,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 983,
+                  "id": 807,
                   "indexed": true,
                   "name": "addee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 985,
-                  "src": "311:21:4",
+                  "scope": 809,
+                  "src": "311:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -669,10 +669,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 982,
+                    "id": 806,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "311:7:4",
+                    "src": "311:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -682,28 +682,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "287:46:4"
+              "src": "287:46:3"
             },
-            "src": "265:69:4"
+            "src": "265:69:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 991,
+            "id": 815,
             "name": "RemovedFromBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 990,
+              "id": 814,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 987,
+                  "id": 811,
                   "indexed": true,
                   "name": "remover",
                   "nodeType": "VariableDeclaration",
-                  "scope": 991,
-                  "src": "367:23:4",
+                  "scope": 815,
+                  "src": "367:23:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -711,10 +711,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 986,
+                    "id": 810,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "367:7:4",
+                    "src": "367:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -725,12 +725,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 989,
+                  "id": 813,
                   "indexed": true,
                   "name": "removee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 991,
-                  "src": "392:23:4",
+                  "scope": 815,
+                  "src": "392:23:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -738,10 +738,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 988,
+                    "id": 812,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "392:7:4",
+                    "src": "392:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -751,17 +751,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "366:50:4"
+              "src": "366:50:3"
             },
-            "src": "340:77:4"
+            "src": "340:77:3"
           },
           {
             "constant": false,
-            "id": 997,
+            "id": 821,
             "name": "blacklisted",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "423:56:4",
+            "scope": 985,
+            "src": "423:56:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -769,46 +769,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 996,
+              "id": 820,
               "keyType": {
-                "id": 992,
+                "id": 816,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "431:7:4",
+                "src": "431:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "423:44:4",
+              "src": "423:44:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 995,
+                "id": 819,
                 "keyType": {
-                  "id": 993,
+                  "id": 817,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "450:7:4",
+                  "src": "450:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "442:24:4",
+                "src": "442:24:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 994,
+                  "id": 818,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "461:4:4",
+                  "src": "461:4:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -821,11 +821,11 @@
           },
           {
             "constant": false,
-            "id": 1001,
+            "id": 825,
             "name": "master",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "486:31:4",
+            "scope": 985,
+            "src": "486:31:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -833,28 +833,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 1000,
+              "id": 824,
               "keyType": {
-                "id": 998,
+                "id": 822,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "494:7:4",
+                "src": "494:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "486:24:4",
+              "src": "486:24:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 999,
+                "id": 823,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "505:4:4",
+                "src": "505:4:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -866,11 +866,11 @@
           },
           {
             "constant": false,
-            "id": 1004,
+            "id": 828,
             "name": "market",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "524:27:4",
+            "scope": 985,
+            "src": "524:27:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -878,10 +878,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 1002,
+              "id": 826,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "524:7:4",
+              "src": "524:7:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -890,14 +890,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "307830",
-              "id": 1003,
+              "id": 827,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "548:3:4",
+              "src": "548:3:3",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -909,26 +909,26 @@
           },
           {
             "body": {
-              "id": 1012,
+              "id": 836,
               "nodeType": "Block",
-              "src": "579:35:4",
+              "src": "579:35:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1010,
+                    "id": 834,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1007,
+                      "id": 831,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "589:5:4",
+                      "referencedDeclaration": 11084,
+                      "src": "589:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -940,18 +940,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1008,
+                        "id": 832,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "597:3:4",
+                        "referencedDeclaration": 11599,
+                        "src": "597:3:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 1009,
+                      "id": 833,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -959,26 +959,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "597:10:4",
+                      "src": "597:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "589:18:4",
+                    "src": "589:18:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 1011,
+                  "id": 835,
                   "nodeType": "ExpressionStatement",
-                  "src": "589:18:4"
+                  "src": "589:18:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1013,
+            "id": 837,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -986,29 +986,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1005,
+              "id": 829,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "569:2:4"
+              "src": "569:2:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1006,
+              "id": 830,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "579:0:4"
+              "src": "579:0:3"
             },
-            "scope": 1161,
-            "src": "558:56:4",
+            "scope": 985,
+            "src": "558:56:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1028,
+              "id": 852,
               "nodeType": "Block",
-              "src": "691:48:4",
+              "src": "691:48:3",
               "statements": [
                 {
                   "expression": {
@@ -1017,26 +1017,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1022,
+                        "id": 846,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 997,
-                        "src": "708:11:4",
+                        "referencedDeclaration": 821,
+                        "src": "708:11:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                           "typeString": "mapping(address => mapping(address => bool))"
                         }
                       },
-                      "id": 1024,
+                      "id": 848,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1023,
+                        "id": 847,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1015,
-                        "src": "720:4:4",
+                        "referencedDeclaration": 839,
+                        "src": "720:4:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1047,21 +1047,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "708:17:4",
+                      "src": "708:17:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                         "typeString": "mapping(address => bool)"
                       }
                     },
-                    "id": 1026,
+                    "id": 850,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1025,
+                      "id": 849,
                       "name": "_whom",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1017,
-                      "src": "726:5:4",
+                      "referencedDeclaration": 841,
+                      "src": "726:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1072,21 +1072,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "708:24:4",
+                    "src": "708:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 1021,
-                  "id": 1027,
+                  "functionReturnParameters": 845,
+                  "id": 851,
                   "nodeType": "Return",
-                  "src": "701:31:4"
+                  "src": "701:31:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1029,
+            "id": 853,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1094,16 +1094,16 @@
             "name": "Check",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1018,
+              "id": 842,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1015,
+                  "id": 839,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "635:12:4",
+                  "scope": 853,
+                  "src": "635:12:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1111,10 +1111,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1014,
+                    "id": 838,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "635:7:4",
+                    "src": "635:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1125,11 +1125,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1017,
+                  "id": 841,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "649:13:4",
+                  "scope": 853,
+                  "src": "649:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1137,10 +1137,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1016,
+                    "id": 840,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "649:7:4",
+                    "src": "649:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1150,20 +1150,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "634:29:4"
+              "src": "634:29:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1021,
+              "id": 845,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1020,
+                  "id": 844,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "685:4:4",
+                  "scope": 853,
+                  "src": "685:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1171,10 +1171,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1019,
+                    "id": 843,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "685:4:4",
+                    "src": "685:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1184,24 +1184,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "684:6:4"
+              "src": "684:6:3"
             },
-            "scope": 1161,
-            "src": "620:119:4",
+            "scope": 985,
+            "src": "620:119:3",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1055,
+              "id": 879,
               "nodeType": "Block",
-              "src": "822:113:4",
+              "src": "822:113:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1046,
+                    "id": 870,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1212,26 +1212,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1040,
+                          "id": 864,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "832:11:4",
+                          "referencedDeclaration": 821,
+                          "src": "832:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 1043,
+                        "id": 867,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1041,
+                          "id": 865,
                           "name": "_who",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1031,
-                          "src": "844:4:4",
+                          "referencedDeclaration": 855,
+                          "src": "844:4:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1242,21 +1242,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "832:17:4",
+                        "src": "832:17:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1044,
+                      "id": 868,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1042,
+                        "id": 866,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1033,
-                        "src": "850:5:4",
+                        "referencedDeclaration": 857,
+                        "src": "850:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1267,7 +1267,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "832:24:4",
+                      "src": "832:24:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1278,14 +1278,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 1045,
+                      "id": 869,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "859:4:4",
+                      "src": "859:4:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1293,15 +1293,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "832:31:4",
+                    "src": "832:31:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1047,
+                  "id": 871,
                   "nodeType": "ExpressionStatement",
-                  "src": "832:31:4"
+                  "src": "832:31:3"
                 },
                 {
                   "eventCall": {
@@ -1309,12 +1309,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1049,
+                        "id": 873,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1031,
-                        "src": "895:4:4",
+                        "referencedDeclaration": 855,
+                        "src": "895:4:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1322,12 +1322,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1050,
+                        "id": 874,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1033,
-                        "src": "901:5:4",
+                        "referencedDeclaration": 857,
+                        "src": "901:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1345,18 +1345,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1048,
+                      "id": 872,
                       "name": "AddedToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 985,
-                      "src": "878:16:4",
+                      "referencedDeclaration": 809,
+                      "src": "878:16:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 1051,
+                    "id": 875,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1364,28 +1364,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "878:29:4",
+                    "src": "878:29:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1052,
+                  "id": 876,
                   "nodeType": "EmitStatement",
-                  "src": "873:34:4"
+                  "src": "873:34:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1053,
+                    "id": 877,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "924:4:4",
+                    "src": "924:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1393,52 +1393,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1039,
-                  "id": 1054,
+                  "functionReturnParameters": 863,
+                  "id": 878,
                   "nodeType": "Return",
-                  "src": "917:11:4"
+                  "src": "917:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1056,
+            "id": 880,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1036,
+                "id": 860,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1035,
+                  "id": 859,
                   "name": "OnlyMarket",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 979,
-                  "src": "796:10:4",
+                  "referencedDeclaration": 803,
+                  "src": "796:10:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "796:10:4"
+                "src": "796:10:3"
               }
             ],
             "name": "Add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1034,
+              "id": 858,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1031,
+                  "id": 855,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "758:12:4",
+                  "scope": 880,
+                  "src": "758:12:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1446,10 +1446,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1030,
+                    "id": 854,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "758:7:4",
+                    "src": "758:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1460,11 +1460,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1033,
+                  "id": 857,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "772:13:4",
+                  "scope": 880,
+                  "src": "772:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1472,10 +1472,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1032,
+                    "id": 856,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:4",
+                    "src": "772:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1485,20 +1485,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "757:29:4"
+              "src": "757:29:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1039,
+              "id": 863,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1038,
+                  "id": 862,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "816:4:4",
+                  "scope": 880,
+                  "src": "816:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1506,10 +1506,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1037,
+                    "id": 861,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "816:4:4",
+                    "src": "816:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1519,19 +1519,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "815:6:4"
+              "src": "815:6:3"
             },
-            "scope": 1161,
-            "src": "745:190:4",
+            "scope": 985,
+            "src": "745:190:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "external"
           },
           {
             "body": {
-              "id": 1091,
+              "id": 915,
               "nodeType": "Block",
-              "src": "994:187:4",
+              "src": "994:187:3",
               "statements": [
                 {
                   "expression": {
@@ -1543,7 +1543,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1071,
+                        "id": 895,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1554,34 +1554,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1064,
+                              "id": 888,
                               "name": "blacklisted",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 997,
-                              "src": "1012:11:4",
+                              "referencedDeclaration": 821,
+                              "src": "1012:11:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 1067,
+                            "id": 891,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1065,
+                                "id": 889,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "1024:3:4",
+                                "referencedDeclaration": 11599,
+                                "src": "1024:3:3",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1066,
+                              "id": 890,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -1589,7 +1589,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1024:10:4",
+                              "src": "1024:10:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1600,21 +1600,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1012:23:4",
+                            "src": "1012:23:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1069,
+                          "id": 893,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1068,
+                            "id": 892,
                             "name": "_whom",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1058,
-                            "src": "1036:5:4",
+                            "referencedDeclaration": 882,
+                            "src": "1036:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1625,7 +1625,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1012:30:4",
+                          "src": "1012:30:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -1636,14 +1636,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 1070,
+                          "id": 894,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1046:4:4",
+                          "src": "1046:4:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -1651,7 +1651,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1012:38:4",
+                        "src": "1012:38:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1665,21 +1665,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1063,
+                      "id": 887,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1004:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1004:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1072,
+                    "id": 896,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1687,20 +1687,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1004:47:4",
+                    "src": "1004:47:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1073,
+                  "id": 897,
                   "nodeType": "ExpressionStatement",
-                  "src": "1004:47:4"
+                  "src": "1004:47:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1081,
+                    "id": 905,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1711,34 +1711,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1074,
+                          "id": 898,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "1061:11:4",
+                          "referencedDeclaration": 821,
+                          "src": "1061:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 1078,
+                        "id": 902,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1075,
+                            "id": 899,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "1073:3:4",
+                            "referencedDeclaration": 11599,
+                            "src": "1073:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1076,
+                          "id": 900,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1746,7 +1746,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1073:10:4",
+                          "src": "1073:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1757,21 +1757,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1061:23:4",
+                        "src": "1061:23:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1079,
+                      "id": 903,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1077,
+                        "id": 901,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1058,
-                        "src": "1085:5:4",
+                        "referencedDeclaration": 882,
+                        "src": "1085:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1782,7 +1782,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1061:30:4",
+                      "src": "1061:30:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1793,14 +1793,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 1080,
+                      "id": 904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1094:5:4",
+                      "src": "1094:5:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1808,15 +1808,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "1061:38:4",
+                    "src": "1061:38:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1082,
+                  "id": 906,
                   "nodeType": "ExpressionStatement",
-                  "src": "1061:38:4"
+                  "src": "1061:38:3"
                 },
                 {
                   "eventCall": {
@@ -1826,18 +1826,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1084,
+                          "id": 908,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1135:3:4",
+                          "referencedDeclaration": 11599,
+                          "src": "1135:3:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 1085,
+                        "id": 909,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1845,7 +1845,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1135:10:4",
+                        "src": "1135:10:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1853,12 +1853,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1086,
+                        "id": 910,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1058,
-                        "src": "1147:5:4",
+                        "referencedDeclaration": 882,
+                        "src": "1147:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1876,18 +1876,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1083,
+                      "id": 907,
                       "name": "RemovedFromBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 991,
-                      "src": "1114:20:4",
+                      "referencedDeclaration": 815,
+                      "src": "1114:20:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 1087,
+                    "id": 911,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1895,28 +1895,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1114:39:4",
+                    "src": "1114:39:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1088,
+                  "id": 912,
                   "nodeType": "EmitStatement",
-                  "src": "1109:44:4"
+                  "src": "1109:44:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1089,
+                    "id": 913,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1170:4:4",
+                    "src": "1170:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1924,15 +1924,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1062,
-                  "id": 1090,
+                  "functionReturnParameters": 886,
+                  "id": 914,
                   "nodeType": "Return",
-                  "src": "1163:11:4"
+                  "src": "1163:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1092,
+            "id": 916,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1940,16 +1940,16 @@
             "name": "Remove",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1059,
+              "id": 883,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1058,
+                  "id": 882,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1092,
-                  "src": "957:13:4",
+                  "scope": 916,
+                  "src": "957:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1957,10 +1957,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1057,
+                    "id": 881,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "957:7:4",
+                    "src": "957:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1970,20 +1970,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "956:15:4"
+              "src": "956:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1062,
+              "id": 886,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1061,
+                  "id": 885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1092,
-                  "src": "988:4:4",
+                  "scope": 916,
+                  "src": "988:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1991,10 +1991,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1060,
+                    "id": 884,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "988:4:4",
+                    "src": "988:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2004,19 +2004,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "987:6:4"
+              "src": "987:6:3"
             },
-            "scope": 1161,
-            "src": "941:240:4",
+            "scope": 985,
+            "src": "941:240:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1117,
+              "id": 941,
               "nodeType": "Block",
-              "src": "1253:99:4",
+              "src": "1253:99:3",
               "statements": [
                 {
                   "expression": {
@@ -2028,7 +2028,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1106,
+                        "id": 930,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2037,26 +2037,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1102,
+                            "id": 926,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "1271:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "1271:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1104,
+                          "id": 928,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1103,
+                            "id": 927,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1094,
-                            "src": "1278:5:4",
+                            "referencedDeclaration": 918,
+                            "src": "1278:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2067,7 +2067,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1271:13:4",
+                          "src": "1271:13:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2078,14 +2078,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 1105,
+                          "id": 929,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1288:5:4",
+                          "src": "1288:5:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2093,7 +2093,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "1271:22:4",
+                        "src": "1271:22:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2107,21 +2107,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1101,
+                      "id": 925,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1263:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1263:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1107,
+                    "id": 931,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2129,20 +2129,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1263:31:4",
+                    "src": "1263:31:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1108,
+                  "id": 932,
                   "nodeType": "ExpressionStatement",
-                  "src": "1263:31:4"
+                  "src": "1263:31:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1113,
+                    "id": 937,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2151,26 +2151,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1109,
+                        "id": 933,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1001,
-                        "src": "1304:6:4",
+                        "referencedDeclaration": 825,
+                        "src": "1304:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1111,
+                      "id": 935,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1110,
+                        "id": 934,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1094,
-                        "src": "1311:5:4",
+                        "referencedDeclaration": 918,
+                        "src": "1311:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2181,7 +2181,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1304:13:4",
+                      "src": "1304:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2192,14 +2192,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 1112,
+                      "id": 936,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1320:4:4",
+                      "src": "1320:4:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2207,28 +2207,28 @@
                       },
                       "value": "true"
                     },
-                    "src": "1304:20:4",
+                    "src": "1304:20:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1114,
+                  "id": 938,
                   "nodeType": "ExpressionStatement",
-                  "src": "1304:20:4"
+                  "src": "1304:20:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1115,
+                    "id": 939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1341:4:4",
+                    "src": "1341:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2236,52 +2236,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1100,
-                  "id": 1116,
+                  "functionReturnParameters": 924,
+                  "id": 940,
                   "nodeType": "Return",
-                  "src": "1334:11:4"
+                  "src": "1334:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1118,
+            "id": 942,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1097,
+                "id": 921,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1096,
+                  "id": 920,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1228:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1228:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1228:9:4"
+                "src": "1228:9:3"
               }
             ],
             "name": "AddMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1095,
+              "id": 919,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1094,
+                  "id": 918,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1118,
-                  "src": "1206:13:4",
+                  "scope": 942,
+                  "src": "1206:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2289,10 +2289,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1093,
+                    "id": 917,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1206:7:4",
+                    "src": "1206:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2302,20 +2302,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1205:15:4"
+              "src": "1205:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1100,
+              "id": 924,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1099,
+                  "id": 923,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1118,
-                  "src": "1247:4:4",
+                  "scope": 942,
+                  "src": "1247:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2323,10 +2323,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1098,
+                    "id": 922,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1247:4:4",
+                    "src": "1247:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2336,19 +2336,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1246:6:4"
+              "src": "1246:6:3"
             },
-            "scope": 1161,
-            "src": "1187:165:4",
+            "scope": 985,
+            "src": "1187:165:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1143,
+              "id": 967,
               "nodeType": "Block",
-              "src": "1427:99:4",
+              "src": "1427:99:3",
               "statements": [
                 {
                   "expression": {
@@ -2360,7 +2360,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1132,
+                        "id": 956,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2369,26 +2369,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1128,
+                            "id": 952,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "1445:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "1445:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1130,
+                          "id": 954,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1129,
+                            "id": 953,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1120,
-                            "src": "1452:5:4",
+                            "referencedDeclaration": 944,
+                            "src": "1452:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2399,7 +2399,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1445:13:4",
+                          "src": "1445:13:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2410,14 +2410,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 1131,
+                          "id": 955,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1462:4:4",
+                          "src": "1462:4:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -2425,7 +2425,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1445:21:4",
+                        "src": "1445:21:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2439,21 +2439,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1127,
+                      "id": 951,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1437:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1437:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1133,
+                    "id": 957,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2461,20 +2461,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1437:30:4",
+                    "src": "1437:30:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1134,
+                  "id": 958,
                   "nodeType": "ExpressionStatement",
-                  "src": "1437:30:4"
+                  "src": "1437:30:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1139,
+                    "id": 963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2483,26 +2483,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1135,
+                        "id": 959,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1001,
-                        "src": "1477:6:4",
+                        "referencedDeclaration": 825,
+                        "src": "1477:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1137,
+                      "id": 961,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1136,
+                        "id": 960,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1120,
-                        "src": "1484:5:4",
+                        "referencedDeclaration": 944,
+                        "src": "1484:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2513,7 +2513,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1477:13:4",
+                      "src": "1477:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -2524,14 +2524,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 1138,
+                      "id": 962,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1493:5:4",
+                      "src": "1493:5:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -2539,28 +2539,28 @@
                       },
                       "value": "false"
                     },
-                    "src": "1477:21:4",
+                    "src": "1477:21:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1140,
+                  "id": 964,
                   "nodeType": "ExpressionStatement",
-                  "src": "1477:21:4"
+                  "src": "1477:21:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1141,
+                    "id": 965,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1515:4:4",
+                    "src": "1515:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2568,52 +2568,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1126,
-                  "id": 1142,
+                  "functionReturnParameters": 950,
+                  "id": 966,
                   "nodeType": "Return",
-                  "src": "1508:11:4"
+                  "src": "1508:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1144,
+            "id": 968,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1123,
+                "id": 947,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1122,
+                  "id": 946,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1402:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1402:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1402:9:4"
+                "src": "1402:9:3"
               }
             ],
             "name": "RemoveMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1121,
+              "id": 945,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1120,
+                  "id": 944,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1144,
-                  "src": "1380:13:4",
+                  "scope": 968,
+                  "src": "1380:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2621,10 +2621,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1119,
+                    "id": 943,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1380:7:4",
+                    "src": "1380:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2634,20 +2634,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1379:15:4"
+              "src": "1379:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1126,
+              "id": 950,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1125,
+                  "id": 949,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1144,
-                  "src": "1421:4:4",
+                  "scope": 968,
+                  "src": "1421:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2655,10 +2655,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1124,
+                    "id": 948,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1421:4:4",
+                    "src": "1421:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2668,36 +2668,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1420:6:4"
+              "src": "1420:6:3"
             },
-            "scope": 1161,
-            "src": "1358:168:4",
+            "scope": 985,
+            "src": "1358:168:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1159,
+              "id": 983,
               "nodeType": "Block",
-              "src": "1607:54:4",
+              "src": "1607:54:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1155,
+                    "id": 979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1153,
+                      "id": 977,
                       "name": "market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1004,
-                      "src": "1617:6:4",
+                      "referencedDeclaration": 828,
+                      "src": "1617:6:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2707,39 +2707,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1154,
+                      "id": 978,
                       "name": "_market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1146,
-                      "src": "1626:7:4",
+                      "referencedDeclaration": 970,
+                      "src": "1626:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1617:16:4",
+                    "src": "1617:16:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 1156,
+                  "id": 980,
                   "nodeType": "ExpressionStatement",
-                  "src": "1617:16:4"
+                  "src": "1617:16:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1157,
+                    "id": 981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1650:4:4",
+                    "src": "1650:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2747,52 +2747,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1152,
-                  "id": 1158,
+                  "functionReturnParameters": 976,
+                  "id": 982,
                   "nodeType": "Return",
-                  "src": "1643:11:4"
+                  "src": "1643:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1160,
+            "id": 984,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1149,
+                "id": 973,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1148,
+                  "id": 972,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1582:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1582:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1582:9:4"
+                "src": "1582:9:3"
               }
             ],
             "name": "SetMarketAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1147,
+              "id": 971,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1146,
+                  "id": 970,
                   "name": "_market",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1160,
-                  "src": "1558:15:4",
+                  "scope": 984,
+                  "src": "1558:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2800,10 +2800,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1145,
+                    "id": 969,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1558:7:4",
+                    "src": "1558:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2813,20 +2813,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1557:17:4"
+              "src": "1557:17:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1152,
+              "id": 976,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1151,
+                  "id": 975,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1160,
-                  "src": "1601:4:4",
+                  "scope": 984,
+                  "src": "1601:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2834,10 +2834,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1150,
+                    "id": 974,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1601:4:4",
+                    "src": "1601:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2847,33 +2847,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1600:6:4"
+              "src": "1600:6:3"
             },
-            "scope": 1161,
-            "src": "1532:129:4",
+            "scope": 985,
+            "src": "1532:129:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 1162,
-        "src": "89:1574:4"
+        "scope": 986,
+        "src": "89:1574:3"
       }
     ],
-    "src": "0:1664:4"
+    "src": "0:1664:3"
   },
   "legacyAST": {
     "absolutePath": "contracts/Blacklist.sol",
     "exportedSymbols": {
       "Blacklist": [
-        1161
+        985
       ]
     },
-    "id": 1162,
+    "id": 986,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 954,
+        "id": 778,
         "literals": [
           "solidity",
           "^",
@@ -2881,16 +2881,16 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:4"
+        "src": "0:24:3"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 955,
+        "id": 779,
         "nodeType": "ImportDirective",
-        "scope": 1162,
-        "sourceUnit": 10883,
-        "src": "27:59:4",
+        "scope": 986,
+        "sourceUnit": 11167,
+        "src": "27:59:3",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -2900,40 +2900,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 956,
+              "id": 780,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "111:7:4",
+              "referencedDeclaration": 11166,
+              "src": "111:7:3",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 957,
+            "id": 781,
             "nodeType": "InheritanceSpecifier",
-            "src": "111:7:4"
+            "src": "111:7:3"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 1161,
+        "id": 985,
         "linearizedBaseContracts": [
-          1161,
-          10882
+          985,
+          11166
         ],
         "name": "Blacklist",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 978,
+              "id": 802,
               "nodeType": "Block",
-              "src": "148:111:4",
+              "src": "148:111:3",
               "statements": [
                 {
                   "expression": {
@@ -2945,19 +2945,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 962,
+                        "id": 786,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 960,
+                          "id": 784,
                           "name": "market",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1004,
-                          "src": "166:6:4",
+                          "referencedDeclaration": 828,
+                          "src": "166:6:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2968,14 +2968,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "307830",
-                          "id": 961,
+                          "id": 785,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "176:3:4",
+                          "src": "176:3:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2983,7 +2983,7 @@
                           },
                           "value": "0x0"
                         },
-                        "src": "166:13:4",
+                        "src": "166:13:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2997,21 +2997,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 959,
+                      "id": 783,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "158:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "158:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 963,
+                    "id": 787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3019,15 +3019,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "158:22:4",
+                    "src": "158:22:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 964,
+                  "id": 788,
                   "nodeType": "ExpressionStatement",
-                  "src": "158:22:4"
+                  "src": "158:22:3"
                 },
                 {
                   "expression": {
@@ -3039,7 +3039,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 974,
+                        "id": 798,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3050,7 +3050,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 969,
+                          "id": 793,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3059,18 +3059,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 966,
+                              "id": 790,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "198:3:4",
+                              "referencedDeclaration": 11599,
+                              "src": "198:3:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 967,
+                            "id": 791,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3078,7 +3078,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "198:10:4",
+                            "src": "198:10:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3088,18 +3088,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 968,
+                            "id": 792,
                             "name": "market",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1004,
-                            "src": "212:6:4",
+                            "referencedDeclaration": 828,
+                            "src": "212:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "198:20:4",
+                          "src": "198:20:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -3111,34 +3111,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 970,
+                            "id": 794,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "222:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "222:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 973,
+                          "id": 797,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 971,
+                              "id": 795,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "229:3:4",
+                              "referencedDeclaration": 11599,
+                              "src": "229:3:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 972,
+                            "id": 796,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3146,7 +3146,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "229:10:4",
+                            "src": "229:10:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3157,13 +3157,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "222:18:4",
+                          "src": "222:18:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "198:42:4",
+                        "src": "198:42:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3177,21 +3177,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 965,
+                      "id": 789,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "190:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "190:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 975,
+                    "id": 799,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3199,54 +3199,54 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "190:51:4",
+                    "src": "190:51:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 976,
+                  "id": 800,
                   "nodeType": "ExpressionStatement",
-                  "src": "190:51:4"
+                  "src": "190:51:3"
                 },
                 {
-                  "id": 977,
+                  "id": 801,
                   "nodeType": "PlaceholderStatement",
-                  "src": "251:1:4"
+                  "src": "251:1:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 979,
+            "id": 803,
             "name": "OnlyMarket",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 958,
+              "id": 782,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "145:2:4"
+              "src": "145:2:3"
             },
-            "src": "126:133:4",
+            "src": "126:133:3",
             "visibility": "internal"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 985,
+            "id": 809,
             "name": "AddedToBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 984,
+              "id": 808,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 981,
+                  "id": 805,
                   "indexed": true,
                   "name": "adder",
                   "nodeType": "VariableDeclaration",
-                  "scope": 985,
-                  "src": "288:21:4",
+                  "scope": 809,
+                  "src": "288:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3254,10 +3254,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 980,
+                    "id": 804,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "288:7:4",
+                    "src": "288:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3268,12 +3268,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 983,
+                  "id": 807,
                   "indexed": true,
                   "name": "addee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 985,
-                  "src": "311:21:4",
+                  "scope": 809,
+                  "src": "311:21:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3281,10 +3281,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 982,
+                    "id": 806,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "311:7:4",
+                    "src": "311:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3294,28 +3294,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "287:46:4"
+              "src": "287:46:3"
             },
-            "src": "265:69:4"
+            "src": "265:69:3"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 991,
+            "id": 815,
             "name": "RemovedFromBlacklist",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 990,
+              "id": 814,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 987,
+                  "id": 811,
                   "indexed": true,
                   "name": "remover",
                   "nodeType": "VariableDeclaration",
-                  "scope": 991,
-                  "src": "367:23:4",
+                  "scope": 815,
+                  "src": "367:23:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3323,10 +3323,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 986,
+                    "id": 810,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "367:7:4",
+                    "src": "367:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3337,12 +3337,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 989,
+                  "id": 813,
                   "indexed": true,
                   "name": "removee",
                   "nodeType": "VariableDeclaration",
-                  "scope": 991,
-                  "src": "392:23:4",
+                  "scope": 815,
+                  "src": "392:23:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3350,10 +3350,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 988,
+                    "id": 812,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "392:7:4",
+                    "src": "392:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3363,17 +3363,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "366:50:4"
+              "src": "366:50:3"
             },
-            "src": "340:77:4"
+            "src": "340:77:3"
           },
           {
             "constant": false,
-            "id": 997,
+            "id": 821,
             "name": "blacklisted",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "423:56:4",
+            "scope": 985,
+            "src": "423:56:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3381,46 +3381,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 996,
+              "id": 820,
               "keyType": {
-                "id": 992,
+                "id": 816,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "431:7:4",
+                "src": "431:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "423:44:4",
+              "src": "423:44:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 995,
+                "id": 819,
                 "keyType": {
-                  "id": 993,
+                  "id": 817,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "450:7:4",
+                  "src": "450:7:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "442:24:4",
+                "src": "442:24:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 994,
+                  "id": 818,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "461:4:4",
+                  "src": "461:4:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -3433,11 +3433,11 @@
           },
           {
             "constant": false,
-            "id": 1001,
+            "id": 825,
             "name": "master",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "486:31:4",
+            "scope": 985,
+            "src": "486:31:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3445,28 +3445,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 1000,
+              "id": 824,
               "keyType": {
-                "id": 998,
+                "id": 822,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "494:7:4",
+                "src": "494:7:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "486:24:4",
+              "src": "486:24:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 999,
+                "id": 823,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "505:4:4",
+                "src": "505:4:3",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -3478,11 +3478,11 @@
           },
           {
             "constant": false,
-            "id": 1004,
+            "id": 828,
             "name": "market",
             "nodeType": "VariableDeclaration",
-            "scope": 1161,
-            "src": "524:27:4",
+            "scope": 985,
+            "src": "524:27:3",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3490,10 +3490,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 1002,
+              "id": 826,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "524:7:4",
+              "src": "524:7:3",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -3502,14 +3502,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "307830",
-              "id": 1003,
+              "id": 827,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "548:3:4",
+              "src": "548:3:3",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3521,26 +3521,26 @@
           },
           {
             "body": {
-              "id": 1012,
+              "id": 836,
               "nodeType": "Block",
-              "src": "579:35:4",
+              "src": "579:35:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1010,
+                    "id": 834,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1007,
+                      "id": 831,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "589:5:4",
+                      "referencedDeclaration": 11084,
+                      "src": "589:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3552,18 +3552,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 1008,
+                        "id": 832,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "597:3:4",
+                        "referencedDeclaration": 11599,
+                        "src": "597:3:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 1009,
+                      "id": 833,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3571,26 +3571,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "597:10:4",
+                      "src": "597:10:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "589:18:4",
+                    "src": "589:18:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 1011,
+                  "id": 835,
                   "nodeType": "ExpressionStatement",
-                  "src": "589:18:4"
+                  "src": "589:18:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1013,
+            "id": 837,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -3598,29 +3598,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1005,
+              "id": 829,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "569:2:4"
+              "src": "569:2:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1006,
+              "id": 830,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "579:0:4"
+              "src": "579:0:3"
             },
-            "scope": 1161,
-            "src": "558:56:4",
+            "scope": 985,
+            "src": "558:56:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1028,
+              "id": 852,
               "nodeType": "Block",
-              "src": "691:48:4",
+              "src": "691:48:3",
               "statements": [
                 {
                   "expression": {
@@ -3629,26 +3629,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1022,
+                        "id": 846,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 997,
-                        "src": "708:11:4",
+                        "referencedDeclaration": 821,
+                        "src": "708:11:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                           "typeString": "mapping(address => mapping(address => bool))"
                         }
                       },
-                      "id": 1024,
+                      "id": 848,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1023,
+                        "id": 847,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1015,
-                        "src": "720:4:4",
+                        "referencedDeclaration": 839,
+                        "src": "720:4:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3659,21 +3659,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "708:17:4",
+                      "src": "708:17:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                         "typeString": "mapping(address => bool)"
                       }
                     },
-                    "id": 1026,
+                    "id": 850,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 1025,
+                      "id": 849,
                       "name": "_whom",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1017,
-                      "src": "726:5:4",
+                      "referencedDeclaration": 841,
+                      "src": "726:5:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -3684,21 +3684,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "708:24:4",
+                    "src": "708:24:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 1021,
-                  "id": 1027,
+                  "functionReturnParameters": 845,
+                  "id": 851,
                   "nodeType": "Return",
-                  "src": "701:31:4"
+                  "src": "701:31:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1029,
+            "id": 853,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -3706,16 +3706,16 @@
             "name": "Check",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1018,
+              "id": 842,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1015,
+                  "id": 839,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "635:12:4",
+                  "scope": 853,
+                  "src": "635:12:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3723,10 +3723,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1014,
+                    "id": 838,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "635:7:4",
+                    "src": "635:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3737,11 +3737,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1017,
+                  "id": 841,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "649:13:4",
+                  "scope": 853,
+                  "src": "649:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3749,10 +3749,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1016,
+                    "id": 840,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "649:7:4",
+                    "src": "649:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3762,20 +3762,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "634:29:4"
+              "src": "634:29:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1021,
+              "id": 845,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1020,
+                  "id": 844,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1029,
-                  "src": "685:4:4",
+                  "scope": 853,
+                  "src": "685:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3783,10 +3783,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1019,
+                    "id": 843,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "685:4:4",
+                    "src": "685:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -3796,24 +3796,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "684:6:4"
+              "src": "684:6:3"
             },
-            "scope": 1161,
-            "src": "620:119:4",
+            "scope": 985,
+            "src": "620:119:3",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1055,
+              "id": 879,
               "nodeType": "Block",
-              "src": "822:113:4",
+              "src": "822:113:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1046,
+                    "id": 870,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3824,26 +3824,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1040,
+                          "id": 864,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "832:11:4",
+                          "referencedDeclaration": 821,
+                          "src": "832:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 1043,
+                        "id": 867,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 1041,
+                          "id": 865,
                           "name": "_who",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 1031,
-                          "src": "844:4:4",
+                          "referencedDeclaration": 855,
+                          "src": "844:4:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3854,21 +3854,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "832:17:4",
+                        "src": "832:17:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1044,
+                      "id": 868,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1042,
+                        "id": 866,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1033,
-                        "src": "850:5:4",
+                        "referencedDeclaration": 857,
+                        "src": "850:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3879,7 +3879,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "832:24:4",
+                      "src": "832:24:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -3890,14 +3890,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 1045,
+                      "id": 869,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "859:4:4",
+                      "src": "859:4:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -3905,15 +3905,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "832:31:4",
+                    "src": "832:31:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1047,
+                  "id": 871,
                   "nodeType": "ExpressionStatement",
-                  "src": "832:31:4"
+                  "src": "832:31:3"
                 },
                 {
                   "eventCall": {
@@ -3921,12 +3921,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 1049,
+                        "id": 873,
                         "name": "_who",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1031,
-                        "src": "895:4:4",
+                        "referencedDeclaration": 855,
+                        "src": "895:4:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3934,12 +3934,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1050,
+                        "id": 874,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1033,
-                        "src": "901:5:4",
+                        "referencedDeclaration": 857,
+                        "src": "901:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3957,18 +3957,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1048,
+                      "id": 872,
                       "name": "AddedToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 985,
-                      "src": "878:16:4",
+                      "referencedDeclaration": 809,
+                      "src": "878:16:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 1051,
+                    "id": 875,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3976,28 +3976,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "878:29:4",
+                    "src": "878:29:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1052,
+                  "id": 876,
                   "nodeType": "EmitStatement",
-                  "src": "873:34:4"
+                  "src": "873:34:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1053,
+                    "id": 877,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "924:4:4",
+                    "src": "924:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4005,52 +4005,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1039,
-                  "id": 1054,
+                  "functionReturnParameters": 863,
+                  "id": 878,
                   "nodeType": "Return",
-                  "src": "917:11:4"
+                  "src": "917:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1056,
+            "id": 880,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1036,
+                "id": 860,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1035,
+                  "id": 859,
                   "name": "OnlyMarket",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 979,
-                  "src": "796:10:4",
+                  "referencedDeclaration": 803,
+                  "src": "796:10:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "796:10:4"
+                "src": "796:10:3"
               }
             ],
             "name": "Add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1034,
+              "id": 858,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1031,
+                  "id": 855,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "758:12:4",
+                  "scope": 880,
+                  "src": "758:12:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4058,10 +4058,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1030,
+                    "id": 854,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "758:7:4",
+                    "src": "758:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4072,11 +4072,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 1033,
+                  "id": 857,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "772:13:4",
+                  "scope": 880,
+                  "src": "772:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4084,10 +4084,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1032,
+                    "id": 856,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:4",
+                    "src": "772:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4097,20 +4097,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "757:29:4"
+              "src": "757:29:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1039,
+              "id": 863,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1038,
+                  "id": 862,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1056,
-                  "src": "816:4:4",
+                  "scope": 880,
+                  "src": "816:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4118,10 +4118,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1037,
+                    "id": 861,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "816:4:4",
+                    "src": "816:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4131,19 +4131,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "815:6:4"
+              "src": "815:6:3"
             },
-            "scope": 1161,
-            "src": "745:190:4",
+            "scope": 985,
+            "src": "745:190:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "external"
           },
           {
             "body": {
-              "id": 1091,
+              "id": 915,
               "nodeType": "Block",
-              "src": "994:187:4",
+              "src": "994:187:3",
               "statements": [
                 {
                   "expression": {
@@ -4155,7 +4155,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1071,
+                        "id": 895,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4166,34 +4166,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 1064,
+                              "id": 888,
                               "name": "blacklisted",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 997,
-                              "src": "1012:11:4",
+                              "referencedDeclaration": 821,
+                              "src": "1012:11:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 1067,
+                            "id": 891,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 1065,
+                                "id": 889,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "1024:3:4",
+                                "referencedDeclaration": 11599,
+                                "src": "1024:3:3",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 1066,
+                              "id": 890,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4201,7 +4201,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "1024:10:4",
+                              "src": "1024:10:3",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4212,21 +4212,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1012:23:4",
+                            "src": "1012:23:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1069,
+                          "id": 893,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1068,
+                            "id": 892,
                             "name": "_whom",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1058,
-                            "src": "1036:5:4",
+                            "referencedDeclaration": 882,
+                            "src": "1036:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4237,7 +4237,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1012:30:4",
+                          "src": "1012:30:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4248,14 +4248,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 1070,
+                          "id": 894,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1046:4:4",
+                          "src": "1046:4:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -4263,7 +4263,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1012:38:4",
+                        "src": "1012:38:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4277,21 +4277,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1063,
+                      "id": 887,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1004:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1004:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1072,
+                    "id": 896,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4299,20 +4299,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1004:47:4",
+                    "src": "1004:47:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1073,
+                  "id": 897,
                   "nodeType": "ExpressionStatement",
-                  "src": "1004:47:4"
+                  "src": "1004:47:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1081,
+                    "id": 905,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4323,34 +4323,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 1074,
+                          "id": 898,
                           "name": "blacklisted",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 997,
-                          "src": "1061:11:4",
+                          "referencedDeclaration": 821,
+                          "src": "1061:11:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 1078,
+                        "id": 902,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 1075,
+                            "id": 899,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "1073:3:4",
+                            "referencedDeclaration": 11599,
+                            "src": "1073:3:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 1076,
+                          "id": 900,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4358,7 +4358,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1073:10:4",
+                          "src": "1073:10:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4369,21 +4369,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1061:23:4",
+                        "src": "1061:23:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1079,
+                      "id": 903,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1077,
+                        "id": 901,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1058,
-                        "src": "1085:5:4",
+                        "referencedDeclaration": 882,
+                        "src": "1085:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4394,7 +4394,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1061:30:4",
+                      "src": "1061:30:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4405,14 +4405,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 1080,
+                      "id": 904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1094:5:4",
+                      "src": "1094:5:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4420,15 +4420,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "1061:38:4",
+                    "src": "1061:38:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1082,
+                  "id": 906,
                   "nodeType": "ExpressionStatement",
-                  "src": "1061:38:4"
+                  "src": "1061:38:3"
                 },
                 {
                   "eventCall": {
@@ -4438,18 +4438,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 1084,
+                          "id": 908,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1135:3:4",
+                          "referencedDeclaration": 11599,
+                          "src": "1135:3:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 1085,
+                        "id": 909,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4457,7 +4457,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1135:10:4",
+                        "src": "1135:10:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4465,12 +4465,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 1086,
+                        "id": 910,
                         "name": "_whom",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1058,
-                        "src": "1147:5:4",
+                        "referencedDeclaration": 882,
+                        "src": "1147:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4488,18 +4488,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 1083,
+                      "id": 907,
                       "name": "RemovedFromBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 991,
-                      "src": "1114:20:4",
+                      "referencedDeclaration": 815,
+                      "src": "1114:20:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 1087,
+                    "id": 911,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4507,28 +4507,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1114:39:4",
+                    "src": "1114:39:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1088,
+                  "id": 912,
                   "nodeType": "EmitStatement",
-                  "src": "1109:44:4"
+                  "src": "1109:44:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1089,
+                    "id": 913,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1170:4:4",
+                    "src": "1170:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4536,15 +4536,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1062,
-                  "id": 1090,
+                  "functionReturnParameters": 886,
+                  "id": 914,
                   "nodeType": "Return",
-                  "src": "1163:11:4"
+                  "src": "1163:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1092,
+            "id": 916,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4552,16 +4552,16 @@
             "name": "Remove",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1059,
+              "id": 883,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1058,
+                  "id": 882,
                   "name": "_whom",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1092,
-                  "src": "957:13:4",
+                  "scope": 916,
+                  "src": "957:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4569,10 +4569,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1057,
+                    "id": 881,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "957:7:4",
+                    "src": "957:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4582,20 +4582,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "956:15:4"
+              "src": "956:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1062,
+              "id": 886,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1061,
+                  "id": 885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1092,
-                  "src": "988:4:4",
+                  "scope": 916,
+                  "src": "988:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4603,10 +4603,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1060,
+                    "id": 884,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "988:4:4",
+                    "src": "988:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4616,19 +4616,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "987:6:4"
+              "src": "987:6:3"
             },
-            "scope": 1161,
-            "src": "941:240:4",
+            "scope": 985,
+            "src": "941:240:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1117,
+              "id": 941,
               "nodeType": "Block",
-              "src": "1253:99:4",
+              "src": "1253:99:3",
               "statements": [
                 {
                   "expression": {
@@ -4640,7 +4640,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1106,
+                        "id": 930,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4649,26 +4649,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1102,
+                            "id": 926,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "1271:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "1271:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1104,
+                          "id": 928,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1103,
+                            "id": 927,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1094,
-                            "src": "1278:5:4",
+                            "referencedDeclaration": 918,
+                            "src": "1278:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4679,7 +4679,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1271:13:4",
+                          "src": "1271:13:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -4690,14 +4690,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 1105,
+                          "id": 929,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1288:5:4",
+                          "src": "1288:5:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -4705,7 +4705,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "1271:22:4",
+                        "src": "1271:22:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4719,21 +4719,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1101,
+                      "id": 925,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1263:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1263:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1107,
+                    "id": 931,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4741,20 +4741,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1263:31:4",
+                    "src": "1263:31:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1108,
+                  "id": 932,
                   "nodeType": "ExpressionStatement",
-                  "src": "1263:31:4"
+                  "src": "1263:31:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1113,
+                    "id": 937,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4763,26 +4763,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1109,
+                        "id": 933,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1001,
-                        "src": "1304:6:4",
+                        "referencedDeclaration": 825,
+                        "src": "1304:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1111,
+                      "id": 935,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1110,
+                        "id": 934,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1094,
-                        "src": "1311:5:4",
+                        "referencedDeclaration": 918,
+                        "src": "1311:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4793,7 +4793,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1304:13:4",
+                      "src": "1304:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4804,14 +4804,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 1112,
+                      "id": 936,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1320:4:4",
+                      "src": "1320:4:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4819,28 +4819,28 @@
                       },
                       "value": "true"
                     },
-                    "src": "1304:20:4",
+                    "src": "1304:20:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1114,
+                  "id": 938,
                   "nodeType": "ExpressionStatement",
-                  "src": "1304:20:4"
+                  "src": "1304:20:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1115,
+                    "id": 939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1341:4:4",
+                    "src": "1341:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4848,52 +4848,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1100,
-                  "id": 1116,
+                  "functionReturnParameters": 924,
+                  "id": 940,
                   "nodeType": "Return",
-                  "src": "1334:11:4"
+                  "src": "1334:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1118,
+            "id": 942,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1097,
+                "id": 921,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1096,
+                  "id": 920,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1228:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1228:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1228:9:4"
+                "src": "1228:9:3"
               }
             ],
             "name": "AddMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1095,
+              "id": 919,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1094,
+                  "id": 918,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1118,
-                  "src": "1206:13:4",
+                  "scope": 942,
+                  "src": "1206:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4901,10 +4901,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1093,
+                    "id": 917,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1206:7:4",
+                    "src": "1206:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4914,20 +4914,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1205:15:4"
+              "src": "1205:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1100,
+              "id": 924,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1099,
+                  "id": 923,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1118,
-                  "src": "1247:4:4",
+                  "scope": 942,
+                  "src": "1247:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4935,10 +4935,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1098,
+                    "id": 922,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1247:4:4",
+                    "src": "1247:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4948,19 +4948,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1246:6:4"
+              "src": "1246:6:3"
             },
-            "scope": 1161,
-            "src": "1187:165:4",
+            "scope": 985,
+            "src": "1187:165:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1143,
+              "id": 967,
               "nodeType": "Block",
-              "src": "1427:99:4",
+              "src": "1427:99:3",
               "statements": [
                 {
                   "expression": {
@@ -4972,7 +4972,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 1132,
+                        "id": 956,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4981,26 +4981,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 1128,
+                            "id": 952,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1001,
-                            "src": "1445:6:4",
+                            "referencedDeclaration": 825,
+                            "src": "1445:6:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 1130,
+                          "id": 954,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 1129,
+                            "id": 953,
                             "name": "_root",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 1120,
-                            "src": "1452:5:4",
+                            "referencedDeclaration": 944,
+                            "src": "1452:5:3",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5011,7 +5011,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1445:13:4",
+                          "src": "1445:13:3",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -5022,14 +5022,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 1131,
+                          "id": 955,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1462:4:4",
+                          "src": "1462:4:3",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -5037,7 +5037,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "1445:21:4",
+                        "src": "1445:21:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -5051,21 +5051,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 1127,
+                      "id": 951,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1437:7:4",
+                      "referencedDeclaration": 11602,
+                      "src": "1437:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 1133,
+                    "id": 957,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5073,20 +5073,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1437:30:4",
+                    "src": "1437:30:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 1134,
+                  "id": 958,
                   "nodeType": "ExpressionStatement",
-                  "src": "1437:30:4"
+                  "src": "1437:30:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1139,
+                    "id": 963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5095,26 +5095,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 1135,
+                        "id": 959,
                         "name": "master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1001,
-                        "src": "1477:6:4",
+                        "referencedDeclaration": 825,
+                        "src": "1477:6:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 1137,
+                      "id": 961,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 1136,
+                        "id": 960,
                         "name": "_root",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1120,
-                        "src": "1484:5:4",
+                        "referencedDeclaration": 944,
+                        "src": "1484:5:3",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5125,7 +5125,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1477:13:4",
+                      "src": "1477:13:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -5136,14 +5136,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 1138,
+                      "id": 962,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "1493:5:4",
+                      "src": "1493:5:3",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -5151,28 +5151,28 @@
                       },
                       "value": "false"
                     },
-                    "src": "1477:21:4",
+                    "src": "1477:21:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 1140,
+                  "id": 964,
                   "nodeType": "ExpressionStatement",
-                  "src": "1477:21:4"
+                  "src": "1477:21:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1141,
+                    "id": 965,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1515:4:4",
+                    "src": "1515:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5180,52 +5180,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1126,
-                  "id": 1142,
+                  "functionReturnParameters": 950,
+                  "id": 966,
                   "nodeType": "Return",
-                  "src": "1508:11:4"
+                  "src": "1508:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1144,
+            "id": 968,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1123,
+                "id": 947,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1122,
+                  "id": 946,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1402:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1402:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1402:9:4"
+                "src": "1402:9:3"
               }
             ],
             "name": "RemoveMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1121,
+              "id": 945,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1120,
+                  "id": 944,
                   "name": "_root",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1144,
-                  "src": "1380:13:4",
+                  "scope": 968,
+                  "src": "1380:13:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5233,10 +5233,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1119,
+                    "id": 943,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1380:7:4",
+                    "src": "1380:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5246,20 +5246,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1379:15:4"
+              "src": "1379:15:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1126,
+              "id": 950,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1125,
+                  "id": 949,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1144,
-                  "src": "1421:4:4",
+                  "scope": 968,
+                  "src": "1421:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5267,10 +5267,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1124,
+                    "id": 948,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1421:4:4",
+                    "src": "1421:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5280,36 +5280,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1420:6:4"
+              "src": "1420:6:3"
             },
-            "scope": 1161,
-            "src": "1358:168:4",
+            "scope": 985,
+            "src": "1358:168:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 1159,
+              "id": 983,
               "nodeType": "Block",
-              "src": "1607:54:4",
+              "src": "1607:54:3",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 1155,
+                    "id": 979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 1153,
+                      "id": 977,
                       "name": "market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1004,
-                      "src": "1617:6:4",
+                      "referencedDeclaration": 828,
+                      "src": "1617:6:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -5319,39 +5319,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 1154,
+                      "id": 978,
                       "name": "_market",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 1146,
-                      "src": "1626:7:4",
+                      "referencedDeclaration": 970,
+                      "src": "1626:7:3",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1617:16:4",
+                    "src": "1617:16:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 1156,
+                  "id": 980,
                   "nodeType": "ExpressionStatement",
-                  "src": "1617:16:4"
+                  "src": "1617:16:3"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 1157,
+                    "id": 981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1650:4:4",
+                    "src": "1650:4:3",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5359,52 +5359,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 1152,
-                  "id": 1158,
+                  "functionReturnParameters": 976,
+                  "id": 982,
                   "nodeType": "Return",
-                  "src": "1643:11:4"
+                  "src": "1643:11:3"
                 }
               ]
             },
             "documentation": null,
-            "id": 1160,
+            "id": 984,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 1149,
+                "id": 973,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 1148,
+                  "id": 972,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1582:9:4",
+                  "referencedDeclaration": 11114,
+                  "src": "1582:9:3",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1582:9:4"
+                "src": "1582:9:3"
               }
             ],
             "name": "SetMarketAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 1147,
+              "id": 971,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1146,
+                  "id": 970,
                   "name": "_market",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1160,
-                  "src": "1558:15:4",
+                  "scope": 984,
+                  "src": "1558:15:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5412,10 +5412,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 1145,
+                    "id": 969,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1558:7:4",
+                    "src": "1558:7:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5425,20 +5425,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1557:17:4"
+              "src": "1557:17:3"
             },
             "payable": false,
             "returnParameters": {
-              "id": 1152,
+              "id": 976,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 1151,
+                  "id": 975,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 1160,
-                  "src": "1601:4:4",
+                  "scope": 984,
+                  "src": "1601:4:3",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5446,10 +5446,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 1150,
+                    "id": 974,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1601:4:4",
+                    "src": "1601:4:3",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5459,20 +5459,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1600:6:4"
+              "src": "1600:6:3"
             },
-            "scope": 1161,
-            "src": "1532:129:4",
+            "scope": 985,
+            "src": "1532:129:3",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 1162,
-        "src": "89:1574:4"
+        "scope": 986,
+        "src": "89:1574:3"
       }
     ],
-    "src": "0:1664:4"
+    "src": "0:1664:3"
   },
   "compiler": {
     "name": "solc",
@@ -5546,10 +5546,10 @@
         }
       },
       "links": {},
-      "address": "0x082f19a4efcfc5e3ca83f498362be9696978c879",
-      "transactionHash": "0xb184e9c889d68cb4365dbb544271e267434e4547e50f1c7fe4377984ea384439"
+      "address": "0x5ad9210ae7ee705e78fdc5cfbd9412f7655fedf8",
+      "transactionHash": "0x4c4b34ec8bf7a43f4eed7fa683ac80e8afabeffebfbcecc2fa38392c1d738970"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.421Z"
+  "updatedAt": "2019-01-11T16:10:01.974Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/DevicesStorage.json b/blockchain/source/migration_artifacts/contracts/DevicesStorage.json
index b185ab8c8..93795916d 100644
--- a/blockchain/source/migration_artifacts/contracts/DevicesStorage.json
+++ b/blockchain/source/migration_artifacts/contracts/DevicesStorage.json
@@ -5420,10 +5420,10 @@
         }
       },
       "links": {},
-      "address": "0x0b8639ca4ae5d0d4c814c28c6161b133a18ad3d1",
-      "transactionHash": "0xbaacb354188e3aec06eca6174f51f43957f8cda4a73a5cb2bc65608f8b0f6909"
+      "address": "0x4951e7ca0bcaa0a8a0f169fd3d51e8aae29d5282",
+      "transactionHash": "0x693f993ef434d51115f0bcbd296a3b04a3750962c943aadbf71849fadf0a37d8"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-24T11:55:10.289Z"
+  "updatedAt": "2019-01-11T16:09:47.067Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ERC20.json b/blockchain/source/migration_artifacts/contracts/ERC20.json
index 3eb3c7f12..9dfd93464 100644
--- a/blockchain/source/migration_artifacts/contracts/ERC20.json
+++ b/blockchain/source/migration_artifacts/contracts/ERC20.json
@@ -185,14 +185,14 @@
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
     "exportedSymbols": {
       "ERC20": [
-        11021
+        11305
       ]
     },
-    "id": 11022,
+    "id": 11306,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10980,
+        "id": 11264,
         "literals": [
           "solidity",
           "^",
@@ -200,16 +200,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:18"
+        "src": "0:24:17"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 10981,
+        "id": 11265,
         "nodeType": "ImportDirective",
-        "scope": 11022,
-        "sourceUnit": 11054,
-        "src": "26:26:18",
+        "scope": 11306,
+        "sourceUnit": 11338,
+        "src": "26:26:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -219,31 +219,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10982,
+              "id": 11266,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11053,
-              "src": "162:10:18",
+              "referencedDeclaration": 11337,
+              "src": "162:10:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11337",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 10983,
+            "id": 11267,
             "nodeType": "InheritanceSpecifier",
-            "src": "162:10:18"
+            "src": "162:10:17"
           }
         ],
         "contractDependencies": [
-          11053
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20",
         "fullyImplemented": false,
-        "id": 11021,
+        "id": 11305,
         "linearizedBaseContracts": [
-          11021,
-          11053
+          11305,
+          11337
         ],
         "name": "ERC20",
         "nodeType": "ContractDefinition",
@@ -251,7 +251,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 10992,
+            "id": 11276,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -259,16 +259,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10988,
+              "id": 11272,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10985,
+                  "id": 11269,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "196:14:18",
+                  "scope": 11276,
+                  "src": "196:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -276,10 +276,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10984,
+                    "id": 11268,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "196:7:18",
+                    "src": "196:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -290,11 +290,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10987,
+                  "id": 11271,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "212:16:18",
+                  "scope": 11276,
+                  "src": "212:16:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -302,10 +302,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10986,
+                    "id": 11270,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "212:7:18",
+                    "src": "212:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -315,20 +315,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "195:34:18"
+              "src": "195:34:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10991,
+              "id": 11275,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10990,
+                  "id": 11274,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "255:7:18",
+                  "scope": 11276,
+                  "src": "255:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -336,10 +336,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10989,
+                    "id": 11273,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "255:7:18",
+                    "src": "255:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -349,10 +349,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "254:9:18"
+              "src": "254:9:17"
             },
-            "scope": 11021,
-            "src": "177:87:18",
+            "scope": 11305,
+            "src": "177:87:17",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -360,7 +360,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11003,
+            "id": 11287,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -368,16 +368,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10999,
+              "id": 11283,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10994,
+                  "id": 11278,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "290:13:18",
+                  "scope": 11287,
+                  "src": "290:13:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -385,10 +385,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10993,
+                    "id": 11277,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "290:7:18",
+                    "src": "290:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -399,11 +399,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10996,
+                  "id": 11280,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "305:11:18",
+                  "scope": 11287,
+                  "src": "305:11:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -411,10 +411,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10995,
+                    "id": 11279,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "305:7:18",
+                    "src": "305:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -425,11 +425,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10998,
+                  "id": 11282,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "318:14:18",
+                  "scope": 11287,
+                  "src": "318:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -437,10 +437,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10997,
+                    "id": 11281,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "318:7:18",
+                    "src": "318:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -450,20 +450,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "289:44:18"
+              "src": "289:44:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11002,
+              "id": 11286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11001,
+                  "id": 11285,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "354:4:18",
+                  "scope": 11287,
+                  "src": "354:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -471,10 +471,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11000,
+                    "id": 11284,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "354:4:18",
+                    "src": "354:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -484,10 +484,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "353:6:18"
+              "src": "353:6:17"
             },
-            "scope": 11021,
-            "src": "268:92:18",
+            "scope": 11305,
+            "src": "268:92:17",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -495,7 +495,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11012,
+            "id": 11296,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -503,16 +503,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11008,
+              "id": 11292,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11005,
+                  "id": 11289,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "381:16:18",
+                  "scope": 11296,
+                  "src": "381:16:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -520,10 +520,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11004,
+                    "id": 11288,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "381:7:18",
+                    "src": "381:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -534,11 +534,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11007,
+                  "id": 11291,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "399:14:18",
+                  "scope": 11296,
+                  "src": "399:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -546,10 +546,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11006,
+                    "id": 11290,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "399:7:18",
+                    "src": "399:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -559,20 +559,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "380:34:18"
+              "src": "380:34:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11011,
+              "id": 11295,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11010,
+                  "id": 11294,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "431:4:18",
+                  "scope": 11296,
+                  "src": "431:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -580,10 +580,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11009,
+                    "id": 11293,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "431:4:18",
+                    "src": "431:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -593,10 +593,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "430:6:18"
+              "src": "430:6:17"
             },
-            "scope": 11021,
-            "src": "364:73:18",
+            "scope": 11305,
+            "src": "364:73:17",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -604,21 +604,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 11020,
+            "id": 11304,
             "name": "Approval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 11019,
+              "id": 11303,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11014,
+                  "id": 11298,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "460:21:18",
+                  "scope": 11304,
+                  "src": "460:21:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -626,10 +626,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11013,
+                    "id": 11297,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "460:7:18",
+                    "src": "460:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -640,12 +640,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11016,
+                  "id": 11300,
                   "indexed": true,
                   "name": "spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "487:23:18",
+                  "scope": 11304,
+                  "src": "487:23:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -653,10 +653,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11015,
+                    "id": 11299,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "487:7:18",
+                    "src": "487:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -667,12 +667,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11018,
+                  "id": 11302,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "516:13:18",
+                  "scope": 11304,
+                  "src": "516:13:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -680,10 +680,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11017,
+                    "id": 11301,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "516:7:18",
+                    "src": "516:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -693,29 +693,29 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "454:79:18"
+              "src": "454:79:17"
             },
-            "src": "440:94:18"
+            "src": "440:94:17"
           }
         ],
-        "scope": 11022,
-        "src": "144:392:18"
+        "scope": 11306,
+        "src": "144:392:17"
       }
     ],
-    "src": "0:537:18"
+    "src": "0:537:17"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
     "exportedSymbols": {
       "ERC20": [
-        11021
+        11305
       ]
     },
-    "id": 11022,
+    "id": 11306,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10980,
+        "id": 11264,
         "literals": [
           "solidity",
           "^",
@@ -723,16 +723,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:18"
+        "src": "0:24:17"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
         "file": "./ERC20Basic.sol",
-        "id": 10981,
+        "id": 11265,
         "nodeType": "ImportDirective",
-        "scope": 11022,
-        "sourceUnit": 11054,
-        "src": "26:26:18",
+        "scope": 11306,
+        "sourceUnit": 11338,
+        "src": "26:26:17",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -742,31 +742,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10982,
+              "id": 11266,
               "name": "ERC20Basic",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11053,
-              "src": "162:10:18",
+              "referencedDeclaration": 11337,
+              "src": "162:10:17",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20Basic_$11053",
+                "typeIdentifier": "t_contract$_ERC20Basic_$11337",
                 "typeString": "contract ERC20Basic"
               }
             },
-            "id": 10983,
+            "id": 11267,
             "nodeType": "InheritanceSpecifier",
-            "src": "162:10:18"
+            "src": "162:10:17"
           }
         ],
         "contractDependencies": [
-          11053
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title ERC20 interface\n@dev see https://github.com/ethereum/EIPs/issues/20",
         "fullyImplemented": false,
-        "id": 11021,
+        "id": 11305,
         "linearizedBaseContracts": [
-          11021,
-          11053
+          11305,
+          11337
         ],
         "name": "ERC20",
         "nodeType": "ContractDefinition",
@@ -774,7 +774,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 10992,
+            "id": 11276,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -782,16 +782,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10988,
+              "id": 11272,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10985,
+                  "id": 11269,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "196:14:18",
+                  "scope": 11276,
+                  "src": "196:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -799,10 +799,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10984,
+                    "id": 11268,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "196:7:18",
+                    "src": "196:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -813,11 +813,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10987,
+                  "id": 11271,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "212:16:18",
+                  "scope": 11276,
+                  "src": "212:16:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -825,10 +825,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10986,
+                    "id": 11270,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "212:7:18",
+                    "src": "212:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -838,20 +838,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "195:34:18"
+              "src": "195:34:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10991,
+              "id": 11275,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10990,
+                  "id": 11274,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10992,
-                  "src": "255:7:18",
+                  "scope": 11276,
+                  "src": "255:7:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -859,10 +859,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10989,
+                    "id": 11273,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "255:7:18",
+                    "src": "255:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -872,10 +872,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "254:9:18"
+              "src": "254:9:17"
             },
-            "scope": 11021,
-            "src": "177:87:18",
+            "scope": 11305,
+            "src": "177:87:17",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -883,7 +883,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11003,
+            "id": 11287,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -891,16 +891,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10999,
+              "id": 11283,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10994,
+                  "id": 11278,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "290:13:18",
+                  "scope": 11287,
+                  "src": "290:13:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -908,10 +908,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10993,
+                    "id": 11277,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "290:7:18",
+                    "src": "290:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -922,11 +922,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10996,
+                  "id": 11280,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "305:11:18",
+                  "scope": 11287,
+                  "src": "305:11:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -934,10 +934,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10995,
+                    "id": 11279,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "305:7:18",
+                    "src": "305:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -948,11 +948,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10998,
+                  "id": 11282,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "318:14:18",
+                  "scope": 11287,
+                  "src": "318:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -960,10 +960,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10997,
+                    "id": 11281,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "318:7:18",
+                    "src": "318:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -973,20 +973,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "289:44:18"
+              "src": "289:44:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11002,
+              "id": 11286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11001,
+                  "id": 11285,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11003,
-                  "src": "354:4:18",
+                  "scope": 11287,
+                  "src": "354:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -994,10 +994,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11000,
+                    "id": 11284,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "354:4:18",
+                    "src": "354:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1007,10 +1007,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "353:6:18"
+              "src": "353:6:17"
             },
-            "scope": 11021,
-            "src": "268:92:18",
+            "scope": 11305,
+            "src": "268:92:17",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -1018,7 +1018,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11012,
+            "id": 11296,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1026,16 +1026,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11008,
+              "id": 11292,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11005,
+                  "id": 11289,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "381:16:18",
+                  "scope": 11296,
+                  "src": "381:16:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1043,10 +1043,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11004,
+                    "id": 11288,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "381:7:18",
+                    "src": "381:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1057,11 +1057,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11007,
+                  "id": 11291,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "399:14:18",
+                  "scope": 11296,
+                  "src": "399:14:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1069,10 +1069,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11006,
+                    "id": 11290,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "399:7:18",
+                    "src": "399:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1082,20 +1082,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "380:34:18"
+              "src": "380:34:17"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11011,
+              "id": 11295,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11010,
+                  "id": 11294,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11012,
-                  "src": "431:4:18",
+                  "scope": 11296,
+                  "src": "431:4:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1103,10 +1103,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11009,
+                    "id": 11293,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "431:4:18",
+                    "src": "431:4:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1116,10 +1116,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "430:6:18"
+              "src": "430:6:17"
             },
-            "scope": 11021,
-            "src": "364:73:18",
+            "scope": 11305,
+            "src": "364:73:17",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -1127,21 +1127,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 11020,
+            "id": 11304,
             "name": "Approval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 11019,
+              "id": 11303,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11014,
+                  "id": 11298,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "460:21:18",
+                  "scope": 11304,
+                  "src": "460:21:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1149,10 +1149,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11013,
+                    "id": 11297,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "460:7:18",
+                    "src": "460:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1163,12 +1163,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11016,
+                  "id": 11300,
                   "indexed": true,
                   "name": "spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "487:23:18",
+                  "scope": 11304,
+                  "src": "487:23:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1176,10 +1176,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11015,
+                    "id": 11299,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "487:7:18",
+                    "src": "487:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1190,12 +1190,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11018,
+                  "id": 11302,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11020,
-                  "src": "516:13:18",
+                  "scope": 11304,
+                  "src": "516:13:17",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1203,10 +1203,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11017,
+                    "id": 11301,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "516:7:18",
+                    "src": "516:7:17",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1216,16 +1216,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "454:79:18"
+              "src": "454:79:17"
             },
-            "src": "440:94:18"
+            "src": "440:94:17"
           }
         ],
-        "scope": 11022,
-        "src": "144:392:18"
+        "scope": 11306,
+        "src": "144:392:17"
       }
     ],
-    "src": "0:537:18"
+    "src": "0:537:17"
   },
   "compiler": {
     "name": "solc",
@@ -1233,5 +1233,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.946Z"
+  "updatedAt": "2019-01-11T15:59:13.115Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ERC20Basic.json b/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
index beca5eabf..66bba6b43 100644
--- a/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
+++ b/blockchain/source/migration_artifacts/contracts/ERC20Basic.json
@@ -90,14 +90,14 @@
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
     "exportedSymbols": {
       "ERC20Basic": [
-        11053
+        11337
       ]
     },
-    "id": 11054,
+    "id": 11338,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 11023,
+        "id": 11307,
         "literals": [
           "solidity",
           "^",
@@ -105,7 +105,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:19"
+        "src": "0:24:18"
       },
       {
         "baseContracts": [],
@@ -113,9 +113,9 @@
         "contractKind": "contract",
         "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179",
         "fullyImplemented": false,
-        "id": 11053,
+        "id": 11337,
         "linearizedBaseContracts": [
-          11053
+          11337
         ],
         "name": "ERC20Basic",
         "nodeType": "ContractDefinition",
@@ -123,7 +123,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11028,
+            "id": 11312,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -131,23 +131,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11024,
+              "id": 11308,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "194:2:19"
+              "src": "194:2:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11027,
+              "id": 11311,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11026,
+                  "id": 11310,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11028,
-                  "src": "218:7:19",
+                  "scope": 11312,
+                  "src": "218:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -155,10 +155,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11025,
+                    "id": 11309,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "218:7:19",
+                    "src": "218:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -168,10 +168,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "217:9:19"
+              "src": "217:9:18"
             },
-            "scope": 11053,
-            "src": "174:53:19",
+            "scope": 11337,
+            "src": "174:53:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -179,7 +179,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11035,
+            "id": 11319,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -187,16 +187,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11031,
+              "id": 11315,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11030,
+                  "id": 11314,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11035,
-                  "src": "249:12:19",
+                  "scope": 11319,
+                  "src": "249:12:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -204,10 +204,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11029,
+                    "id": 11313,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "249:7:19",
+                    "src": "249:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -217,20 +217,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "248:14:19"
+              "src": "248:14:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11034,
+              "id": 11318,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11033,
+                  "id": 11317,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11035,
-                  "src": "284:7:19",
+                  "scope": 11319,
+                  "src": "284:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -238,10 +238,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11032,
+                    "id": 11316,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "284:7:19",
+                    "src": "284:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -251,10 +251,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "283:9:19"
+              "src": "283:9:18"
             },
-            "scope": 11053,
-            "src": "230:63:19",
+            "scope": 11337,
+            "src": "230:63:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -262,7 +262,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11044,
+            "id": 11328,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -270,16 +270,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11040,
+              "id": 11324,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11037,
+                  "id": 11321,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "314:11:19",
+                  "scope": 11328,
+                  "src": "314:11:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -287,10 +287,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11036,
+                    "id": 11320,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "314:7:19",
+                    "src": "314:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -301,11 +301,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11039,
+                  "id": 11323,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "327:14:19",
+                  "scope": 11328,
+                  "src": "327:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -313,10 +313,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11038,
+                    "id": 11322,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "327:7:19",
+                    "src": "327:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -326,20 +326,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "313:29:19"
+              "src": "313:29:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11043,
+              "id": 11327,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11042,
+                  "id": 11326,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "359:4:19",
+                  "scope": 11328,
+                  "src": "359:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -347,10 +347,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11041,
+                    "id": 11325,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "359:4:19",
+                    "src": "359:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -360,10 +360,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "358:6:19"
+              "src": "358:6:18"
             },
-            "scope": 11053,
-            "src": "296:69:19",
+            "scope": 11337,
+            "src": "296:69:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -371,21 +371,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 11052,
+            "id": 11336,
             "name": "Transfer",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 11051,
+              "id": 11335,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11046,
+                  "id": 11330,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "383:20:19",
+                  "scope": 11336,
+                  "src": "383:20:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -393,10 +393,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11045,
+                    "id": 11329,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "383:7:19",
+                    "src": "383:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -407,12 +407,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11048,
+                  "id": 11332,
                   "indexed": true,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "405:18:19",
+                  "scope": 11336,
+                  "src": "405:18:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -420,10 +420,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11047,
+                    "id": 11331,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "405:7:19",
+                    "src": "405:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -434,12 +434,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11050,
+                  "id": 11334,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "425:13:19",
+                  "scope": 11336,
+                  "src": "425:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -447,10 +447,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11049,
+                    "id": 11333,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "425:7:19",
+                    "src": "425:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -460,29 +460,29 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "382:57:19"
+              "src": "382:57:18"
             },
-            "src": "368:72:19"
+            "src": "368:72:18"
           }
         ],
-        "scope": 11054,
-        "src": "150:292:19"
+        "scope": 11338,
+        "src": "150:292:18"
       }
     ],
-    "src": "0:443:19"
+    "src": "0:443:18"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20Basic.sol",
     "exportedSymbols": {
       "ERC20Basic": [
-        11053
+        11337
       ]
     },
-    "id": 11054,
+    "id": 11338,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 11023,
+        "id": 11307,
         "literals": [
           "solidity",
           "^",
@@ -490,7 +490,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:19"
+        "src": "0:24:18"
       },
       {
         "baseContracts": [],
@@ -498,9 +498,9 @@
         "contractKind": "contract",
         "documentation": "@title ERC20Basic\n@dev Simpler version of ERC20 interface\nSee https://github.com/ethereum/EIPs/issues/179",
         "fullyImplemented": false,
-        "id": 11053,
+        "id": 11337,
         "linearizedBaseContracts": [
-          11053
+          11337
         ],
         "name": "ERC20Basic",
         "nodeType": "ContractDefinition",
@@ -508,7 +508,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11028,
+            "id": 11312,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -516,23 +516,23 @@
             "name": "totalSupply",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11024,
+              "id": 11308,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "194:2:19"
+              "src": "194:2:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11027,
+              "id": 11311,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11026,
+                  "id": 11310,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11028,
-                  "src": "218:7:19",
+                  "scope": 11312,
+                  "src": "218:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -540,10 +540,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11025,
+                    "id": 11309,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "218:7:19",
+                    "src": "218:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -553,10 +553,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "217:9:19"
+              "src": "217:9:18"
             },
-            "scope": 11053,
-            "src": "174:53:19",
+            "scope": 11337,
+            "src": "174:53:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -564,7 +564,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11035,
+            "id": 11319,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -572,16 +572,16 @@
             "name": "balanceOf",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11031,
+              "id": 11315,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11030,
+                  "id": 11314,
                   "name": "_who",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11035,
-                  "src": "249:12:19",
+                  "scope": 11319,
+                  "src": "249:12:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -589,10 +589,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11029,
+                    "id": 11313,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "249:7:19",
+                    "src": "249:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -602,20 +602,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "248:14:19"
+              "src": "248:14:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11034,
+              "id": 11318,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11033,
+                  "id": 11317,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11035,
-                  "src": "284:7:19",
+                  "scope": 11319,
+                  "src": "284:7:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -623,10 +623,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11032,
+                    "id": 11316,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "284:7:19",
+                    "src": "284:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -636,10 +636,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "283:9:19"
+              "src": "283:9:18"
             },
-            "scope": 11053,
-            "src": "230:63:19",
+            "scope": 11337,
+            "src": "230:63:18",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
@@ -647,7 +647,7 @@
           {
             "body": null,
             "documentation": null,
-            "id": 11044,
+            "id": 11328,
             "implemented": false,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -655,16 +655,16 @@
             "name": "transfer",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11040,
+              "id": 11324,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11037,
+                  "id": 11321,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "314:11:19",
+                  "scope": 11328,
+                  "src": "314:11:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -672,10 +672,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11036,
+                    "id": 11320,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "314:7:19",
+                    "src": "314:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -686,11 +686,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11039,
+                  "id": 11323,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "327:14:19",
+                  "scope": 11328,
+                  "src": "327:14:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -698,10 +698,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11038,
+                    "id": 11322,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "327:7:19",
+                    "src": "327:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -711,20 +711,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "313:29:19"
+              "src": "313:29:18"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11043,
+              "id": 11327,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11042,
+                  "id": 11326,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11044,
-                  "src": "359:4:19",
+                  "scope": 11328,
+                  "src": "359:4:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -732,10 +732,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11041,
+                    "id": 11325,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "359:4:19",
+                    "src": "359:4:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -745,10 +745,10 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "358:6:19"
+              "src": "358:6:18"
             },
-            "scope": 11053,
-            "src": "296:69:19",
+            "scope": 11337,
+            "src": "296:69:18",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
@@ -756,21 +756,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 11052,
+            "id": 11336,
             "name": "Transfer",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 11051,
+              "id": 11335,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11046,
+                  "id": 11330,
                   "indexed": true,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "383:20:19",
+                  "scope": 11336,
+                  "src": "383:20:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -778,10 +778,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11045,
+                    "id": 11329,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "383:7:19",
+                    "src": "383:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -792,12 +792,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11048,
+                  "id": 11332,
                   "indexed": true,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "405:18:19",
+                  "scope": 11336,
+                  "src": "405:18:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -805,10 +805,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11047,
+                    "id": 11331,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "405:7:19",
+                    "src": "405:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -819,12 +819,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 11050,
+                  "id": 11334,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11052,
-                  "src": "425:13:19",
+                  "scope": 11336,
+                  "src": "425:13:18",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -832,10 +832,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11049,
+                    "id": 11333,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "425:7:19",
+                    "src": "425:7:18",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -845,16 +845,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "382:57:19"
+              "src": "382:57:18"
             },
-            "src": "368:72:19"
+            "src": "368:72:18"
           }
         ],
-        "scope": 11054,
-        "src": "150:292:19"
+        "scope": 11338,
+        "src": "150:292:18"
       }
     ],
-    "src": "0:443:19"
+    "src": "0:443:18"
   },
   "compiler": {
     "name": "solc",
@@ -862,5 +862,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.945Z"
+  "updatedAt": "2019-01-11T15:59:13.114Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Market.json b/blockchain/source/migration_artifacts/contracts/Market.json
index 08f9b3ac2..733e5b9d2 100644
--- a/blockchain/source/migration_artifacts/contracts/Market.json
+++ b/blockchain/source/migration_artifacts/contracts/Market.json
@@ -1084,24 +1084,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153ce83398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a0396871690831617905560028054968616968216969096179095556003805493851693861693909317909255600480549390911692909316919091179091556008919091556009556152fc806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a723058204c821cd8ec0d34125017488e569263a04876edb010a9b34000b9b29c0ab3f66a0029",
-  "deployedBytecode": "0x6080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613380565b34801561071a57600080fd5b506103a3613386565b34801561072f57600080fd5b506102946004356134c4565b34801561074757600080fd5b5061029460043560ff602435166134d9565b34801561076557600080fd5b50610294600160a060020a03600435811690602435166135fd565b34801561078c57600080fd5b50610294600160a060020a03600435166136bd565b3480156107ad57600080fd5b5061031b6136fa565b3480156107c257600080fd5b506107ce600435613700565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b61398d565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a509850608090950196509294508101928291850190849080828437509497506139939650505050505050565b3480156109c757600080fd5b50610294600435613d86565b3480156109df57600080fd5b50610294600160a060020a0360043516613de0565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e1d565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fe5565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec961504f565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e40565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5616565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134c4565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b183398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b183398151915291a26000868152600e60205260408120818155600101556112eb866134c4565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b18339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b183398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b183398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134c4565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b183398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b183398151915290600090a26000868152600e60205260408120818155600101556115c0866134c4565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b183398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5616565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fe5565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c001516001600080600102896101400151613993565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f61504f565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b183398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b183398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fe5565b6123e6614fe5565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b80156128d957506060860151600160a060020a031615806128d957506128c08760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e457600080fd5b6002875160028111156128f357fe5b146128fd57600080fd5b60018651600281111561290c57fe5b1461291657600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294090610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a457600080fd5b505af11580156129b8573d6000803e3d6000fd5b505050506040513d60208110156129ce57600080fd5b5051158015612a6a57506002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a3c57600080fd5b505af1158015612a50573d6000803e3d6000fd5b505050506040513d6020811015612a6657600080fd5b5051155b8015612b2c575060025460408088015190890151600160a060020a039092169163968f600c9190612a9a90610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612afe57600080fd5b505af1158015612b12573d6000803e3d6000fd5b505050506040513d6020811015612b2857600080fd5b5051155b8015612bc2575060025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9457600080fd5b505af1158015612ba8573d6000803e3d6000fd5b505050506040513d6020811015612bbe57600080fd5b5051155b8015612c5b5750600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c2d57600080fd5b505af1158015612c41573d6000803e3d6000fd5b505050506040513d6020811015612c5757600080fd5b5051155b8015612d0357506002546040880151600160a060020a039091169063968f600c90612c8590610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cd557600080fd5b505af1158015612ce9573d6000803e3d6000fd5b505050506040513d6020811015612cff57600080fd5b5051155b8015612d99575060025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d6b57600080fd5b505af1158015612d7f573d6000803e3d6000fd5b505050506040513d6020811015612d9557600080fd5b5051155b1515612da457600080fd5b60a080870151908801511115612db957600080fd5b608080870151908801511015612dce57600080fd5b8660e001516004811115612dde57fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e4b57600080fd5b505af1158015612e5f573d6000803e3d6000fd5b505050506040513d6020811015612e7557600080fd5b50516004811115612e8257fe5b1015612e8d57600080fd5b8560e001516004811115612e9d57fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f0a57600080fd5b505af1158015612f1e573d6000803e3d6000fd5b505050506040513d6020811015612f3457600080fd5b50516004811115612f4157fe5b1015612f4c57600080fd5b6009548760c00151511015612f6e57612f688760c00151613e63565b60c08801525b6009548660c00151511015612f9057612f8a8760c00151613e63565b60c08701525b600094505b8660c0015151851015612ff65760c0860151805186908110612fb357fe5b906020019060200201511580612fe0575060c0870151805186908110612fd557fe5b906020019060200201515b1515612feb57600080fd5b600190940193612f95565b60085487610140015151101561301b57613014876101400151613eed565b6101408801525b60085486610140015151101561304057613039866101400151613eed565b6101408701525b600094505b866101400151518510156130b65761014086015180518690811061306557fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561308c57fe5b6020908102909101015167ffffffffffffffff1610156130ab57600080fd5b600190940193613045565b6006546130ca90600163ffffffff613e5616565b60065560408701516130db90610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319557608086015161319290849063ffffffff613e5616565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322357fe5b81526020018281526020016000815260200142815250600b60006006548152602001908152602001600020600082015181600001908051906020019061326a92919061507b565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332157fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a0316331461339d57600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341157600080fd5b505af1158015613425573d6000803e3d6000fd5b505050506040513d602081101561343b57600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561348a57600080fd5b505af115801561349e573d6000803e3d6000fd5b505050506040513d60208110156134b457600080fd5b5050600054600160a060020a0316ff5b60006134cf82613f75565b5061228f82614668565b600060016000848152600b60205260409020600a015460ff1660028111156134fd57fe5b1461350757600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061354857506000838152600b6020526040902060020154600160a060020a031633145b8061356c57506000838152600b6020526040902060030154600160a060020a031633145b151561357757600080fd5b6000838152600b60205260409020600681015460089091015461359f9163ffffffff613e5616565b42116135cb576000838152600b6020526040902060020154600160a060020a031633146135cb57600080fd5b6135d58383614aaa565b6135de83613f75565b506135e883614c7f565b6135f183614d96565b50600190505b92915050565b6000805460a060020a900460ff161561361557600080fd5b81600160a060020a031661362884610c1e565b600160a060020a0316148015613658575033600160a060020a0384161480613658575033600160a060020a038316145b151561366357600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136d557600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b6000806000806000606060008060006060600061371b614fe5565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374757fe5b600281111561375257fe5b81528154602090910190610100900460ff16600281111561376f57fe5b600281111561377a57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561382c57602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116137fb5790505b5050509183525050600582015460209091019060ff16600481111561384d57fe5b600481111561385857fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390757602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138c25790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b157600080fd5b60018860048111156139bf57fe5b10156139ca57600080fd5b600954895111156139da57600080fd5b600854855111156139ea57600080fd5b600092505b8451831015613a38576780000000000000008584815181101515613a0f57fe5b6020908102909101015167ffffffffffffffff1610613a2d57600080fd5b6001909201916139ef565b6000915060018d6002811115613a4a57fe5b1415613b39578a1515613a6a57613a638a610e10614e61565b9150613a8f565b620151808b1015613a7f57613a638a8c614e61565b613a8c8a62015180614e61565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0257600080fd5b505af1158015613b16573d6000803e3d6000fd5b505050506040513d6020811015613b2c57600080fd5b50511515613b3957600080fd5b600554613b4d90600163ffffffff613e5616565b6005819055604080516101a08101909152909150808e6002811115613b6e57fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bb657fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c0d57fe5b021790555060208201518154829061ff001916610100836002811115613c2f57fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cb2916004840191602090910190615136565b5060e082015160058201805460ff19166001836004811115613cd057fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3291600784019160209091019061507b565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613d9e57600080fd5b6008548211613dac57600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613df857600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3457600080fd5b613e3d81614f25565b50565b6000908152600b60205260409020600601541590565b818101828110156135f757fe5b6060806000600954604051908082528060200260200182016040528015613e94578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613eb357fe5b906020019060200201518282815181101515613ecb57fe5b911515602092830290910190910152600101613e9c565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f1e578160200160208202803883390190505b509150600090505b8351811015613ee2578381815181101515613f3d57fe5b906020019060200201518282815181101515613f5557fe5b67ffffffffffffffff909216602092830290910190910152600101613f26565b6000613f7f6151d7565b600060016000858152600b60205260409020600a015460ff166002811115613fa357fe5b14613fad57600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613fee57506000848152600b6020526040902060020154600160a060020a031633145b8061401257506000848152600b6020526040902060030154600160a060020a031633145b151561401d57600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140b357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161406e5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414157fe5b600281111561414c57fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061417984613e40565b1580156141905750816101200151826101a0015110155b1561419e5760019250613ee6565b6141a784613e40565b1580156141b8575081610120015142115b80156141cd5750816101200151826101a00151105b15614203576141fc8260e001516141f7846101a00151856101200151614f9590919063ffffffff16565b614e61565b9050614226565b6142238260e001516141f7846101a0015142614f9590919063ffffffff16565b90505b81610160015181111561452f5761016082015161424a90829063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142b557600080fd5b505af11580156142c9573d6000803e3d6000fd5b505050506040513d60208110156142df57600080fd5b5051106143f7576001546040830151610160840151600160a060020a03909216916323b872dd9190309061431a90869063ffffffff614f9516565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561436e57600080fd5b505af1158015614382573d6000803e3d6000fd5b505050506040513d602081101561439857600080fd5b505115156143a557600080fd5b6143df6143c083610160015183614f9590919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5616565b6000858152600b60208190526040909120015561452f565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361443f84614c7f565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144a357600080fd5b505af11580156144b7573d6000803e3d6000fd5b505050506040513d60208110156144cd57600080fd5b505115156144da57600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145099163ffffffff613e5616565b6000858152600b602081905260408220600c810193909355919091015560019250613ee6565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561458d57600080fd5b505af11580156145a1573d6000803e3d6000fd5b505050506040513d60208110156145b757600080fd5b505115156145c457600080fd5b6000848152600b6020819052604090912001546145e7908263ffffffff614f9516565b6000858152600b6020819052604090912090810191909155600c0154614613908263ffffffff613e5616565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b6000806146736151d7565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561470957602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146c45790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479757fe5b60028111156147a257fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147cf85613e40565b1561480057600282610140015160028111156147e757fe5b14156147f65760019350614aa2565b610e10925061485b565b8161012001514211156148165760019350614aa2565b6101208201516201518090614831904263ffffffff614f9516565b10156148545761012082015161484d904263ffffffff614f9516565b925061485b565b6201518092505b6000858152600b60208190526040909120015460e083015161487d9085614e61565b1115614a9d576148b7600b6000878152602001908152602001600020600b01546148ab8460e0015186614e61565b9063ffffffff614f9516565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492757600080fd5b505af115801561493b573d6000803e3d6000fd5b505050506040513d602081101561495157600080fd5b505110614a425760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d057600080fd5b505af11580156149e4573d6000803e3d6000fd5b505050506040513d60208110156149fa57600080fd5b50511515614a0757600080fd5b6000858152600b602081905260409091200154614a2a908263ffffffff613e5616565b6000868152600b602081905260409091200155614a9d565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a8a85614c7f565b614a9385614d96565b5060019350614aa2565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614add57506000816002811115614adb57fe5b145b1515614ae857600080fd5b6001816002811115614af657fe5b1415614bb457600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8257600080fd5b505af1158015614b96573d6000803e3d6000fd5b505050506040513d6020811015614bac57600080fd5b50614c7b9050565b6002816002811115614bc257fe5b1415614c7b57600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c4e57600080fd5b505af1158015614c62573d6000803e3d6000fd5b505050506040513d6020811015614c7857600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca157fe5b1415614cac57613e3d565b60016000828152600b60205260409020600a015460ff166002811115614cce57fe5b14614cd857600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d1957506000818152600b6020526040902060010154600160a060020a031633145b80614d3d57506000818152600b6020526040902060030154600160a060020a031633145b1515614d4857600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e59576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e1a57600080fd5b505af1158015614e2e573d6000803e3d6000fd5b505050506040513d6020811015614e4457600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614eb757600080fd5b505af1158015614ecb573d6000803e3d6000fd5b505050506040513d6020811015614ee157600080fd5b50519050614f1d670de0b6b3a7640000614f1185614f05858963ffffffff614fa716565b9063ffffffff614fa716565b9063ffffffff614fd016565b949350505050565b600160a060020a0381161515614f3a57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa157fe5b50900390565b6000821515614fb8575060006135f7565b50818102818382811515614fc857fe5b04146135f757fe5b60008183811515614fdd57fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b828054828255906000526020600020906003016004900481019282156151265791602002820160005b838211156150f057835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150a4565b80156151245782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f0565b505b5061513292915061526d565b5090565b82805482825590600052602060002090601f016020900481019282156151cb5791602002820160005b8382111561519c57835183826101000a81548160ff021916908315150217905550926020019260010160208160000104928301926001030261515f565b80156151c95782816101000a81549060ff021916905560010160208160000104928301926001030261519c565b505b50615132929150615292565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525257fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513257805467ffffffffffffffff19168155600101615273565b610c9091905b8082111561513257805460ff1916815560010161529856004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a723058204c821cd8ec0d34125017488e569263a04876edb010a9b34000b9b29c0ab3f66a0029",
-  "sourceMap": "254:26781:7:-;;;268:5:14;247:26;;-1:-1:-1;;;;;;247:26:14;;;2700:21:7;;;;2728:19;;;;2754:23;;3290:401;5:2:-1;;;;30:1;27;20:12;5:2;3290:401:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;;;3448:19:7;;-1:-1:-1;;;;;3448:19:7;;;;;;;;;3477:2;:26;;;;;;;;;;;;;;;3513:6;:27;;;;;;;;;;;;;;;3550:2;:38;;;;;;;;;;;;;;;;;3598:18;:40;;;;3648:16;:36;254:26781;;;;;;",
-  "deployedSourceMap": "254:26781:7:-;;;;;;;;;-1:-1:-1;;;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2955:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2955:34:7;;;;;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;-1:-1:-1;;;;;2955:34:7;-1:-1:-1;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;26168:209;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26168:209:7;-1:-1:-1;;;;;26168:209:7;;;;;;;;;;;;;;;;;;;;;;;16399:344;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16399:344:7;-1:-1:-1;;;;;16399:344:7;;;;;19066:249;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19066:249:7;-1:-1:-1;;;;;19066:249:7;;;;;;;;;-1:-1:-1;;;;;19066:249:7;;;;;;;;;;;;;;20076:102;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20076:102:7;;;;;;;;;;;;;;;;;;;;17797:251;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17797:251:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10614:4087;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10614:4087:7;;;;;;;;;838:92:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;;;18559:501:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18559:501:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18054:499:7;;;;;;;;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;-1:-1:-1;;;;;18054:499:7;-1:-1:-1;;;;;18054:499:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;18054:499:7;;;;;;;;;;;;;;;;;;;;;;;247:26:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;19321:457:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19321:457:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;19876:89;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19876:89:7;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;5842:878:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5842:878:7;;;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;26643:246:7;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26643:246:7;;;;;5405:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5405:431:7;;;;;14707:1291;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;14707:1291:7;;;;;16036:357;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16036:357:7;-1:-1:-1;;;;;16036:357:7;;;;;2912:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;-1:-1:-1;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2912:36:7;-1:-1:-1;;;;;;2912:36:7;6749:3046;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6749:3046:7;;;;;;;19971:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19971:99:7;;;;26895:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26895:138:7;;;;10462:146;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10462:146:7;;;;;9801:655;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;9801:655:7;;;;;;;;;16749:300;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16749:300:7;-1:-1:-1;;;;;16749:300:7;;;;;;;;;;26025:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26025:137:7;-1:-1:-1;;;;;26025:137:7;;;;;20184:98;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20184:98:7;;;;17071:719;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17071:719:7;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17071:719:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;19784:86;;8:9:-1;5:2;;;30:1;27;20:12;5:2;19784:86:7;;;;3738:1661;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3738:1661:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3738:1661:7;;;;;;;;;-1:-1:-1;3738:1661:7;-1:-1:-1;3738:1661:7;;;;;-1:-1:-1;3738:1661:7;;-1:-1:-1;3738:1661:7;;;;;;;;;;;;;;-1:-1:-1;3738:1661:7;;-1:-1:-1;3738:1661:7;;-1:-1:-1;;;;;;;3738:1661:7;26383:254;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26383:254:7;;;;;25870:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;25870:149:7;-1:-1:-1;;;;;25870:149:7;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2955:34:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;26168:209::-;26240:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26274:10:7;-1:-1:-1;;;;;26264:37:7;;:39;;;;;-1:-1:-1;;;26264:39:7;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26264:39:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26264:39:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26264:39:7;:44;;26256:53;;;;;;-1:-1:-1;26319:6:7;:30;;-1:-1:-1;;;;;;26319:30:7;-1:-1:-1;;;;;26319:30:7;;;;;-1:-1:-1;731:1:16;26168:209:7;;;:::o;16399:344::-;16469:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16507:10:7;16493:25;;;;:13;:25;;;;;;;;-1:-1:-1;;;;;16493:34:7;;;;;;;;;;;;:42;;:34;:42;16485:51;;;;;;-1:-1:-1;;;;;16546:17:7;;;;;;:8;:17;;;;;;;;:30;;-1:-1:-1;;;;;;16546:30:7;16566:10;16546:30;;;;;;16586:20;;;:8;:20;;;;;:27;;-1:-1:-1;;16586:27:7;;;16546:30;16586:27;;;;16630:13;:25;;;;;:34;;;;;;;;;16623:41;;;;;;;;16679:36;16566:10;;16546:17;16679:36;;;-1:-1:-1;16732:4:7;16399:344;;;:::o;19066:249::-;-1:-1:-1;;;;;19153:17:7;;;19123:14;19153:17;;;:8;:17;;;;;;19123:14;;19153:17;:24;;:56;;-1:-1:-1;;;;;;19181:28:7;;;:17;;;;:8;:17;;;;;;;;;:28;19153:56;19149:160;;;-1:-1:-1;19234:7:7;19149:160;;;-1:-1:-1;;;;;;19281:17:7;;;;;;;:8;:17;;;;;;;;19066:249::o;20076:102::-;20153:18;;20076:102;;:::o;17797:251::-;17869:23;17902:11;17929:18;;:::i;:::-;17950:15;;;;:6;:15;;;;;;;17929:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17929:36:7;;;-1:-1:-1;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17929:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17992:5;:17;;;18019:5;:12;;;17975:66;;;;17797:251;;;;:::o;10614:4087::-;10705:20;11075:21;11729:36;;:::i;:::-;10759:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10759:24:7;10745:10;:38;;:78;;-1:-1:-1;10801:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10801:22:7;10787:10;:36;10745:78;:120;;;-1:-1:-1;10841:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10841:24:7;10827:10;:38;10745:120;10737:129;;;;;;;;10908:26;10884:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;10876:59;;;;;;10950:14;10957:6;10950;:14::i;:::-;10946:70;;;10988:16;;10980:25;;;;;;11043:14;;:21;;11062:1;11043:21;:18;:21;:::i;:::-;11026:14;:38;11125:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11125:24:7;11111:10;:38;11107:166;;;11179:19;11165:33;;11107:166;;;11243:19;11229:33;;11107:166;11310:88;;;;;;;;;11324:6;11310:88;;;;11332:11;11310:88;;;;;;;;;;;;;;;;;;;;;;;;11368:29;11310:88;;11292:14;;11283:24;;;;:8;:24;;;;;;;;:115;;;;;;;;;;;;;;;;-1:-1:-1;;11283:115:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;11434:14:7;;11413:36;;11434:14;;-1:-1:-1;11413:36:7;;;;;11479:19;11464:11;:34;;;;;;;;;11460:1719;;;11544:22;;;;:14;:22;;;;;11567:1;11544:25;;11519:51;;-1:-1:-1;;;;;;;;;;;11519:51:7;;;;11584:35;11593:22;;;:14;:22;;;;;;;;11616:1;11593:25;;;;;11584:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;11584:75:7;11629:30;11584:75;;;;;;11701:14;;11673:42;;;11777:25;;11768:35;;;;;;11729:74;;;;;;;;;;;;;;;;;;11768:35;11729:74;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;11837:13:7;;;;:5;:13;;;;;:22;;;11729:74;;-1:-1:-1;11822:37:7;;:71;;;;-1:-1:-1;11874:13:7;;;;:5;:13;;;;;:19;;;11863:30;;11822:71;11818:1135;;;11922:14;;11913:24;;;;:8;:24;;;;;11947:30;11913:31;;;:64;;-1:-1:-1;;11913:64:7;;;;;;11995:12;12000:6;11995:4;:12::i;:::-;-1:-1:-1;12025:13:7;;;;:5;:13;;;;;;;;:19;;:30;;;12073:14;:22;;;;;12096:1;12073:25;:29;12150:14;;12125:40;;-1:-1:-1;;;;;;;;;;;12125:40:7;;;;11818:1135;;;12216:29;12190:15;:22;;;:55;;;;;;;;;:98;;;;;12277:11;12249:15;:24;;;:39;;12190:98;:135;;;;;12317:8;12292:15;:21;;;:33;;12190:135;12186:767;;;12354:14;;12345:24;;;;:8;:24;;;;;;;;12379:30;12345:31;;;:64;;-1:-1:-1;;12345:64:7;;;;;;;;12436:22;;;:14;:22;;;;;;:25;;12427:35;;;;;;;;:42;;:75;;;;;;;;;;12550:22;;;;;;:25;;12525:51;;12550:25;;-1:-1:-1;;;;;;;;;;;12525:51:7;;12622:1;12594:22;;;:14;:22;;;;;:29;;;12664:1;12641:25;:29;12688:12;12594:22;12688:4;:12::i;:::-;-1:-1:-1;12740:21:7;;;;;12718:13;;;;:5;:13;;;;;:19;;;;:43;;;;12779:22;;:36;;;12863:14;;12838:40;;-1:-1:-1;;;;;;;;;;;12838:40:7;12718:13;12838:40;12186:767;;;12924:14;;12917:21;;;;12186:767;12967:35;12976:22;;;:14;:22;;;;;;;;12999:1;12976:25;;;12967:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;12967:75:7;13012:30;12967:75;;;13086:22;;;;;;;:25;;13061:51;;13086:25;;-1:-1:-1;;;;;;;;;;;13061:51:7;;13154:14;;13126:22;;;;:14;:22;;;;;13149:1;13126:25;:42;11460:1719;13208:19;13193:11;:34;;;;;;;;;13189:1389;;;13273:22;;;;:14;:22;;;;;:25;;13248:51;;-1:-1:-1;;;;;;;;;;;13248:51:7;;;;13313:35;13322:22;;;:14;:22;;;;;;;;:25;;13313:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;13313:75:7;13358:30;13313:75;;;;;;13430:14;;13402:42;;-1:-1:-1;13485:25:7;;;;13476:35;;;;;;13458:53;;;;;;;;;;;;;;;;;;13476:35;;13458:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;13545:13:7;;;;:5;:13;;;;;:22;;;13458:53;;-1:-1:-1;13530:37:7;;:71;;;;-1:-1:-1;13582:13:7;;;;:5;:13;;;;;:19;;;13571:30;;13530:71;13526:1042;;;13630:14;;13621:24;;;;:8;:24;;;;;13655:30;13621:31;;;:64;;-1:-1:-1;;13621:64:7;;;;;;13703:12;13708:6;13703:4;:12::i;:::-;-1:-1:-1;13733:13:7;;;;:5;:13;;;;;;;;:19;;:30;;;13781:14;:22;;;;;13733:13;13781:25;:29;13858:14;;13833:40;;-1:-1:-1;;;;;;;;;;;13833:40:7;;;;13526:1042;;;13924:29;13898:15;:22;;;:55;;;;;;;;;:98;;;;;13985:11;13957:15;:24;;;:39;;13898:98;:135;;;;;14025:8;14000:15;:21;;;:33;;13898:135;13894:674;;;14062:14;;14053:24;;;;:8;:24;;;;;14087:30;14053:31;;;:64;;-1:-1:-1;;14053:64:7;;14087:30;14053:64;;;;-1:-1:-1;14165:22:7;;;;:14;:22;;;;;14188:1;14165:25;;14140:51;;-1:-1:-1;;;;;;;;;;;14140:51:7;;;;14237:1;14209:22;;;:14;:22;;;;;:29;;;14279:1;14256:25;:29;14303:12;14209:22;14303:4;:12::i;:::-;-1:-1:-1;14333:13:7;;;;:5;:13;;;;;;:19;;;;:30;;;14406:24;;;;14381:22;;;;:49;;;;14478:14;14453:40;;14478:14;;-1:-1:-1;;;;;;;;;;;14453:40:7;;13894:674;14640:13;;;;:5;:13;;;;;:22;;;;14612:23;;;;;:51;;;:27;:51;:::i;:::-;14588:13;;;;:5;:13;;;;;:21;;:75;14680:14;;;-1:-1:-1;10614:4087:7;;;;;;;;:::o;838:92:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;-1:-1:-1;;;568:6:14;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;18559:501:7:-;18629:13;18824;;;:5;:13;;;;;;;;:22;;;;18856:19;;;;18885:21;;;;18916:20;;;;18946:28;;;;18984:25;;;;19019:24;;;;;18824:22;;18856:19;;18885:21;;18916:20;;;;;18946:28;;18559:501::o;18054:499::-;18151:18;18320:13;;;:5;:13;;;;;;;;18354:24;;;;18388;;;;18422:22;;;;18454:19;;;;18483;;;;18512:23;;;;18303:243;;;;;;;;;;;;;;;;;18122:19;;18151:18;;;;;;;;;;;18320:13;;-1:-1:-1;;;;;18354:24:7;;;;18388;;;;18422:22;;;;;18454:19;;18483;;18303:243;18320:13;;18303:243;;18320:13;18303:243;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18054:499;;;;;;;;;:::o;247:26:14:-;;;-1:-1:-1;;;247:26:14;;;;;:::o;19321:457:7:-;19407:11;19555:25;;;:8;:25;;;;;:32;;19597:37;;;;19644:31;;;;19685:34;;;;19729:32;;;;;19555;;19597:37;;;;;19644:31;;19685:34;;19729:32;;;;19321:457::o;19876:89::-;19946:12;;19876:89;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;;;;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;-1:-1:-1;;;720:13:14;;;744:7;;;;720:6;744:7;666:90::o;5842:878:7:-;5924:16;;:::i;:::-;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;5943:13:7;;;;:6;:13;;;;;;;5924:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:7;;;-1:-1:-1;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5924:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;5924:32:7;;;-1:-1:-1;;5924:32:7;;;;;;;;;;;;;;;;;;;-1:-1:-1;5991:19:7;5974:13;;:36;;;;;;;;;5966:45;;;;;;6048:24;6029:3;:15;;;:43;;;;;;;;;6021:52;;;;;;6092:12;;;;:30;-1:-1:-1;6092:30:7;6084:39;;;;;;6175:3;:17;;;6141:51;;;;;;;;:2;;;:30;;;;;;6160:10;6141:30;;;;;;;;-1:-1:-1;;;;;6141:2:7;;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;6141:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6141:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6141:30:7;:51;;;;;;;;;;6133:60;;;;;;6211:2;;6242:10;;;;-1:-1:-1;;;;;6211:2:7;;;;:8;;6220:10;;6232:21;;:9;:21::i;:::-;6211:43;;;;;-1:-1:-1;;;6211:43:7;;;;;;;-1:-1:-1;;;;;6211:43:7;-1:-1:-1;;;;;6211:43:7;;;;;;-1:-1:-1;;;;;6211:43:7;-1:-1:-1;;;;;6211:43:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6211:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6211:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6211:43:7;:52;;;:97;;-1:-1:-1;6267:2:7;;6276:10;;;;;6267:32;;-1:-1:-1;;;;;6267:32:7;;-1:-1:-1;;;;;6267:32:7;;;;;;;6288:10;6267:32;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;6267:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6267:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6267:32:7;:41;6211:97;6203:106;;;;;;;;6327:2;;;6336:13;;;6327:35;;;-1:-1:-1;;;;;6327:35:7;;-1:-1:-1;;;;;6327:35:7;;;;;;;6351:10;6327:35;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;6327:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6327:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6327:35:7;:44;6319:53;;;;;;6383:285;6407:19;6440:21;6450:3;:10;;;6440:9;:21::i;:::-;6475:14;6503:3;:9;;;6526:3;:12;;;6552:39;6613:1;6637;6629:10;;6653:3;:14;;;6383:10;:285::i;:::-;;6679:34;6688:5;6695:17;:15;:17::i;:::-;6679:8;:34::i;:::-;5842:878;;;:::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;26643:246:7:-;26717:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26756:16:7;;26741:31;;26733:40;;;;;;26788:32;;26807:12;;26788:32;;;;;-1:-1:-1;26830:16:7;:31;26878:4;;26643:246::o;5405:431::-;5490:12;;5456:4;;5479:23;;;5471:32;;;;;;5552:24;5521:15;;;;:6;:15;;;;;:27;;;;;;:55;;;;;;;;;5513:64;;;;;;5595:15;;;;:6;:15;;;;;:22;;;;-1:-1:-1;;;;;5595:22:7;5621:10;5595:36;5587:45;;;;;;5651:5;;;5678:15;;;:6;:15;;;;;;;;:25;;;5651:53;;-1:-1:-1;;;;;5651:53:7;;5666:10;5651:53;;;;;;;;;;;;;-1:-1:-1;;;;;5651:5:7;;;;:14;;:53;;;;;5678:15;5651:53;;;;;;;:5;:53;;;5:2:-1;;;;30:1;27;20:12;5:2;5651:53:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5651:53:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5651:53:7;5643:62;;;;;;;;5715:15;;;;:6;:15;;;;;;:56;;-1:-1:-1;;5715:56:7;;;;;5787:21;5715:15;;5787:21;;;-1:-1:-1;5825:4:7;5405:431;;;:::o;14707:1291::-;14774:4;14790:28;;:::i;:::-;14821:25;;;;:8;:25;;;;;;;;;14790:56;;;;;;;;;;;;;;;;14821:25;;14790:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;14884:14:7;;14878:21;;;;:5;:21;;;;;:32;;;14884:14;;-1:-1:-1;;;;;;14878:32:7;14864:10;:46;;:94;;-1:-1:-1;14934:14:7;;14928:21;;;;:5;:21;;;;;:30;;;-1:-1:-1;;;;;14928:30:7;14914:10;:44;14864:94;:144;;;-1:-1:-1;14982:14:7;;14976:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;14976:32:7;14962:10;:46;14864:144;14856:153;;;;;;;;15045:30;15027:7;:14;;;:48;;;;;;;;;;15019:57;;;;;;15114:19;15091:7;:19;;;:42;;;;;;;;;15087:437;;;15173:14;;15167:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15167:32:7;15153:10;:46;15149:254;;;15219:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15219:65:7;15254:30;15219:65;;;15149:254;;;15323:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15323:65:7;15358:30;15323:65;;;15149:254;15431:14;;15452:1;15416:30;;;:14;:30;;;;;;:37;;;15472:41;15497:15;;-1:-1:-1;;;;;;;;;;;15472:41:7;;15087:437;15561:19;15538:7;:19;;;:42;;;;;;;;;15534:437;;;15620:14;;15614:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15614:32:7;15600:10;:46;15596:254;;;15666:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15666:65:7;15701:30;15666:65;;;15596:254;;;15770:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15770:65:7;15805:30;15770:65;;;15596:254;15878:14;;15899:1;15863:30;;;:14;:30;;;;;15894:1;15863:33;:37;15919:41;;15944:15;;-1:-1:-1;;;;;;;;;;;15919:41:7;;;;15534:437;-1:-1:-1;15987:4:7;;14707:1291;-1:-1:-1;;14707:1291:7:o;16036:357::-;16107:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16156:10:7;16131:21;16156:10;16131:9;:21::i;:::-;-1:-1:-1;;;;;16131:35:7;;16123:44;;;;;;16194:10;16185:20;;;;:8;:20;;;;;;;;:29;16177:38;;;;;;16255:7;-1:-1:-1;;;;;16233:29:7;:18;16243:7;16233:9;:18::i;:::-;-1:-1:-1;;;;;16233:29:7;;16225:38;;;;;;-1:-1:-1;;;;;16273:22:7;;;;;;:13;:22;;;;;;;;16296:10;16273:34;;;;;;;;:41;;-1:-1:-1;;16273:41:7;16310:4;16273:41;;;16329:36;16296:10;;16329:36;;;-1:-1:-1;16382:4:7;16036:357;;;:::o;2912:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:7;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6749:3046::-;6824:16;;:::i;:::-;6867;;:::i;:::-;8259:6;416::14;;8259::7;;;;;;;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;6843:14:7;;;;:6;:14;;;;;;;6824:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:7;;;-1:-1:-1;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6824:33:7;;;-1:-1:-1;;6824:33:7;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6886:14:7;;;:6;:14;;;;;;;6867:33;;;;;;;;;;6824;;-1:-1:-1;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:7;;;-1:-1:-1;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6867:33:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6867:33:7;;;-1:-1:-1;;6867:33:7;;;;;;;;;;;;;;;;;;;-1:-1:-1;6938:24:7;6919:3;:15;;;:43;;;;;;;;;:90;;;;-1:-1:-1;6985:24:7;6966:3;:15;;;:43;;;;;;;;;6919:90;6911:99;;;;;;;;7029:16;;;;-1:-1:-1;;;;;7029:23:7;;;:68;;;7076:21;7086:3;:10;;;7076:9;:21::i;:::-;-1:-1:-1;;;;;7056:41:7;:3;:16;;;-1:-1:-1;;;;;7056:41:7;;7029:68;7028:144;;;;-1:-1:-1;7103:16:7;;;;-1:-1:-1;;;;;7103:23:7;;;:68;;;7150:21;7160:3;:10;;;7150:9;:21::i;:::-;-1:-1:-1;;;;;7130:41:7;:3;:16;;;-1:-1:-1;;;;;7130:41:7;;7103:68;7020:153;;;;;;;;7208:19;7191:13;;:36;;;;;;;;;7183:45;;;;;;7263:19;7246:13;;:36;;;;;;;;;7238:45;;;;;;7314:2;;;7323:13;;;7348:10;;;;-1:-1:-1;;;;;7314:2:7;;;;:8;;7323:13;7338:21;;:9;:21::i;:::-;7314:46;;;;;-1:-1:-1;;;7314:46:7;;;;;;;-1:-1:-1;;;;;7314:46:7;-1:-1:-1;;;;;7314:46:7;;;;;;-1:-1:-1;;;;;7314:46:7;-1:-1:-1;;;;;7314:46:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7314:46:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7314:46:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7314:46:7;:55;;;:115;;-1:-1:-1;7385:2:7;;;7394:13;;;7409:10;;;;;7385:35;;-1:-1:-1;;;;;7385:35:7;;-1:-1:-1;;;;;7385:35:7;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7385:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7385:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7385:35:7;:44;7314:115;:183;;;;-1:-1:-1;7445:2:7;;7454:10;;;;;7476;;;;-1:-1:-1;;;;;7445:2:7;;;;:8;;7454:10;7466:21;;:9;:21::i;:::-;7445:43;;;;;-1:-1:-1;;;7445:43:7;;;;;;;-1:-1:-1;;;;;7445:43:7;-1:-1:-1;;;;;7445:43:7;;;;;;-1:-1:-1;;;;;7445:43:7;-1:-1:-1;;;;;7445:43:7;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7445:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7445:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7445:43:7;:52;7314:183;:240;;;;-1:-1:-1;7513:2:7;;7522:10;;;;;7534;;;;7513:32;;-1:-1:-1;;;;;7513:32:7;;-1:-1:-1;;;;;7513:32:7;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7513:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7513:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7513:32:7;:41;7314:240;:300;;;;-1:-1:-1;7570:2:7;;;7579:13;;;7594:10;;;;;7570:35;;-1:-1:-1;;;;;7570:35:7;;-1:-1:-1;;;;;7570:35:7;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7570:35:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7570:35:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7570:35:7;:44;7314:300;:368;;;;-1:-1:-1;7630:2:7;;7649:10;;;;-1:-1:-1;;;;;7630:2:7;;;;:8;;7639:21;;:9;:21::i;:::-;7662:10;;;;;7630:43;;-1:-1:-1;;;7630:43:7;;;;;;-1:-1:-1;;;;;7630:43:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;7630:43:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;7630:43:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7630:43:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7630:43:7;:52;7314:368;:425;;;;-1:-1:-1;7698:2:7;;7707:10;;;;;7719;;;;7698:32;;-1:-1:-1;;;;;7698:32:7;;-1:-1:-1;;;;;7698:32:7;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7698:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7698:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7698:32:7;:41;7314:425;7293:447;;;;;;;;7771:9;;;;;7758;;;;:22;;7750:31;;;;;;7815:12;;;;;7799;;;;:28;;7791:37;;;;;;7911:3;:17;;;7877:51;;;;;;;;:2;;;7896:10;;;;;7877:30;;;;;-1:-1:-1;;;;;7877:30:7;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7877:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7877:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7877:30:7;:51;;;;;;;;;;7869:60;;;;;;7981:3;:17;;;7947:51;;;;;;;;:2;;;7966:10;;;;;7947:30;;;;;-1:-1:-1;;;;;7947:30:7;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7947:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7947:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7947:30:7;:51;;;;;;;;;;7939:60;;;;;;8036:16;;8014:3;:12;;;:19;:38;8010:112;;;8083:28;8098:3;:12;;;8083:14;:28::i;:::-;8068:12;;;:43;8010:112;8158:16;;8136:3;:12;;;:19;:38;8132:112;;;8205:28;8220:3;:12;;;8205:14;:28::i;:::-;8190:12;;;:43;8132:112;8268:1;8259:10;;8254:254;8275:3;:12;;;:19;8271:1;:23;8254:254;;;8462:12;;;;:15;;8475:1;;8462:15;;;;;;;;;;;;;;8461:16;:35;;;-1:-1:-1;8481:12:7;;;;:15;;8494:1;;8481:15;;;;;;;;;;;;;;8461:35;8453:44;;;;;;;;8296:3;;;;;8254:254;;;8546:18;;8522:3;:14;;;:21;:42;8518:122;;;8597:32;8614:3;:14;;;8597:16;:32::i;:::-;8580:14;;;:49;8518:122;8678:18;;8654:3;:14;;;:21;:42;8650:122;;;8729:32;8746:3;:14;;;8729:16;:32::i;:::-;8712:14;;;:49;8650:122;8791:1;8787:5;;8782:116;8798:3;:14;;;:21;8794:1;:25;8782:116;;;8869:14;;;;:17;;8884:1;;8869:17;;;;;;;;;;;;;;8848:38;;:3;:14;;;8863:1;8848:17;;;;;;;;;;;;;;;;;;;:38;;;;8840:47;;;;;;8821:3;;;;;8782:116;;;8921:10;;:17;;8936:1;8921:17;:14;:17;:::i;:::-;8908:10;:30;8975:10;;;;8965:21;;:9;:21::i;:::-;8996:14;;;;:6;:14;;;;;;:55;;;-1:-1:-1;;8996:55:7;;;;;;;9061:14;;;;;;:55;;;;;;;;9150:10;;9126:21;;;;:34;;;9170:21;;:34;9220:20;8948:38;;-1:-1:-1;8996:14:7;;9220:20;;8996:14;9220:20;9255;;9268:6;;9255:20;;;;;9419:12;;;;9303:15;;-1:-1:-1;9343:1:7;;-1:-1:-1;9419:17:7;9415:85;;9476:12;;;;9462:27;;:9;;:27;:13;:27;:::i;:::-;9452:37;;9415:85;9531:3;:13;;;9509:35;;9574:177;;;;;;;;;9579:3;:14;;;9574:177;;;;9595:3;:10;;;-1:-1:-1;;;;;9574:177:7;;;;;9607:3;:10;;;-1:-1:-1;;;;;9574:177:7;;;;;9619:6;-1:-1:-1;;;;;9574:177:7;;;;;9627:6;9574:177;;;;9635:6;9574:177;;;;9643:3;:12;;;9574:177;;;;9657:3;:9;;;9574:177;;;;9668:9;9574:177;;;;9679:7;9574:177;;;;9688:26;9574:177;;;;;;;;;;;;9716:14;9574:177;;;;9732:1;9574:177;;;;9735:15;9574:177;;;9554:5;:17;9560:10;;9554:17;;;;;;;;;;;:197;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;9554:197:7;;;;;;;;;;-1:-1:-1;;;;;;9554:197:7;;;-1:-1:-1;;;;;9554:197:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;9554:197:7;;;;;;;;;;;;;;;;;;-1:-1:-1;9554:197:7;;;;;;;;;;;;;;;;;;;;;;;;;;9777:10;;9766:22;;;;-1:-1:-1;;9766:22:7;6749:3046;;;;;;;;;:::o;19971:99::-;20049:14;;19971:99;:::o;26895:138::-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26944:5:7;;;26959;;26966:30;;;;;;26990:4;26966:30;;;;;;-1:-1:-1;;;;;26944:5:7;;;;:14;;26959:5;;;26944;;26966:15;;:30;;;;;;;;;;;;;;;;26944:5;26966:30;;;5:2:-1;;;;30:1;27;20:12;5:2;26966:30:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26966:30:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26966:30:7;26944:53;;;-1:-1:-1;;;26944:53:7;;;;;;-1:-1:-1;;;;;26944:53:7;;;;;;;;;;;;;;;;;;;;26966:30;;26944:53;;;;;;;-1:-1:-1;26944:53:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;26944:53:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26944:53:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;27020:5:7;;-1:-1:-1;;;;;27020:5:7;27007:19;10462:146;10505:4;10520:20;10533:6;10520:12;:20::i;:::-;;10550:30;10573:6;10550:22;:30::i;9801:655::-;9878:4;9926:26;9902:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;9893:61;;;;;;9986:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;9986:24:7;9972:10;:38;;:80;;-1:-1:-1;10028:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10028:24:7;10014:10;:38;9972:80;:120;;;-1:-1:-1;10070:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10070:22:7;10056:10;:36;9972:120;9964:129;;;;;;;;10155:13;;;;:5;:13;;;;;:22;;;;10127:23;;;;;:51;;;:27;:51;:::i;:::-;10108:15;:70;10104:177;;10231:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10231:24:7;10259:10;10231:38;10223:47;;;;;;10290:35;10305:6;10313:11;10290:14;:35::i;:::-;10335:20;10348:6;10335:12;:20::i;:::-;;10365:25;10383:6;10365:17;:25::i;:::-;10400:28;10421:6;10400:20;:28::i;:::-;;10445:4;10438:11;;9801:655;;;;;:::o;16749:300::-;16835:4;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;16881:7:7;-1:-1:-1;;;;;16859:29:7;:18;16869:7;16859:9;:18::i;:::-;-1:-1:-1;;;;;16859:29:7;;:81;;;;-1:-1:-1;16893:10:7;-1:-1:-1;;;;;16893:21:7;;;;:46;;-1:-1:-1;16918:10:7;-1:-1:-1;;;;;16918:21:7;;;16893:46;16851:90;;;;;;;;-1:-1:-1;;;;;16958:17:7;;;;;;;:8;:17;;;;;;16951:24;;-1:-1:-1;;;;;;16951:24:7;;;16990:31;;;;;;;16958:17;16990:31;-1:-1:-1;17038:4:7;16749:300;;;;:::o;26025:137::-;26096:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;26112:2:7;:22;;-1:-1:-1;;;;;26112:22:7;;-1:-1:-1;;;;;;26112:22:7;;;;;;;26025:137;;;:::o;20184:98::-;20259:16;;20184:98;:::o;17071:719::-;17141:19;17170:14;17194:20;17224:13;17247:10;17267:15;17292:43;17345:17;17372:11;17393:19;17422:14;17452:18;;:::i;:::-;17473:15;;;;:6;:15;;;;;;;17452:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17452:36:7;;;-1:-1:-1;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17452:36:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17515:5;:15;;;17540:5;:12;;;17562:5;:18;;;17590:5;:14;;;17614:5;:11;;;17635:5;:14;;;17659:5;:19;;;17688:5;:15;;;17713:5;:9;;;17732:5;:16;;;17758:5;:15;;;17498:285;;;;;;;;;;;;;;;;;;;;;;;;;;;;17071:719;;;;;;;;;;;;;;:::o;19784:86::-;19853:10;;19784:86;:::o;3738:1661::-;4063:4;416:6:14;;4063:4:7;;;;;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;4105:39:7;4087:14;:57;;;;;;;;;;4079:66;;;;;;4183:16;;4163;;:36;;4155:45;;;;;;4240:18;;4218;;:40;;4210:49;;;;;;4284:1;4275:10;;4270:117;4291:11;:18;4287:1;:22;4270:117;;;2603:7;4338:11;4350:1;4338:14;;;;;;;;;;;;;;;;;;;:37;;;4330:46;;;;;;4311:3;;;;;4270:117;;;4414:1;;-1:-1:-1;4444:19:7;4430:10;:33;;;;;;;;;4426:463;;;4483:14;;4479:291;;;4529:33;4546:6;4554:7;4529:16;:33::i;:::-;4517:45;;4479:291;;;4599:6;4587:9;:18;4583:187;;;4637:35;4654:6;4662:9;4637:16;:35::i;4583:187::-;4723:32;4740:6;4748;4723:16;:32::i;:::-;4711:44;;4583:187;4830:5;;:47;;;;;;4849:10;4830:47;;;;4861:4;4830:47;;;;;;;;;;;;-1:-1:-1;;;;;4830:5:7;;;;:18;;:47;;;;;;;;;;;;;;;:5;;:47;;;5:2:-1;;;;30:1;27;20:12;5:2;4830:47:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4830:47:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4830:47:7;4822:56;;;;;;;;4914:12;;:19;;4931:1;4914:19;:16;:19;:::i;:::-;4899:12;:34;;;5002:330;;;;;;;;;4899:34;;-1:-1:-1;5002:330:7;5021:10;5002:330;;;;;;;;;;;;5045:24;5002:330;;;;5083:10;-1:-1:-1;;;;;5002:330:7;;;;;5107:16;-1:-1:-1;;;;;5002:330:7;;;;;5137:9;5002:330;;;;5160:6;5002:330;;;;5180:9;5002:330;;;;5203:14;5002:330;;;;;;;;;;-1:-1:-1;;;;;5002:330:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5002:330:7;;;;;;;4984:15;;;:6;:15;;;;;:348;;;;:15;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;-1:-1:-1;;4984:348:7;;-1:-1:-1;;;;;4984:348:7;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;-1:-1:-1;;;;;;4984:348:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:7;;;;;;;;;-1:-1:-1;;4984:348:7;;;;;;;;;;;;;;;-1:-1:-1;4984:348:7;;;;;;;;;;-1:-1:-1;;4984:348:7;-1:-1:-1;;;;;4984:348:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;4984:348:7;;;;;;;;;;;;;;;;;;5348:20;;5360:7;;5348:20;;-1:-1:-1;;5348:20:7;5385:7;3738:1661;-1:-1:-1;;;;;;;;;;;;3738:1661:7:o;26383:254::-;26459:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;26498:18:7;;26483:33;;26475:42;;;;;;26532:34;;26553:12;;26532:34;;;;;-1:-1:-1;26576:18:7;:33;26626:4;;26383:254::o;25870:149::-;25947:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;25963:2:7;:28;;-1:-1:-1;;;;;25963:28:7;;-1:-1:-1;;;;;;25963:28:7;;;;;;;25870:149;;;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;23965:108:7:-;24017:4;24039:13;;;:5;:13;;;;;:22;;;:27;;23965:108::o;1238:128:15:-;1319:7;;;1339;;;;1332:15;;;25576:272:7;25641:6;25659:22;25727:6;25695:16;;25684:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25684:28:7;;25659:53;;25736:1;25727:10;;25722:95;25743:9;:16;25739:1;:20;25722:95;;;25794:9;25804:1;25794:12;;;;;;;;;;;;;;;;;;25780:8;25789:1;25780:11;;;;;;;;;;:26;;;:11;;;;;;;;;;:26;25761:3;;25722:95;;;25833:8;25826:15;;25576:272;;;;;;:::o;25274:296::-;25345:8;25365:26;25441:6;25407:18;;25394:32;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25394:32:7;;25365:61;;25450:1;25441:10;;25436:101;25457:11;:18;25453:1;:22;25436:101;;;25512:11;25524:1;25512:14;;;;;;;;;;;;;;;;;;25496:10;25507:1;25496:13;;;;;;;;;;:30;;;;:13;;;;;;;;;;:30;25477:3;;25436:101;;20306:1975;20359:4;20582:16;;:::i;:::-;20625:15;20406:26;20382:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;20374:59;;;;;;20465:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20465:24:7;20451:10;:38;;:80;;-1:-1:-1;20507:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20507:24:7;20493:10;:38;20451:80;:120;;;-1:-1:-1;20549:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;20549:22:7;20535:10;:36;20451:120;20443:129;;;;;;;;20601:13;;;;:5;:13;;;;;;;;;20582:32;;;;;;;;;;;;;;;;;;;;;;;20601:13;;20582:32;;20601:13;;20582:32;;20601:13;20582:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;20582:32:7;;;-1:-1:-1;;20582:32:7;;;;-1:-1:-1;;;;;20582:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20656:14;20663:6;20656;:14::i;:::-;20655:15;:50;;;;;20693:4;:12;;;20674:4;:15;;;:31;;20655:50;20651:456;;;20786:4;20779:11;;;;20651:456;20812:14;20819:6;20812;:14::i;:::-;20811:15;:49;;;;;20848:4;:12;;;20830:15;:30;20811:49;:83;;;;;20882:4;:12;;;20864:4;:15;;;:30;20811:83;20807:300;;;20923:63;20940:4;:10;;;20952:33;20969:4;:15;;;20952:4;:12;;;:16;;:33;;;;:::i;:::-;20923:16;:63::i;:::-;20910:76;;20807:300;;;21030:66;21047:4;:10;;;21059:36;21079:4;:15;;;21059;:19;;:36;;;;:::i;21030:66::-;21017:79;;20807:300;21134:4;:19;;;21121:10;:32;21117:820;;;21224:19;;;;21209:35;;:10;;:35;:14;:35;:::i;:::-;21173:5;;21189:15;;;;;21173:32;;;;;-1:-1:-1;;;;;21173:32:7;;;;;;;;;:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;21173:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21173:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21173:32:7;:71;21169:758;;21272:5;;21291:15;;;;21329:19;;;;-1:-1:-1;;;;;21272:5:7;;;;:18;;21291:15;21308:4;;21314:35;;:10;;:35;:14;:35;:::i;:::-;21272:78;;;-1:-1:-1;;;21272:78:7;;;;;;-1:-1:-1;;;;;21272:78:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;21272:78:7;;;;5:2:-1;;;;30:1;27;20:12;5:2;21272:78:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21272:78:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21272:78:7;21264:87;;;;;;;;21400:69;21433:35;21448:4;:19;;;21433:10;:14;;:35;;;;:::i;:::-;21400:13;;;;:5;:13;;;;;;;;:28;;;:69;:32;:69;:::i;:::-;21369:13;;;;:5;:13;;;;;;;;:28;:100;21169:758;;;21528:13;;;;:5;:13;;;;;;;;:28;;;;21513:44;;21528:28;;21534:6;;21513:44;;21528:13;21513:44;21575:25;21593:6;21575:17;:25::i;:::-;21626:5;;21641:13;;;;21656:19;;;;21626:50;;;-1:-1:-1;;;;;21626:50:7;;-1:-1:-1;;;;;21626:50:7;;;;;;;;;;;;;;;:5;;;;;:14;;:50;;;;;;;;;;;;;;:5;;:50;;;5:2:-1;;;;30:1;27;20:12;5:2;21626:50:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21626:50:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21626:50:7;21618:59;;;;;;;;21695:13;;;;:5;:13;;;;;21722:15;21695:24;;;:42;21813:19;;;;21783:25;;;;;:50;;;:29;:50;:::i;:::-;21755:13;;;;:5;:13;;;;;;;:25;;;:78;;;;21851:28;;;;:32;-1:-1:-1;;;21901:11:7;;21169:758;21954:5;;21969:13;;;;21954:41;;;-1:-1:-1;;;;;21954:41:7;;-1:-1:-1;;;;;21954:41:7;;;;;;;;;;;;;;;:5;;;;;:14;;:41;;;;;;;;;;;;;;:5;;:41;;;5:2:-1;;;;30:1;27;20:12;5:2;21954:41:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21954:41:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21954:41:7;21946:50;;;;;;;;22037:13;;;;:5;:13;;;;;;;;:28;;:44;;22070:10;22037:44;:32;:44;:::i;:::-;22006:13;;;;:5;:13;;;;;;;;:28;;;:75;;;;22119:25;;;:41;;22149:10;22119:41;:29;:41;:::i;:::-;22091:13;;;;:5;:13;;;;;;:25;;;:69;;;;22197:15;22170:24;;;;:42;;;;22227:26;;22242:10;;22097:6;;22227:26;;22091:13;22227:26;-1:-1:-1;22270:4:7;;20306:1975;-1:-1:-1;;;20306:1975:7:o;22287:1383::-;22350:4;22366:15;22391:16;;:::i;:::-;23068:18;22410:13;;;:5;:13;;;;;;;;22391:32;;;;;;;;;;;;;;;;;;;;;;;22410:13;;22391:32;;22410:13;;22391:32;;;22410:13;22391:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;22391:32:7;;;-1:-1:-1;;22391:32:7;;;;-1:-1:-1;;;;;22391:32:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;22438:14;22445:6;22438;:14::i;:::-;22434:533;;;22487:24;22472:4;:11;;;:39;;;;;;;;;22468:89;;;22538:4;22531:11;;;;22468:89;22583:7;22570:20;;22434:533;;;22643:4;:12;;;22625:15;:30;22621:138;;;22740:4;22733:11;;;;22621:138;22776:12;;;;22812:6;;22776:33;;22793:15;22776:33;:16;:33;:::i;:::-;:42;22772:185;;;22851:12;;;;:33;;22868:15;22851:33;:16;:33;:::i;:::-;22838:46;;22772:185;;;22936:6;22923:19;;22772:185;23024:13;;;;:5;:13;;;;;;;;:28;;22998:10;;;;22981:40;;23010:10;22981:16;:40::i;:::-;:71;22977:666;;;23089:74;23134:5;:13;23140:6;23134:13;;;;;;;;;;;:28;;;23089:40;23106:4;:10;;;23118;23089:16;:40::i;:::-;:44;:74;:44;:74;:::i;:::-;23182:5;;23198:15;;;;;23182:32;;;;;-1:-1:-1;;;;;23182:32:7;;;;;;;;;23068:95;;-1:-1:-1;23068:95:7;;23182:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;23182:32:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23182:32:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23182:32:7;:49;23178:455;;23259:5;;23278:15;;;;;23259:56;;;;;-1:-1:-1;;;;;23259:56:7;;;;;;;23295:4;23259:56;;;;;;;;;;;;:5;;;:18;;:56;;;;;;;;;;;;;;;:5;;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;23259:56:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23259:56:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23259:56:7;23251:65;;;;;;;;23365:13;;;;:5;:13;;;;;;;;:28;;:47;;23398:13;23365:47;:32;:47;:::i;:::-;23334:13;;;;:5;:13;;;;;;;;:28;:78;23178:455;;;23471:13;;;;:5;:13;;;;;;;;:28;;;;23456:44;;23471:28;;23477:6;;23456:44;;23471:13;23456:44;23518:25;23536:6;23518:17;:25::i;:::-;23561:28;23582:6;23561:20;:28::i;:::-;;23614:4;23607:11;;;;23178:455;23659:4;23652:11;;22287:1383;;;;;;;:::o;24276:486::-;24415:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;24415:24:7;24401:10;:38;;:82;;-1:-1:-1;24451:32:7;24443:4;:40;;;;;;;;;24401:82;24393:91;;;;;;;;24506:32;24498:4;:40;;;;;;;;;24494:262;;;24554:2;;;;24561:13;;;:5;:13;;;;;;;;:24;;;;24554:2;24587:24;;;;24554:58;;;;;-1:-1:-1;;;;;24561:24:7;;;24554:58;;;;24587:24;;;24554:58;;;;;;:2;;;;;:6;;:58;;;;;;;;;;;;;:2;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;24554:58:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24554:58:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24494:262:7;;-1:-1:-1;24494:262:7;;24641:32;24633:4;:40;;;;;;;;;24629:127;;;24689:2;;;;24696:13;;;:5;:13;;;;;;;;:24;;;;24722:22;;;;;24689:56;;;;;-1:-1:-1;;;;;24696:24:7;;;24689:56;;;;24722:22;;;24689:56;;;;;;:2;;;;;:6;;:56;;;;;;;;;;;;;:2;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;24689:56:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24689:56:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;24629:127:7;24276:486;;:::o;24768:500::-;24855:24;24831:13;;;;:5;:13;;;;;:20;;;;;:48;;;;;;;;;24827:85;;;24895:7;;24827:85;24954:26;24930:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;24921:61;;;;;;25014:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25014:24:7;25000:10;:38;;:80;;-1:-1:-1;25056:13:7;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25056:24:7;25042:10;:38;25000:80;:120;;;-1:-1:-1;25098:13:7;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;25098:22:7;25084:10;:36;25000:120;24992:129;;;;;;;;25131:13;;;;:5;:13;;;;;;:20;;;:47;;-1:-1:-1;;25131:47:7;25154:24;25131:47;;;25212:15;25188:21;;;;:39;25242:19;25131:13;;25242:19;;;24768:500;:::o;23676:283::-;23737:4;23756:13;;;:5;:13;;;;;;;:28;;:33;23752:180;;23805:5;;;23820:13;;;:5;:13;;;;;;;;:24;;;;23846:28;;;23805:70;;-1:-1:-1;;;;;23805:70:7;;-1:-1:-1;;;;;23820:24:7;;;23805:70;;;;;;;;;;;;;:5;;;;;:14;;:70;;;;;;;;;;;;;:5;:70;;;5:2:-1;;;;30:1;27;20:12;5:2;23805:70:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23805:70:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;23920:1:7;23889:13;;;:5;23805:70;23889:13;;;;;;:28;:32;23752:180;-1:-1:-1;23948:4:7;23676:283;;;:::o;24079:191::-;24155:4;24171:9;24183:6;;;;;;;;;-1:-1:-1;;;;;24183:6:7;-1:-1:-1;;;;;24183:22:7;;:24;;;;;-1:-1:-1;;;24183:24:7;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;24183:24:7;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24183:24:7;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24183:24:7;;-1:-1:-1;24224:39:7;24258:4;24224:29;24245:7;24224:16;24183:24;24233:6;24224:16;:8;:16;:::i;:::-;:20;:29;:20;:29;:::i;:::-;:33;:39;:33;:39;:::i;:::-;24217:46;24079:191;-1:-1:-1;;;;24079:191:7:o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;;;;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;203:380::-;263:9;489:7;;485:36;;;-1:-1:-1;513:1:15;506:8;;485:36;-1:-1:-1;531:7:15;;;536:2;531;:7;551:6;;;;;;;;:12;544:20;;;665:283;725:7;941:2;936;:7;;;;;;;;;665:283;-1:-1:-1;;;665:283:15:o;254:26781:7:-;;;;;;;;;;;-1:-1:-1;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;-1:-1:-1;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:7;;;-1:-1:-1;254:26781:7;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:26781:7;;;-1:-1:-1;254:26781:7;:::i;:::-;;;;;;;;;;;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;-1:-1:-1;;;;;254:26781:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;254:26781:7;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;254:26781:7;;;;;;",
-  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"zeppelin-solidity/contracts/lifecycle/Pausable.sol\";\nimport \"./SNM.sol\";\nimport \"./Blacklist.sol\";\nimport \"./OracleUSD.sol\";\nimport \"./ProfileRegistry.sol\";\n\n\ncontract Market is Ownable, Pausable {\n\n    using SafeMath for uint256;\n\n    // DECLARATIONS\n\n    enum DealStatus{\n        STATUS_UNKNOWN,\n        STATUS_ACCEPTED,\n        STATUS_CLOSED\n    }\n\n    enum OrderType {\n        ORDER_UNKNOWN,\n        ORDER_BID,\n        ORDER_ASK\n    }\n\n    enum OrderStatus {\n        UNKNOWN,\n        ORDER_INACTIVE,\n        ORDER_ACTIVE\n    }\n\n    enum RequestStatus {\n        REQUEST_UNKNOWN,\n        REQUEST_CREATED,\n        REQUEST_CANCELED,\n        REQUEST_REJECTED,\n        REQUEST_ACCEPTED\n    }\n\n    enum BlacklistPerson {\n        BLACKLIST_NOBODY,\n        BLACKLIST_WORKER,\n        BLACKLIST_MASTER\n    }\n\n    struct Deal {\n        uint64[] benchmarks;\n        address supplierID;\n        address consumerID;\n        address masterID;\n        uint askID;\n        uint bidID;\n        uint duration;\n        uint price; //usd * 10^-18\n        uint startTime;\n        uint endTime;\n        DealStatus status;\n        uint blockedBalance;\n        uint totalPayout;\n        uint lastBillTS;\n    }\n\n    struct Order {\n        OrderType orderType;\n        OrderStatus orderStatus;\n        address author;\n        address counterparty;\n        uint duration;\n        uint256 price;\n        bool[] netflags;\n        ProfileRegistry.IdentityLevel identityLevel;\n        address blacklist;\n        bytes32 tag;\n        uint64[] benchmarks;\n        uint frozenSum;\n        uint dealID;\n    }\n\n    struct ChangeRequest {\n        uint dealID;\n        OrderType requestType;\n        uint price;\n        uint duration;\n        RequestStatus status;\n    }\n\n    // EVENTS\n\n    event OrderPlaced(uint indexed orderID);\n    event OrderUpdated(uint indexed orderID);\n\n    event DealOpened(uint indexed dealID);\n    event DealUpdated(uint indexed dealID);\n\n    event Billed(uint indexed dealID, uint indexed paidAmount);\n\n    event DealChangeRequestSet(uint indexed changeRequestID);\n    event DealChangeRequestUpdated(uint indexed changeRequestID);\n\n    event WorkerAnnounced(address indexed worker, address indexed master);\n    event WorkerConfirmed(address indexed worker, address indexed master);\n    event WorkerRemoved(address indexed worker, address indexed master);\n\n    event NumBenchmarksUpdated(uint indexed newNum);\n    event NumNetflagsUpdated(uint indexed newNum);\n\n    // VARS\n\n    uint constant MAX_BENCHMARKS_VALUE = 2 ** 63;\n\n    SNM token;\n\n    Blacklist bl;\n\n    OracleUSD oracle;\n\n    ProfileRegistry pr;\n\n    uint ordersAmount = 0;\n\n    uint dealAmount = 0;\n\n    uint requestsAmount = 0;\n\n    // current length of benchmarks\n    uint benchmarksQuantity;\n\n    // current length of netflags\n    uint netflagsQuantity;\n\n    mapping(uint => Order) public orders;\n\n    mapping(uint => Deal) public deals;\n\n    mapping(address => uint[]) dealsID;\n\n    mapping(uint => ChangeRequest) requests;\n\n    mapping(uint => uint[2]) actualRequests;\n\n    mapping(address => address) masterOf;\n\n    mapping(address => bool) isMaster;\n\n    mapping(address => mapping(address => bool)) masterRequest;\n\n    // INIT\n\n    constructor(address _token, address _blacklist, address _oracle, address _profileRegistry, uint _benchmarksQuantity, uint _netflagsQuantity) public {\n        token = SNM(_token);\n        bl = Blacklist(_blacklist);\n        oracle = OracleUSD(_oracle);\n        pr = ProfileRegistry(_profileRegistry);\n        benchmarksQuantity = _benchmarksQuantity;\n        netflagsQuantity = _netflagsQuantity;\n    }\n\n    // EXTERNAL\n\n    // Order functions\n\n    function PlaceOrder(\n        OrderType _orderType,\n        address _id_counterparty,\n        uint _duration,\n        uint _price,\n        bool[] _netflags,\n        ProfileRegistry.IdentityLevel _identityLevel,\n        address _blacklist,\n        bytes32 _tag,\n        uint64[] _benchmarks\n    ) whenNotPaused public returns (uint){\n\n        require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);\n        require(_netflags.length <= netflagsQuantity);\n        require(_benchmarks.length <= benchmarksQuantity);\n\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            require(_benchmarks[i] < MAX_BENCHMARKS_VALUE);\n        }\n\n        uint lockedSum = 0;\n\n        if (_orderType == OrderType.ORDER_BID) {\n            if (_duration == 0) {\n                lockedSum = CalculatePayment(_price, 1 hours);\n            } else if (_duration < 1 days) {\n                lockedSum = CalculatePayment(_price, _duration);\n            } else {\n                lockedSum = CalculatePayment(_price, 1 days);\n            }\n            // this line contains err.\n            require(token.transferFrom(msg.sender, this, lockedSum));\n        }\n\n        ordersAmount = ordersAmount.add(1);\n        uint256 orderId = ordersAmount;\n\n        orders[orderId] = Order(\n            _orderType,\n            OrderStatus.ORDER_ACTIVE,\n            msg.sender,\n            _id_counterparty,\n            _duration,\n            _price,\n            _netflags,\n            _identityLevel,\n            _blacklist,\n            _tag,\n            _benchmarks,\n            lockedSum,\n            0\n        );\n\n        emit OrderPlaced(orderId);\n        return orderId;\n    }\n\n    function CancelOrder(uint orderID) public returns (bool){\n        require(orderID <= ordersAmount);\n        require(orders[orderID].orderStatus == OrderStatus.ORDER_ACTIVE);\n        require(orders[orderID].author == msg.sender);\n\n        require(token.transfer(msg.sender, orders[orderID].frozenSum));\n        orders[orderID].orderStatus = OrderStatus.ORDER_INACTIVE;\n\n        emit OrderUpdated(orderID);\n        return true;\n    }\n\n    function QuickBuy(uint askID, uint buyoutDuration) public whenNotPaused {\n        Order memory ask = orders[askID];\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE);\n\n        require(ask.duration >= buyoutDuration);\n        require(pr.GetProfileLevel(msg.sender) >= ask.identityLevel);\n        require(bl.Check(msg.sender, GetMaster(ask.author)) == false && bl.Check(ask.author, msg.sender) == false);\n        require(bl.Check(ask.blacklist, msg.sender) == false);\n\n        PlaceOrder(\n            OrderType.ORDER_BID,\n            GetMaster(ask.author),\n            buyoutDuration,\n            ask.price,\n            ask.netflags,\n            ProfileRegistry.IdentityLevel.ANONYMOUS,\n            address(0),\n            bytes32(0),\n            ask.benchmarks);\n\n        OpenDeal(askID, GetOrdersAmount());\n    }\n\n    // Deal functions\n\n    function OpenDeal(uint _askID, uint _bidID) whenNotPaused public {\n        Order memory ask = orders[_askID];\n        Order memory bid = orders[_bidID];\n\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);\n        require((ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author)) && (bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author)));\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(bid.orderType == OrderType.ORDER_BID);\n        require(\n            bl.Check(bid.blacklist, GetMaster(ask.author)) == false\n            && bl.Check(bid.blacklist, ask.author) == false\n            && bl.Check(bid.author, GetMaster(ask.author)) == false\n            && bl.Check(bid.author, ask.author) == false\n            && bl.Check(ask.blacklist, bid.author) == false\n            && bl.Check(GetMaster(ask.author), bid.author) == false\n            && bl.Check(ask.author, bid.author) == false);\n        require(ask.price <= bid.price);\n        require(ask.duration >= bid.duration);\n        // profile level check\n        require(pr.GetProfileLevel(bid.author) >= ask.identityLevel);\n        require(pr.GetProfileLevel(ask.author) >= bid.identityLevel);\n\n        if (ask.netflags.length < netflagsQuantity) {\n            ask.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        if (bid.netflags.length < netflagsQuantity) {\n            bid.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        for (uint i = 0; i < ask.netflags.length; i++) {\n            // implementation: when bid contains requirement, ask necessary needs to have this\n            // if ask have this one - pass\n            require(!bid.netflags[i] || ask.netflags[i]);\n        }\n\n        if (ask.benchmarks.length < benchmarksQuantity) {\n            ask.benchmarks = ResizeBenchmarks(ask.benchmarks);\n        }\n\n        if (bid.benchmarks.length < benchmarksQuantity) {\n            bid.benchmarks = ResizeBenchmarks(bid.benchmarks);\n        }\n\n        for (i = 0; i < ask.benchmarks.length; i++) {\n            require(ask.benchmarks[i] >= bid.benchmarks[i]);\n        }\n\n        dealAmount = dealAmount.add(1);\n        address master = GetMaster(ask.author);\n        orders[_askID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_bidID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_askID].dealID = dealAmount;\n        orders[_bidID].dealID = dealAmount;\n\n        emit OrderUpdated(_askID);\n        emit OrderUpdated(_bidID);\n\n        uint startTime = block.timestamp;\n        uint endTime = 0;\n        // `0` - for spot deal\n\n        // if deal is normal\n        if (ask.duration != 0) {\n            endTime = startTime.add(bid.duration);\n        }\n        uint blockedBalance = bid.frozenSum;\n        deals[dealAmount] = Deal(ask.benchmarks, ask.author, bid.author, master, _askID, _bidID, bid.duration, ask.price, startTime, endTime, DealStatus.STATUS_ACCEPTED, blockedBalance, 0, block.timestamp);\n        emit DealOpened(dealAmount);\n    }\n\n    function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n\n        if (block.timestamp <= deals[dealID].startTime.add(deals[dealID].duration)) {\n            // after endTime\n            require(deals[dealID].consumerID == msg.sender);\n        }\n        AddToBlacklist(dealID, blacklisted);\n        InternalBill(dealID);\n        InternalCloseDeal(dealID);\n        RefundRemainingFunds(dealID);\n        return true;\n    }\n\n    function Bill(uint dealID) public returns (bool){\n        InternalBill(dealID);\n        ReserveNextPeriodFunds(dealID);\n        return true;\n    }\n\n    function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID || msg.sender == deals[dealID].supplierID);\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n\n        if (IsSpot(dealID)) {\n            require(newDuration == 0);\n        }\n\n        requestsAmount = requestsAmount.add(1);\n\n        OrderType requestType;\n\n        if (msg.sender == deals[dealID].consumerID) {\n            requestType = OrderType.ORDER_BID;\n        } else {\n            requestType = OrderType.ORDER_ASK;\n        }\n\n        requests[requestsAmount] = ChangeRequest(dealID, requestType, newPrice, newDuration, RequestStatus.REQUEST_CREATED);\n        emit DealChangeRequestSet(requestsAmount);\n\n        if (requestType == OrderType.ORDER_BID) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][1] = requestsAmount;\n            ChangeRequest memory matchingRequest = requests[actualRequests[dealID][0]];\n\n            if (newDuration == deals[dealID].duration && newPrice > deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][1] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration >= newDuration && matchingRequest.price <= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = matchingRequest.price;\n                deals[dealID].duration = newDuration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            actualRequests[dealID][1] = requestsAmount;\n        }\n\n        if (requestType == OrderType.ORDER_ASK) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n            requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][0] = requestsAmount;\n            matchingRequest = requests[actualRequests[dealID][1]];\n\n            if (newDuration == deals[dealID].duration && newPrice < deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][0] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration <= newDuration && matchingRequest.price >= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                deals[dealID].duration = matchingRequest.duration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n        }\n\n        deals[dealID].endTime = deals[dealID].startTime.add(deals[dealID].duration);\n        return requestsAmount;\n    }\n\n    function CancelChangeRequest(uint changeRequestID) public returns (bool) {\n        ChangeRequest memory request = requests[changeRequestID];\n        require(msg.sender == deals[request.dealID].supplierID || msg.sender == deals[request.dealID].masterID || msg.sender == deals[request.dealID].consumerID);\n        require(request.status != RequestStatus.REQUEST_ACCEPTED);\n\n        if (request.requestType == OrderType.ORDER_ASK) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            }\n            actualRequests[request.dealID][0] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n\n        if (request.requestType == OrderType.ORDER_BID) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            }\n            actualRequests[request.dealID][1] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n        return true;\n    }\n\n    // Master-worker functions\n\n    function RegisterWorker(address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(msg.sender) == msg.sender);\n        require(isMaster[msg.sender] == false);\n        require(GetMaster(_master) == _master);\n        masterRequest[_master][msg.sender] = true;\n        emit WorkerAnnounced(msg.sender, _master);\n        return true;\n    }\n\n    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {\n        require(masterRequest[msg.sender][_worker] == true);\n        masterOf[_worker] = msg.sender;\n        isMaster[msg.sender] = true;\n        delete masterRequest[msg.sender][_worker];\n        emit WorkerConfirmed(_worker, msg.sender);\n        return true;\n    }\n\n    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));\n        delete masterOf[_worker];\n        emit WorkerRemoved(_worker, _master);\n        return true;\n    }\n\n    // GETTERS\n\n    function GetOrderInfo(uint orderID) view public\n    returns (\n        OrderType orderType,\n        address author,\n        address counterparty,\n        uint duration,\n        uint price,\n        bool[] netflags,\n        ProfileRegistry.IdentityLevel identityLevel,\n        address blacklist,\n        bytes32 tag,\n        uint64[] benchmarks,\n        uint frozenSum\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderType,\n        order.author,\n        order.counterparty,\n        order.duration,\n        order.price,\n        order.netflags,\n        order.identityLevel,\n        order.blacklist,\n        order.tag,\n        order.benchmarks,\n        order.frozenSum\n        );\n    }\n\n\n    function GetOrderParams(uint orderID) view public\n    returns (\n        OrderStatus orderStatus,\n        uint dealID\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderStatus,\n        order.dealID\n        );\n    }\n\n    function GetDealInfo(uint dealID) view public\n    returns (\n        uint64[] benchmarks,\n        address supplierID,\n        address consumerID,\n        address masterID,\n        uint askID,\n        uint bidID,\n        uint startTime\n    ){\n        return (\n        deals[dealID].benchmarks,\n        deals[dealID].supplierID,\n        deals[dealID].consumerID,\n        deals[dealID].masterID,\n        deals[dealID].askID,\n        deals[dealID].bidID,\n        deals[dealID].startTime\n\n        );\n    }\n\n    function GetDealParams(uint dealID) view public\n    returns (\n        uint duration,\n        uint price,\n        uint endTime,\n        DealStatus status,\n        uint blockedBalance,\n        uint totalPayout,\n        uint lastBillTS\n    ){\n        return (\n        deals[dealID].duration,\n        deals[dealID].price,\n        deals[dealID].endTime,\n        deals[dealID].status,\n        deals[dealID].blockedBalance,\n        deals[dealID].totalPayout,\n        deals[dealID].lastBillTS\n        );\n    }\n\n    function GetMaster(address _worker) view public returns (address master) {\n        if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {\n            master = _worker;\n        } else {\n            master = masterOf[_worker];\n        }\n    }\n\n    function GetChangeRequestInfo(uint changeRequestID) view public\n    returns (\n        uint dealID,\n        OrderType requestType,\n        uint price,\n        uint duration,\n        RequestStatus status\n    ){\n        return (\n        requests[changeRequestID].dealID,\n        requests[changeRequestID].requestType,\n        requests[changeRequestID].price,\n        requests[changeRequestID].duration,\n        requests[changeRequestID].status\n        );\n    }\n\n    function GetDealsAmount() public view returns (uint){\n        return dealAmount;\n    }\n\n    function GetOrdersAmount() public view returns (uint){\n        return ordersAmount;\n    }\n\n    function GetChangeRequestsAmount() public view returns (uint){\n        return requestsAmount;\n    }\n\n    function GetBenchmarksQuantity() public view returns (uint) {\n        return benchmarksQuantity;\n    }\n\n    function GetNetflagsQuantity() public view returns (uint) {\n        return netflagsQuantity;\n    }\n\n\n    // INTERNAL\n\n    function InternalBill(uint dealID) internal returns (bool){\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n        Deal memory deal = deals[dealID];\n\n        uint paidAmount;\n\n        if (!IsSpot(dealID) && deal.lastBillTS >= deal.endTime) {\n            // means we already billed deal after endTime\n            return true;\n        } else if (!IsSpot(dealID) && block.timestamp > deal.endTime && deal.lastBillTS < deal.endTime) {\n            paidAmount = CalculatePayment(deal.price, deal.endTime.sub(deal.lastBillTS));\n        } else {\n            paidAmount = CalculatePayment(deal.price, block.timestamp.sub(deal.lastBillTS));\n        }\n\n        if (paidAmount > deal.blockedBalance) {\n            if (token.balanceOf(deal.consumerID) >= paidAmount.sub(deal.blockedBalance)) {\n                require(token.transferFrom(deal.consumerID, this, paidAmount.sub(deal.blockedBalance)));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(paidAmount.sub(deal.blockedBalance));\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                require(token.transfer(deal.masterID, deal.blockedBalance));\n                deals[dealID].lastBillTS = block.timestamp;\n                deals[dealID].totalPayout = deals[dealID].totalPayout.add(deal.blockedBalance);\n                deals[dealID].blockedBalance = 0;\n                return true;\n            }\n        }\n        require(token.transfer(deal.masterID, paidAmount));\n        deals[dealID].blockedBalance = deals[dealID].blockedBalance.sub(paidAmount);\n        deals[dealID].totalPayout = deals[dealID].totalPayout.add(paidAmount);\n        deals[dealID].lastBillTS = block.timestamp;\n        emit Billed(dealID, paidAmount);\n        return true;\n    }\n\n    function ReserveNextPeriodFunds(uint dealID) internal returns (bool) {\n        uint nextPeriod;\n        Deal memory deal = deals[dealID];\n\n        if (IsSpot(dealID)) {\n            if (deal.status == DealStatus.STATUS_CLOSED) {\n                return true;\n            }\n            nextPeriod = 1 hours;\n        } else {\n            if (block.timestamp > deal.endTime) {\n                // we don't reserve funds for next period\n                return true;\n            }\n            if (deal.endTime.sub(block.timestamp) < 1 days) {\n                nextPeriod = deal.endTime.sub(block.timestamp);\n            } else {\n                nextPeriod = 1 days;\n            }\n        }\n\n        if (CalculatePayment(deal.price, nextPeriod) > deals[dealID].blockedBalance) {\n            uint nextPeriodSum = CalculatePayment(deal.price, nextPeriod).sub(deals[dealID].blockedBalance);\n\n            if (token.balanceOf(deal.consumerID) >= nextPeriodSum) {\n                require(token.transferFrom(deal.consumerID, this, nextPeriodSum));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(nextPeriodSum);\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                RefundRemainingFunds(dealID);\n                return true;\n            }\n        }\n        return true;\n    }\n\n    function RefundRemainingFunds(uint dealID) internal returns (bool){\n        if (deals[dealID].blockedBalance != 0) {\n            token.transfer(deals[dealID].consumerID, deals[dealID].blockedBalance);\n            deals[dealID].blockedBalance = 0;\n        }\n        return true;\n    }\n\n    function IsSpot(uint dealID) internal view returns (bool){\n        return deals[dealID].duration == 0;\n    }\n\n    function CalculatePayment(uint _price, uint _period) internal view returns (uint) {\n        uint rate = oracle.getCurrentPrice();\n        return rate.mul(_price).mul(_period).div(1e18);\n    }\n\n    function AddToBlacklist(uint dealID, BlacklistPerson role) internal {\n        // only consumer can blacklist\n        require(msg.sender == deals[dealID].consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);\n        if (role == BlacklistPerson.BLACKLIST_WORKER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].supplierID);\n        } else if (role == BlacklistPerson.BLACKLIST_MASTER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].masterID);\n        }\n    }\n\n    function InternalCloseDeal(uint dealID) internal {\n        if (deals[dealID].status == DealStatus.STATUS_CLOSED) {\n            return;\n        }\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].masterID);\n        deals[dealID].status = DealStatus.STATUS_CLOSED;\n        deals[dealID].endTime = block.timestamp;\n        emit DealUpdated(dealID);\n    }\n\n    function ResizeBenchmarks(uint64[] _benchmarks) internal view returns (uint64[]) {\n        uint64[] memory benchmarks = new uint64[](benchmarksQuantity);\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            benchmarks[i] = _benchmarks[i];\n        }\n        return benchmarks;\n    }\n\n    function ResizeNetflags(bool[] _netflags) internal view returns (bool[]) {\n        bool[] memory netflags = new bool[](netflagsQuantity);\n        for (uint i = 0; i < _netflags.length; i++) {\n            netflags[i] = _netflags[i];\n        }\n        return netflags;\n    }\n\n    // SETTERS\n\n    function SetProfileRegistryAddress(address _newPR) onlyOwner public returns (bool) {\n        pr = ProfileRegistry(_newPR);\n        return true;\n    }\n\n    function SetBlacklistAddress(address _newBL) onlyOwner public returns (bool) {\n        bl = Blacklist(_newBL);\n        return true;\n    }\n\n    function SetOracleAddress(address _newOracle) onlyOwner public returns (bool) {\n        require(OracleUSD(_newOracle).getCurrentPrice() != 0);\n        oracle = OracleUSD(_newOracle);\n        return true;\n    }\n\n    function SetBenchmarksQuantity(uint _newQuantity) onlyOwner public returns (bool) {\n        require(_newQuantity > benchmarksQuantity);\n        emit NumBenchmarksUpdated(_newQuantity);\n        benchmarksQuantity = _newQuantity;\n        return true;\n    }\n\n    function SetNetflagsQuantity(uint _newQuantity) onlyOwner public returns (bool) {\n        require(_newQuantity > netflagsQuantity);\n        emit NumNetflagsUpdated(_newQuantity);\n        netflagsQuantity = _newQuantity;\n        return true;\n    }\n\n    function KillMarket() onlyOwner public {\n        token.transfer(owner, token.balanceOf(address(this)));\n        selfdestruct(owner);\n    }\n}\n",
+  "bytecode": "0x60806040526000805460a060020a60ff02191681556005819055600681905560075534801561002d57600080fd5b5060405160c0806153d683398101604090815281516020830151918301516060840151608085015160a09095015160008054600160a060020a0319908116331790915560018054600160a060020a039687169083161790556002805496861696821696909617909555600380549385169386169390931790925560048054939091169290931691909117909155600891909155600955615304806100d26000396000f3006080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613388565b34801561071a57600080fd5b506103a361338e565b34801561072f57600080fd5b506102946004356134cc565b34801561074757600080fd5b5061029460043560ff602435166134e1565b34801561076557600080fd5b50610294600160a060020a0360043581169060243516613605565b34801561078c57600080fd5b50610294600160a060020a03600435166136c5565b3480156107ad57600080fd5b5061031b613702565b3480156107c257600080fd5b506107ce600435613708565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b613995565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a5098506080909501965092945081019282918501908490808284375094975061399b9650505050505050565b3480156109c757600080fd5b50610294600435613d8e565b3480156109df57600080fd5b50610294600160a060020a0360043516613de8565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e25565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fed565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec9615057565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e48565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5e16565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b983398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134cc565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b983398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b983398151915291a26000868152600e60205260408120818155600101556112eb866134cc565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b98339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b983398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b983398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134cc565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b983398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b983398151915290600090a26000868152600e60205260408120818155600101556115c0866134cc565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b983398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5e16565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fed565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c00151600160008060010289610140015161399b565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f615057565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b983398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b983398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fed565b6123e6614fed565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b15156128a257600080fd5b6060860151600160a060020a031615806128dd57506128c48760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e857600080fd5b6002875160028111156128f757fe5b1461290157600080fd5b60018651600281111561291057fe5b1461291a57600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294490610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a857600080fd5b505af11580156129bc573d6000803e3d6000fd5b505050506040513d60208110156129d257600080fd5b5051156129de57600080fd5b6002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a4257600080fd5b505af1158015612a56573d6000803e3d6000fd5b505050506040513d6020811015612a6c57600080fd5b505115612a7857600080fd5b60025460408088015190890151600160a060020a039092169163968f600c9190612aa190610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612b0557600080fd5b505af1158015612b19573d6000803e3d6000fd5b505050506040513d6020811015612b2f57600080fd5b505115612b3b57600080fd5b60025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9c57600080fd5b505af1158015612bb0573d6000803e3d6000fd5b505050506040513d6020811015612bc657600080fd5b505115612bd257600080fd5b600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c3657600080fd5b505af1158015612c4a573d6000803e3d6000fd5b505050506040513d6020811015612c6057600080fd5b505115612c6c57600080fd5b6002546040880151600160a060020a039091169063968f600c90612c8f90610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cdf57600080fd5b505af1158015612cf3573d6000803e3d6000fd5b505050506040513d6020811015612d0957600080fd5b505115612d1557600080fd5b60025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d7657600080fd5b505af1158015612d8a573d6000803e3d6000fd5b505050506040513d6020811015612da057600080fd5b505115612dac57600080fd5b60a080870151908801511115612dc157600080fd5b608080870151908801511015612dd657600080fd5b8660e001516004811115612de657fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e5357600080fd5b505af1158015612e67573d6000803e3d6000fd5b505050506040513d6020811015612e7d57600080fd5b50516004811115612e8a57fe5b1015612e9557600080fd5b8560e001516004811115612ea557fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f1257600080fd5b505af1158015612f26573d6000803e3d6000fd5b505050506040513d6020811015612f3c57600080fd5b50516004811115612f4957fe5b1015612f5457600080fd5b6009548760c00151511015612f7657612f708760c00151613e6b565b60c08801525b6009548660c00151511015612f9857612f928760c00151613e6b565b60c08701525b600094505b8660c0015151851015612ffe5760c0860151805186908110612fbb57fe5b906020019060200201511580612fe8575060c0870151805186908110612fdd57fe5b906020019060200201515b1515612ff357600080fd5b600190940193612f9d565b6008548761014001515110156130235761301c876101400151613ef5565b6101408801525b60085486610140015151101561304857613041866101400151613ef5565b6101408701525b600094505b866101400151518510156130be5761014086015180518690811061306d57fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561309457fe5b6020908102909101015167ffffffffffffffff1610156130b357600080fd5b60019094019361304d565b6006546130d290600163ffffffff613e5e16565b60065560408701516130e390610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319d57608086015161319a90849063ffffffff613e5e16565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322b57fe5b81526020018281526020016000815260200142815250600b600060065481526020019081526020016000206000820151816000019080519060200190613272929190615083565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332957fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a031633146133a557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341957600080fd5b505af115801561342d573d6000803e3d6000fd5b505050506040513d602081101561344357600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561349257600080fd5b505af11580156134a6573d6000803e3d6000fd5b505050506040513d60208110156134bc57600080fd5b5050600054600160a060020a0316ff5b60006134d782613f7d565b5061228f82614670565b600060016000848152600b60205260409020600a015460ff16600281111561350557fe5b1461350f57600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061355057506000838152600b6020526040902060020154600160a060020a031633145b8061357457506000838152600b6020526040902060030154600160a060020a031633145b151561357f57600080fd5b6000838152600b6020526040902060068101546008909101546135a79163ffffffff613e5e16565b42116135d3576000838152600b6020526040902060020154600160a060020a031633146135d357600080fd5b6135dd8383614ab2565b6135e683613f7d565b506135f083614c87565b6135f983614d9e565b50600190505b92915050565b6000805460a060020a900460ff161561361d57600080fd5b81600160a060020a031661363084610c1e565b600160a060020a0316148015613660575033600160a060020a0384161480613660575033600160a060020a038316145b151561366b57600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136dd57600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b60008060008060006060600080600060606000613723614fed565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374f57fe5b600281111561375a57fe5b81528154602090910190610100900460ff16600281111561377757fe5b600281111561378257fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561383457602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116138035790505b5050509183525050600582015460209091019060ff16600481111561385557fe5b600481111561386057fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390f57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138ca5790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b957600080fd5b60018860048111156139c757fe5b10156139d257600080fd5b600954895111156139e257600080fd5b600854855111156139f257600080fd5b600092505b8451831015613a40576780000000000000008584815181101515613a1757fe5b6020908102909101015167ffffffffffffffff1610613a3557600080fd5b6001909201916139f7565b6000915060018d6002811115613a5257fe5b1415613b41578a1515613a7257613a6b8a610e10614e69565b9150613a97565b620151808b1015613a8757613a6b8a8c614e69565b613a948a62015180614e69565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0a57600080fd5b505af1158015613b1e573d6000803e3d6000fd5b505050506040513d6020811015613b3457600080fd5b50511515613b4157600080fd5b600554613b5590600163ffffffff613e5e16565b6005819055604080516101a08101909152909150808e6002811115613b7657fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bbe57fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c1557fe5b021790555060208201518154829061ff001916610100836002811115613c3757fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cba91600484019160209091019061513e565b5060e082015160058201805460ff19166001836004811115613cd857fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3a916007840191602090910190615083565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613da657600080fd5b6008548211613db457600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613e0057600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3c57600080fd5b613e4581614f2d565b50565b6000908152600b60205260409020600601541590565b818101828110156135ff57fe5b6060806000600954604051908082528060200260200182016040528015613e9c578160200160208202803883390190505b509150600090505b8351811015613eea578381815181101515613ebb57fe5b906020019060200201518282815181101515613ed357fe5b911515602092830290910190910152600101613ea4565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f26578160200160208202803883390190505b509150600090505b8351811015613eea578381815181101515613f4557fe5b906020019060200201518282815181101515613f5d57fe5b67ffffffffffffffff909216602092830290910190910152600101613f2e565b6000613f876151df565b600060016000858152600b60205260409020600a015460ff166002811115613fab57fe5b14613fb557600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613ff657506000848152600b6020526040902060020154600160a060020a031633145b8061401a57506000848152600b6020526040902060030154600160a060020a031633145b151561402557600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140bb57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116140765790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414957fe5b600281111561415457fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061418184613e48565b1580156141985750816101200151826101a0015110155b156141a65760019250613eee565b6141af84613e48565b1580156141c0575081610120015142115b80156141d55750816101200151826101a00151105b1561420b576142048260e001516141ff846101a00151856101200151614f9d90919063ffffffff16565b614e69565b905061422e565b61422b8260e001516141ff846101a0015142614f9d90919063ffffffff16565b90505b8161016001518111156145375761016082015161425290829063ffffffff614f9d16565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142bd57600080fd5b505af11580156142d1573d6000803e3d6000fd5b505050506040513d60208110156142e757600080fd5b5051106143ff576001546040830151610160840151600160a060020a03909216916323b872dd9190309061432290869063ffffffff614f9d16565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561437657600080fd5b505af115801561438a573d6000803e3d6000fd5b505050506040513d60208110156143a057600080fd5b505115156143ad57600080fd5b6143e76143c883610160015183614f9d90919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5e16565b6000858152600b602081905260409091200155614537565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361444784614c87565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144ab57600080fd5b505af11580156144bf573d6000803e3d6000fd5b505050506040513d60208110156144d557600080fd5b505115156144e257600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145119163ffffffff613e5e16565b6000858152600b602081905260408220600c810193909355919091015560019250613eee565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561459557600080fd5b505af11580156145a9573d6000803e3d6000fd5b505050506040513d60208110156145bf57600080fd5b505115156145cc57600080fd5b6000848152600b6020819052604090912001546145ef908263ffffffff614f9d16565b6000858152600b6020819052604090912090810191909155600c015461461b908263ffffffff613e5e16565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b60008061467b6151df565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561471157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146cc5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479f57fe5b60028111156147aa57fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147d785613e48565b1561480857600282610140015160028111156147ef57fe5b14156147fe5760019350614aaa565b610e109250614863565b81610120015142111561481e5760019350614aaa565b6101208201516201518090614839904263ffffffff614f9d16565b101561485c57610120820151614855904263ffffffff614f9d16565b9250614863565b6201518092505b6000858152600b60208190526040909120015460e08301516148859085614e69565b1115614aa5576148bf600b6000878152602001908152602001600020600b01546148b38460e0015186614e69565b9063ffffffff614f9d16565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492f57600080fd5b505af1158015614943573d6000803e3d6000fd5b505050506040513d602081101561495957600080fd5b505110614a4a5760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d857600080fd5b505af11580156149ec573d6000803e3d6000fd5b505050506040513d6020811015614a0257600080fd5b50511515614a0f57600080fd5b6000858152600b602081905260409091200154614a32908263ffffffff613e5e16565b6000868152600b602081905260409091200155614aa5565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a9285614c87565b614a9b85614d9e565b5060019350614aaa565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614ae557506000816002811115614ae357fe5b145b1515614af057600080fd5b6001816002811115614afe57fe5b1415614bbc57600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8a57600080fd5b505af1158015614b9e573d6000803e3d6000fd5b505050506040513d6020811015614bb457600080fd5b50614c839050565b6002816002811115614bca57fe5b1415614c8357600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c5657600080fd5b505af1158015614c6a573d6000803e3d6000fd5b505050506040513d6020811015614c8057600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca957fe5b1415614cb457613e45565b60016000828152600b60205260409020600a015460ff166002811115614cd657fe5b14614ce057600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d2157506000818152600b6020526040902060010154600160a060020a031633145b80614d4557506000818152600b6020526040902060030154600160a060020a031633145b1515614d5057600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e61576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e2257600080fd5b505af1158015614e36573d6000803e3d6000fd5b505050506040513d6020811015614e4c57600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614ebf57600080fd5b505af1158015614ed3573d6000803e3d6000fd5b505050506040513d6020811015614ee957600080fd5b50519050614f25670de0b6b3a7640000614f1985614f0d858963ffffffff614faf16565b9063ffffffff614faf16565b9063ffffffff614fd816565b949350505050565b600160a060020a0381161515614f4257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa957fe5b50900390565b6000821515614fc0575060006135ff565b50818102818382811515614fd057fe5b04146135ff57fe5b60008183811515614fe557fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b8280548282559060005260206000209060030160049004810192821561512e5791602002820160005b838211156150f857835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150ac565b801561512c5782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f8565b505b5061513a929150615275565b5090565b82805482825590600052602060002090601f016020900481019282156151d35791602002820160005b838211156151a457835183826101000a81548160ff0219169083151502179055509260200192600101602081600001049283019260010302615167565b80156151d15782816101000a81549060ff02191690556001016020816000010492830192600103026151a4565b505b5061513a92915061529a565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525a57fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513a57805467ffffffffffffffff1916815560010161527b565b610c9091905b8082111561513a57805460ff191681556001016152a056004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a7230582015a4481d4af7f0151be2d0d778f76077b36f1b7a02879809dae626a9c6ceaef60029",
+  "deployedBytecode": "0x6080604052600436106101a85763ffffffff60e060020a60003504166303988f8481146101ad5780630adef86c146102735780631a3d5f82146102a8578063289e77b3146102c9578063348843cf146103065780633a9072271461032d5780633c1cbb34146103705780633f4ba83a1461038e5780634fabdd4b146103a55780635ad5f6ae1461040b5780635c975abb146104d7578063616451c5146104ec57806363fb292914610552578063715018a6146105675780638456cb591461057c5780638bce1fdf146105915780638da5cb5b146105ac57806391e75fc0146105c1578063935c9ad2146105d95780639a1ea609146105f1578063a70a7af014610609578063a85c38ef1461062a578063b1defc89146106de578063b4bf396e146106f9578063c4b22e7d1461070e578063c86c16f214610723578063d0cca9221461073b578063d362343214610759578063d85e677614610780578063de4e86c5146107a1578063e217866c146107b6578063e45ea8d3146108dd578063e67d7dd8146108f2578063ef78b8d3146109bb578063f1bf6fd5146109d3578063f2fde38b146109f4575b600080fd5b3480156101b957600080fd5b506101c5600435610a15565b604051808e600160a060020a0316600160a060020a031681526020018d600160a060020a0316600160a060020a031681526020018c600160a060020a0316600160a060020a031681526020018b81526020018a815260200189815260200188815260200187815260200186815260200185600281111561024157fe5b60ff1681526020018481526020018381526020018281526020019d505050505050505050505050505060405180910390f35b34801561027f57600080fd5b50610294600160a060020a0360043516610a93565b604080519115158252519081900360200190f35b3480156102b457600080fd5b50610294600160a060020a0360043516610b44565b3480156102d557600080fd5b506102ea600160a060020a0360043516610c1e565b60408051600160a060020a039092168252519081900360200190f35b34801561031257600080fd5b5061031b610c8c565b60408051918252519081900360200190f35b34801561033957600080fd5b50610345600435610c93565b6040518083600281111561035557fe5b60ff1681526020018281526020019250505060405180910390f35b34801561037c57600080fd5b5061031b600435602435604435610ebe565b34801561039a57600080fd5b506103a3611646565b005b3480156103b157600080fd5b506103bd6004356116bc565b604051808881526020018781526020018681526020018560028111156103df57fe5b60ff16815260200184815260200183815260200182815260200197505050505050505060405180910390f35b34801561041757600080fd5b50610423600435611700565b604051808060200188600160a060020a0316600160a060020a0316815260200187600160a060020a0316600160a060020a0316815260200186600160a060020a0316600160a060020a03168152602001858152602001848152602001838152602001828103825289818151815260200191508051906020019060200280838360005b838110156104bd5781810151838201526020016104a5565b505050509050019850505050505050505060405180910390f35b3480156104e357600080fd5b506102946117ef565b3480156104f857600080fd5b506105046004356117ff565b6040518086815260200185600281111561051a57fe5b60ff16815260200184815260200183815260200182600481111561053a57fe5b60ff1681526020019550505050505060405180910390f35b34801561055e57600080fd5b5061031b611836565b34801561057357600080fd5b506103a361183c565b34801561058857600080fd5b506103a361189b565b34801561059d57600080fd5b506103a3600435602435611916565b3480156105b857600080fd5b506102ea611e6c565b3480156105cd57600080fd5b50610294600435611e7b565b3480156105e557600080fd5b50610294600435611ed5565b3480156105fd57600080fd5b50610294600435612025565b34801561061557600080fd5b50610294600160a060020a0360043516612298565b34801561063657600080fd5b5061064260043561236d565b604051808c600281111561065257fe5b60ff1681526020018b600281111561066657fe5b60ff168152600160a060020a03808c1660208301528a166040820152606081018990526080810188905260a00186600481111561069f57fe5b60ff168152600160a060020a0390951660208601525060408085019390935260608401919091526080830152519081900360a001975095505050505050f35b3480156106ea57600080fd5b506103a36004356024356123d6565b34801561070557600080fd5b5061031b613388565b34801561071a57600080fd5b506103a361338e565b34801561072f57600080fd5b506102946004356134cc565b34801561074757600080fd5b5061029460043560ff602435166134e1565b34801561076557600080fd5b50610294600160a060020a0360043581169060243516613605565b34801561078c57600080fd5b50610294600160a060020a03600435166136c5565b3480156107ad57600080fd5b5061031b613702565b3480156107c257600080fd5b506107ce600435613708565b604051808c60028111156107de57fe5b60ff168152600160a060020a03808d1660208301528b166040820152606081018a90526080810189905260a081019060c00187600481111561081c57fe5b60ff168152600160a060020a038716602080830191909152604082018790526080820185905260a0848303810184528a51908301528951606083019260c001918b8101910280838360005b8381101561087f578181015183820152602001610867565b50505050905001838103825285818151815260200191508051906020019060200280838360005b838110156108be5781810151838201526020016108a6565b505050509050019d505050505050505050505050505060405180910390f35b3480156108e957600080fd5b5061031b613995565b3480156108fe57600080fd5b50604080516020600460843581810135838102808601850190965280855261031b95833560ff169560248035600160a060020a03169660443596606435963696919560a4959490910192829190850190849080828437505060408051602060608901358a01803582810280850184018652818552999c8b3560ff169c848d0135600160a060020a03169c968701359b919a5098506080909501965092945081019282918501908490808284375094975061399b9650505050505050565b3480156109c757600080fd5b50610294600435613d8e565b3480156109df57600080fd5b50610294600160a060020a0360043516613de8565b348015610a0057600080fd5b506103a3600160a060020a0360043516613e25565b600b602081905260009182526040909120600181015460028201546003830154600484015460058501546006860154600787015460088801546009890154600a8a01549a8a0154600c8b0154600d909b0154600160a060020a039a8b169c998b169b9a9098169996989597949693959294919360ff9093169290918d565b60008054600160a060020a03163314610aab57600080fd5b81600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015610ae957600080fd5b505af1158015610afd573d6000803e3d6000fd5b505050506040513d6020811015610b1357600080fd5b50511515610b2057600080fd5b5060038054600160a060020a031916600160a060020a03831617905560015b919050565b6000805460a060020a900460ff1615610b5c57600080fd5b336000908152601160209081526040808320600160a060020a038616845290915290205460ff161515600114610b9157600080fd5b600160a060020a0382166000818152600f602090815260408083208054600160a060020a0319163390811790915580845260108352818420805460ff19908116600117909155601184528285208686529093528184208054909316909255519092917f4940ef08d5aed63b7d3d3db293d69d6ed1d624995b90e9e944839c8ea0ae450d91a3506001919050565b600160a060020a038082166000908152600f60205260408120549091161580610c615750600160a060020a038083166000818152600f6020526040902054909116145b15610c6d575080610b3f565b50600160a060020a039081166000908152600f60205260409020541690565b6008545b90565b600080610c9e614fed565b6000848152600a60205260409081902081516101a081019092528054829060ff166002811115610cca57fe5b6002811115610cd557fe5b81528154602090910190610100900460ff166002811115610cf257fe5b6002811115610cfd57fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015610daf57602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411610d7e5790505b5050509183525050600582015460209091019060ff166004811115610dd057fe5b6004811115610ddb57fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015610e8a57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411610e455790505b5050505050815260200160088201548152602001600982015481525050905080602001518161018001519250925050915091565b600080610ec9615057565b6000868152600b6020526040902060020154600160a060020a0316331480610f0a57506000868152600b6020526040902060030154600160a060020a031633145b80610f2e57506000868152600b6020526040902060010154600160a060020a031633145b1515610f3957600080fd5b60016000878152600b60205260409020600a015460ff166002811115610f5b57fe5b14610f6557600080fd5b610f6e86613e48565b15610f7e578315610f7e57600080fd5b600754610f9290600163ffffffff613e5e16565b6007556000868152600b6020526040902060020154600160a060020a0316331415610fc05760019150610fc5565b600291505b60a060405190810160405280878152602001836002811115610fe357fe5b81526020810187905260408101869052606001600190526007546000908152600d60209081526040909120825181559082015160018083018054909160ff199091169083600281111561103257fe5b0217905550604082015181600201556060820151816003015560808201518160040160006101000a81548160ff0219169083600481111561106f57fe5b0217905550506007546040519091507f7ff56b2eb3ce318aad93d0ba39a3e4a406992a136f9554f17f6bcc43509275d190600090a260018260028111156110b257fe5b1415611394576000868152600e60205260409020600101546040516000805160206152b983398151915290600090a26000868152600e60209081526040808320600180820180548652600d8552838620600401805460ff191660029081179091556007549091559154855293829020825160a08101909352805483529384015491939284019160ff169081111561114557fe5b600281111561115057fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561117f57fe5b600481111561118a57fe5b9052506000878152600b6020526040902060060154909150841480156111c057506000868152600b602052604090206007015485115b15611231576007546000908152600d602052604090206004908101805460ff191690911790556111ef866134cc565b506000868152600b60209081526040808320600701889055600e9091528120600101556007546040516000805160206152b983398151915290600090a2611333565b60018160800151600481111561124357fe5b148015611254575083816060015110155b8015611264575084816040015111155b15611329576007546000908152600d602081815260408084206004908101805460ff1990811683179091558b8652600e808552838720805488529585528387208301805490921690921790558a85529091529054905190916000805160206152b983398151915291a26000868152600e60205260408120818155600101556112eb866134cc565b506040808201516000888152600b602052828120600780820193909355600601879055905491516000805160206152b98339815191529190a2611333565b600754925061163d565b6000868152600e6020818152604080842060010180548552600d8352818520600401805460ff191660021790558a8552929091529054905190916000805160206152b983398151915291a26007546000878152600e60205260409020600101555b60028260028111156113a257fe5b14156115fd576000868152600e6020526040812001546040516000805160206152b983398151915290600090a26000868152600e6020908152604080832080548452600d8352818420600401805460ff191660029081179091556007548255600191820154855293829020825160a0810190935280548352908101549193909284019160ff169081111561143257fe5b600281111561143d57fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff169081111561146c57fe5b600481111561147757fe5b9052506000878152600b6020526040902060060154909150841480156114ad57506000868152600b602052604090206007015485105b1561151d576007546000908152600d602052604090206004908101805460ff191690911790556114dc866134cc565b506000868152600b60209081526040808320600701889055600e90915281208101556007546040516000805160206152b983398151915290600090a26115fd565b60018160800151600481111561152f57fe5b148015611540575083816060015111155b8015611550575084816040015110155b15611329576007546000908152600d602052604090206004908101805460ff191660018302179055506000868152600e60205260409020600101546040516000805160206152b983398151915290600090a26000868152600e60205260408120818155600101556115c0866134cc565b506000868152600b60205260408082206007808201899055606085015160069092019190915554905190916000805160206152b983398151915291a25b6000868152600b6020526040902060068101546008909101546116259163ffffffff613e5e16565b6000878152600b602052604090206009015560075492505b50509392505050565b600054600160a060020a0316331461165d57600080fd5b60005460a060020a900460ff16151561167557600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b6000908152600b60208190526040909120600681015460078201546009830154600a84015494840154600c850154600d9095015493969295919460ff909216939092565b6000818152600b6020908152604080832060018101546002820154600383015460048401546005850154600886015486548851818b0281018b0190995280895260609a998a998a998a998a998a999298600160a060020a0392831698918316979390921695919490939189918301828280156117cf57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff168152602001906008019060208260070104928301926001038202915080841161178a5790505b505050505096509650965096509650965096509650919395979092949650565b60005460a060020a900460ff1681565b6000908152600d602052604090208054600182015460028301546003840154600490940154929460ff928316949193919290911690565b60055490565b600054600160a060020a0316331461185357600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a260008054600160a060020a0319169055565b600054600160a060020a031633146118b257600080fd5b60005460a060020a900460ff16156118c957600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b61191e614fed565b60005460a060020a900460ff161561193557600080fd5b6000838152600a60205260409081902081516101a081019092528054829060ff16600281111561196157fe5b600281111561196c57fe5b81528154602090910190610100900460ff16600281111561198957fe5b600281111561199457fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a0909401939192909190830182828015611a4657602002820191906000526020600020906000905b825461010083900a900460ff161515815260206001928301818104948501949093039092029101808411611a155790505b5050509183525050600582015460209091019060ff166004811115611a6757fe5b6004811115611a7257fe5b815260058201546101009004600160a060020a031660208083019190915260068301546040808401919091526007840180548251818502810185019093528083526060909401939192909190830182828015611b2157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff1681526020019060080190602082600701049283019260010382029150808411611adc5790505b5050509183525050600882015460208201526009909101546040909101529050600281516002811115611b5057fe5b14611b5a57600080fd5b600281602001516002811115611b6c57fe5b14611b7657600080fd5b6080810151821115611b8757600080fd5b8060e001516004811115611b9757fe5b60048054604080517f23eee3e6000000000000000000000000000000000000000000000000000000008152339381019390935251600160a060020a03909116916323eee3e69160248083019260209291908290030181600087803b158015611bfe57600080fd5b505af1158015611c12573d6000803e3d6000fd5b505050506040513d6020811015611c2857600080fd5b50516004811115611c3557fe5b1015611c4057600080fd5b6002546040820151600160a060020a039091169063968f600c903390611c6590610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015611cc957600080fd5b505af1158015611cdd573d6000803e3d6000fd5b505050506040513d6020811015611cf357600080fd5b5051158015611d865750600254604080830151815160e260020a6325a3d803028152600160a060020a039182166004820152336024820152915192169163968f600c916044808201926020929091908290030181600087803b158015611d5857600080fd5b505af1158015611d6c573d6000803e3d6000fd5b505050506040513d6020811015611d8257600080fd5b5051155b1515611d9157600080fd5b6002546101008201516040805160e260020a6325a3d803028152600160a060020a0392831660048201523360248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015611def57600080fd5b505af1158015611e03573d6000803e3d6000fd5b505050506040513d6020811015611e1957600080fd5b505115611e2557600080fd5b611e556001611e378360400151610c1e565b848460a001518560c00151600160008060010289610140015161399b565b50611e6783611e62611836565b6123d6565b505050565b600054600160a060020a031681565b60008054600160a060020a03163314611e9357600080fd5b6009548211611ea157600080fd5b60405182907f1bd10793763c43c1a677f0975376032cebc657fd07cfd7c58ded8e8cce79f1c490600090a250600955600190565b600554600090821115611ee757600080fd5b60026000838152600a6020526040902054610100900460ff166002811115611f0b57fe5b14611f1557600080fd5b6000828152600a6020526040902054620100009004600160a060020a03163314611f3e57600080fd5b6001546000838152600a6020908152604080832060080154815160e060020a63a9059cbb02815233600482015260248101919091529051600160a060020a039094169363a9059cbb93604480840194938390030190829087803b158015611fa457600080fd5b505af1158015611fb8573d6000803e3d6000fd5b505050506040513d6020811015611fce57600080fd5b50511515611fdb57600080fd5b6000828152600a6020526040808220805461ff0019166101001790555183917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a91a2506001919050565b600061202f615057565b6000838152600d6020908152604091829020825160a08101909352805483526001810154909183019060ff16600281111561206657fe5b600281111561207157fe5b8152600282015460208201526003820154604082015260048083015460609092019160ff16908111156120a057fe5b60048111156120ab57fe5b90525080516000908152600b6020526040902060010154909150600160a060020a03163314806120f6575080516000908152600b6020526040902060030154600160a060020a031633145b8061211c575080516000908152600b6020526040902060020154600160a060020a031633145b151561212757600080fd5b60048160800151600481111561213957fe5b141561214457600080fd5b60028160200151600281111561215657fe5b14156121e75780516000908152600b6020526040902060020154600160a060020a03163314156121a1576000838152600d60205260409020600401805460ff191660031790556121be565b6000838152600d60205260409020600401805460ff191660021790555b80516000908152600e60205260408082208290555184916000805160206152b983398151915291a25b6001816020015160028111156121f957fe5b141561228f5780516000908152600b6020526040902060020154600160a060020a0316331415612244576000838152600d60205260409020600401805460ff19166002179055612261565b6000838152600d60205260409020600401805460ff191660031790555b80516000908152600e602052604081206001015560405183906000805160206152b983398151915290600090a25b50600192915050565b6000805460a060020a900460ff16156122b057600080fd5b336122ba81610c1e565b600160a060020a0316146122cd57600080fd5b3360009081526010602052604090205460ff16156122ea57600080fd5b81600160a060020a03166122fd83610c1e565b600160a060020a03161461231057600080fd5b600160a060020a0382166000818152601160209081526040808320338085529252808320805460ff191660011790555190917fe398d33bf7e881cdfc9f34c743822904d4e45a0be0db740dd88cb132e4ce2ed991a3506001919050565b600a602052600090815260409020805460018201546002830154600384015460058501546006860154600887015460099097015460ff80881698610100808a04831699600160a060020a036201000090910481169981169897969384169591909304909216928b565b6123de614fed565b6123e6614fed565b60008054819081908190819060a060020a900460ff161561240657600080fd5b6000898152600a60205260409081902081516101a081019092528054829060ff16600281111561243257fe5b600281111561243d57fe5b81528154602090910190610100900460ff16600281111561245a57fe5b600281111561246557fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561251757602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116124e65790505b5050509183525050600582015460209091019060ff16600481111561253857fe5b600481111561254357fe5b815260058201546101009004600160a060020a0316602080830191909152600683015460408084019190915260078401805482518185028101850190935280835260609094019391929091908301828280156125f257602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116125ad5790505b5050509183525050600882015460208083019190915260099092015460409182015260008b8152600a9092529081902081516101a0810190925280549299509091829060ff16600281111561264357fe5b600281111561264e57fe5b81528154602090910190610100900460ff16600281111561266b57fe5b600281111561267657fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561272857602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116126f75790505b5050509183525050600582015460209091019060ff16600481111561274957fe5b600481111561275457fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561280357602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116127be5790505b505050918352505060088201546020820152600990910154604090910152955060028760200151600281111561283557fe5b148015612851575060028660200151600281111561284f57fe5b145b151561285c57600080fd5b6060870151600160a060020a03161580612897575061287e8660400151610c1e565b600160a060020a03168760600151600160a060020a0316145b15156128a257600080fd5b6060860151600160a060020a031615806128dd57506128c48760400151610c1e565b600160a060020a03168660600151600160a060020a0316145b15156128e857600080fd5b6002875160028111156128f757fe5b1461290157600080fd5b60018651600281111561291057fe5b1461291a57600080fd5b6002546101008701516040890151600160a060020a039092169163968f600c919061294490610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b1580156129a857600080fd5b505af11580156129bc573d6000803e3d6000fd5b505050506040513d60208110156129d257600080fd5b5051156129de57600080fd5b6002546101008701516040808a0151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612a4257600080fd5b505af1158015612a56573d6000803e3d6000fd5b505050506040513d6020811015612a6c57600080fd5b505115612a7857600080fd5b60025460408088015190890151600160a060020a039092169163968f600c9190612aa190610c1e565b6040518363ffffffff1660e060020a0281526004018083600160a060020a0316600160a060020a0316815260200182600160a060020a0316600160a060020a0316815260200192505050602060405180830381600087803b158015612b0557600080fd5b505af1158015612b19573d6000803e3d6000fd5b505050506040513d6020811015612b2f57600080fd5b505115612b3b57600080fd5b60025460408088015189820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612b9c57600080fd5b505af1158015612bb0573d6000803e3d6000fd5b505050506040513d6020811015612bc657600080fd5b505115612bd257600080fd5b600254610100880151604080890151815160e260020a6325a3d803028152600160a060020a03938416600482015290831660248201529051919092169163968f600c9160448083019260209291908290030181600087803b158015612c3657600080fd5b505af1158015612c4a573d6000803e3d6000fd5b505050506040513d6020811015612c6057600080fd5b505115612c6c57600080fd5b6002546040880151600160a060020a039091169063968f600c90612c8f90610c1e565b6040808a0151815160e060020a63ffffffff8616028152600160a060020a039384166004820152921660248301525160448083019260209291908290030181600087803b158015612cdf57600080fd5b505af1158015612cf3573d6000803e3d6000fd5b505050506040513d6020811015612d0957600080fd5b505115612d1557600080fd5b60025460408089015188820151825160e260020a6325a3d803028152600160a060020a0392831660048201529082166024820152915192169163968f600c916044808201926020929091908290030181600087803b158015612d7657600080fd5b505af1158015612d8a573d6000803e3d6000fd5b505050506040513d6020811015612da057600080fd5b505115612dac57600080fd5b60a080870151908801511115612dc157600080fd5b608080870151908801511015612dd657600080fd5b8660e001516004811115612de657fe5b600480546040808a015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612e5357600080fd5b505af1158015612e67573d6000803e3d6000fd5b505050506040513d6020811015612e7d57600080fd5b50516004811115612e8a57fe5b1015612e9557600080fd5b8560e001516004811115612ea557fe5b600480546040808b015181517f23eee3e6000000000000000000000000000000000000000000000000000000008152600160a060020a039182169481019490945290519116916323eee3e69160248083019260209291908290030181600087803b158015612f1257600080fd5b505af1158015612f26573d6000803e3d6000fd5b505050506040513d6020811015612f3c57600080fd5b50516004811115612f4957fe5b1015612f5457600080fd5b6009548760c00151511015612f7657612f708760c00151613e6b565b60c08801525b6009548660c00151511015612f9857612f928760c00151613e6b565b60c08701525b600094505b8660c0015151851015612ffe5760c0860151805186908110612fbb57fe5b906020019060200201511580612fe8575060c0870151805186908110612fdd57fe5b906020019060200201515b1515612ff357600080fd5b600190940193612f9d565b6008548761014001515110156130235761301c876101400151613ef5565b6101408801525b60085486610140015151101561304857613041866101400151613ef5565b6101408701525b600094505b866101400151518510156130be5761014086015180518690811061306d57fe5b9060200190602002015167ffffffffffffffff168761014001518681518110151561309457fe5b6020908102909101015167ffffffffffffffff1610156130b357600080fd5b60019094019361304d565b6006546130d290600163ffffffff613e5e16565b60065560408701516130e390610c1e565b60008a8152600a6020526040808220805461010061ff0019918216811783558d855283852080549092161781556006546009928301819055910155519195508a917fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a9190a260405188907fb8b459bc0688c37baf5f735d17f1711684bc14ab7db116f88bc18bf409b9309a90600090a26080870151429350600092501561319d57608086015161319a90849063ffffffff613e5e16565b91505b85610160015190506101c06040519081016040528088610140015181526020018860400151600160a060020a031681526020018760400151600160a060020a0316815260200185600160a060020a031681526020018a8152602001898152602001876080015181526020018860a0015181526020018481526020018381526020016001600281111561322b57fe5b81526020018281526020016000815260200142815250600b600060065481526020019081526020016000206000820151816000019080519060200190613272929190615083565b50602082015160018281018054600160a060020a0319908116600160a060020a0394851617909155604085015160028086018054841692861692909217909155606086015160038601805490931694169390931790556080840151600484015560a0840151600584015560c0840151600684015560e0840151600784015561010084015160088401556101208401516009840155610140840151600a840180549193909260ff199092169190849081111561332957fe5b0217905550610160820151600b820155610180820151600c8201556101a090910151600d909101556006546040517fb9ffc65567b7238dd641372277b8c93ed03df73945932dd84fd3cbb33f3eddbf90600090a2505050505050505050565b60075490565b600054600160a060020a031633146133a557600080fd5b60015460008054604080517f70a082310000000000000000000000000000000000000000000000000000000081523060048201529051600160a060020a039485169463a9059cbb9493169285926370a082319260248083019360209383900390910190829087803b15801561341957600080fd5b505af115801561342d573d6000803e3d6000fd5b505050506040513d602081101561344357600080fd5b50516040805160e060020a63ffffffff8616028152600160a060020a03909316600484015260248301919091525160448083019260209291908290030181600087803b15801561349257600080fd5b505af11580156134a6573d6000803e3d6000fd5b505050506040513d60208110156134bc57600080fd5b5050600054600160a060020a0316ff5b60006134d782613f7d565b5061228f82614670565b600060016000848152600b60205260409020600a015460ff16600281111561350557fe5b1461350f57600080fd5b6000838152600b6020526040902060010154600160a060020a031633148061355057506000838152600b6020526040902060020154600160a060020a031633145b8061357457506000838152600b6020526040902060030154600160a060020a031633145b151561357f57600080fd5b6000838152600b6020526040902060068101546008909101546135a79163ffffffff613e5e16565b42116135d3576000838152600b6020526040902060020154600160a060020a031633146135d357600080fd5b6135dd8383614ab2565b6135e683613f7d565b506135f083614c87565b6135f983614d9e565b50600190505b92915050565b6000805460a060020a900460ff161561361d57600080fd5b81600160a060020a031661363084610c1e565b600160a060020a0316148015613660575033600160a060020a0384161480613660575033600160a060020a038316145b151561366b57600080fd5b600160a060020a038084166000818152600f60205260408082208054600160a060020a031916905551928516927f7822736ed69a5fe0ad6dc2c6669e8053495d711118e5435b047f9b83deda4c379190a350600192915050565b60008054600160a060020a031633146136dd57600080fd5b5060028054600160a060020a038316600160a060020a03199091161790556001919050565b60095490565b60008060008060006060600080600060606000613723614fed565b60008d8152600a60205260409081902081516101a081019092528054829060ff16600281111561374f57fe5b600281111561375a57fe5b81528154602090910190610100900460ff16600281111561377757fe5b600281111561378257fe5b81528154600160a060020a036201000090910481166020808401919091526001840154909116604080840191909152600284015460608401526003840154608084015260048401805482518185028101850190935280835260a090940193919290919083018282801561383457602002820191906000526020600020906000905b825461010083900a900460ff1615158152602060019283018181049485019490930390920291018084116138035790505b5050509183525050600582015460209091019060ff16600481111561385557fe5b600481111561386057fe5b815260058201546101009004600160a060020a03166020808301919091526006830154604080840191909152600784018054825181850281018501909352808352606090940193919290919083018282801561390f57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116138ca5790505b5050505050815260200160088201548152602001600982015481525050905080600001518160400151826060015183608001518460a001518560c001518660e001518761010001518861012001518961014001518a61016001518595508191509b509b509b509b509b509b509b509b509b509b509b505091939597999b90929496989a50565b60065490565b6000805481908190819060a060020a900460ff16156139b957600080fd5b60018860048111156139c757fe5b10156139d257600080fd5b600954895111156139e257600080fd5b600854855111156139f257600080fd5b600092505b8451831015613a40576780000000000000008584815181101515613a1757fe5b6020908102909101015167ffffffffffffffff1610613a3557600080fd5b6001909201916139f7565b6000915060018d6002811115613a5257fe5b1415613b41578a1515613a7257613a6b8a610e10614e69565b9150613a97565b620151808b1015613a8757613a6b8a8c614e69565b613a948a62015180614e69565b91505b600154604080517f23b872dd000000000000000000000000000000000000000000000000000000008152336004820152306024820152604481018590529051600160a060020a03909216916323b872dd916064808201926020929091908290030181600087803b158015613b0a57600080fd5b505af1158015613b1e573d6000803e3d6000fd5b505050506040513d6020811015613b3457600080fd5b50511515613b4157600080fd5b600554613b5590600163ffffffff613e5e16565b6005819055604080516101a08101909152909150808e6002811115613b7657fe5b81526020016002815260200133600160a060020a031681526020018d600160a060020a031681526020018c81526020018b81526020018a8152602001896004811115613bbe57fe5b8152600160a060020a03891660208083019190915260408083018a90526060830189905260808301869052600060a0909301839052848352600a909152902081518154829060ff19166001836002811115613c1557fe5b021790555060208201518154829061ff001916610100836002811115613c3757fe5b02179055506040820151815475ffffffffffffffffffffffffffffffffffffffff0000191662010000600160a060020a03928316021782556060830151600183018054600160a060020a031916919092161790556080820151600282015560a0820151600382015560c08201518051613cba91600484019160209091019061513e565b5060e082015160058201805460ff19166001836004811115613cd857fe5b02179055506101008281015160058301805474ffffffffffffffffffffffffffffffffffffffff001916600160a060020a0390921690920217905561012082015160068201556101408201518051613d3a916007840191602090910190615083565b5061016082015160088201556101809091015160099091015560405181907fffa896d8919f0556f53ace1395617969a3b53ab5271a085e28ac0c4a3724e63d90600090a29c9b505050505050505050505050565b60008054600160a060020a03163314613da657600080fd5b6008548211613db457600080fd5b60405182907f1acf16d0a0451282e1d2cac3f5473ca7c931bcda610ff6e061041af50e2abc1390600090a250600855600190565b60008054600160a060020a03163314613e0057600080fd5b5060048054600160a060020a038316600160a060020a03199091161790556001919050565b600054600160a060020a03163314613e3c57600080fd5b613e4581614f2d565b50565b6000908152600b60205260409020600601541590565b818101828110156135ff57fe5b6060806000600954604051908082528060200260200182016040528015613e9c578160200160208202803883390190505b509150600090505b8351811015613eea578381815181101515613ebb57fe5b906020019060200201518282815181101515613ed357fe5b911515602092830290910190910152600101613ea4565b8192505b5050919050565b6060806000600854604051908082528060200260200182016040528015613f26578160200160208202803883390190505b509150600090505b8351811015613eea578381815181101515613f4557fe5b906020019060200201518282815181101515613f5d57fe5b67ffffffffffffffff909216602092830290910190910152600101613f2e565b6000613f876151df565b600060016000858152600b60205260409020600a015460ff166002811115613fab57fe5b14613fb557600080fd5b6000848152600b6020526040902060010154600160a060020a0316331480613ff657506000848152600b6020526040902060020154600160a060020a031633145b8061401a57506000848152600b6020526040902060030154600160a060020a031633145b151561402557600080fd5b6000848152600b6020908152604091829020825181546101e0938102820184019094526101c0810184815290939192849284918401828280156140bb57602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116140765790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561414957fe5b600281111561415457fe5b8152602001600b8201548152602001600c8201548152602001600d82015481525050915061418184613e48565b1580156141985750816101200151826101a0015110155b156141a65760019250613eee565b6141af84613e48565b1580156141c0575081610120015142115b80156141d55750816101200151826101a00151105b1561420b576142048260e001516141ff846101a00151856101200151614f9d90919063ffffffff16565b614e69565b905061422e565b61422b8260e001516141ff846101a0015142614f9d90919063ffffffff16565b90505b8161016001518111156145375761016082015161425290829063ffffffff614f9d16565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a03918216600482015291519216916370a08231916024808201926020929091908290030181600087803b1580156142bd57600080fd5b505af11580156142d1573d6000803e3d6000fd5b505050506040513d60208110156142e757600080fd5b5051106143ff576001546040830151610160840151600160a060020a03909216916323b872dd9190309061432290869063ffffffff614f9d16565b6040805160e060020a63ffffffff8716028152600160a060020a0394851660048201529290931660248301526044820152905160648083019260209291908290030181600087803b15801561437657600080fd5b505af115801561438a573d6000803e3d6000fd5b505050506040513d60208110156143a057600080fd5b505115156143ad57600080fd5b6143e76143c883610160015183614f9d90919063ffffffff16565b6000868152600b6020819052604090912001549063ffffffff613e5e16565b6000858152600b602081905260409091200155614537565b6000848152600b60208190526040808320909101549051909186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a361444784614c87565b60015460608301516101608401516040805160e060020a63a9059cbb028152600160a060020a039384166004820152602481019290925251919092169163a9059cbb9160448083019260209291908290030181600087803b1580156144ab57600080fd5b505af11580156144bf573d6000803e3d6000fd5b505050506040513d60208110156144d557600080fd5b505115156144e257600080fd5b6000848152600b6020526040902042600d820155610160830151600c909101546145119163ffffffff613e5e16565b6000858152600b602081905260408220600c810193909355919091015560019250613eee565b60015460608301516040805160e060020a63a9059cbb028152600160a060020a039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b15801561459557600080fd5b505af11580156145a9573d6000803e3d6000fd5b505050506040513d60208110156145bf57600080fd5b505115156145cc57600080fd5b6000848152600b6020819052604090912001546145ef908263ffffffff614f9d16565b6000858152600b6020819052604090912090810191909155600c015461461b908263ffffffff613e5e16565b6000858152600b6020526040808220600c81019390935542600d909301929092559051829186917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a35060019392505050565b60008061467b6151df565b6000848152600b60209081526040808320815181546101e0948102820185019093526101c0810183815290939192849284919084018282801561471157602002820191906000526020600020906000905b82829054906101000a900467ffffffffffffffff1667ffffffffffffffff16815260200190600801906020826007010492830192600103820291508084116146cc5790505b50505091835250506001820154600160a060020a039081166020830152600280840154821660408401526003840154909116606083015260048301546080830152600583015460a0830152600683015460c0830152600783015460e083015260088301546101008301526009830154610120830152600a8301546101409092019160ff169081111561479f57fe5b60028111156147aa57fe5b8152602001600b8201548152602001600c8201548152602001600d8201548152505091506147d785613e48565b1561480857600282610140015160028111156147ef57fe5b14156147fe5760019350614aaa565b610e109250614863565b81610120015142111561481e5760019350614aaa565b6101208201516201518090614839904263ffffffff614f9d16565b101561485c57610120820151614855904263ffffffff614f9d16565b9250614863565b6201518092505b6000858152600b60208190526040909120015460e08301516148859085614e69565b1115614aa5576148bf600b6000878152602001908152602001600020600b01546148b38460e0015186614e69565b9063ffffffff614f9d16565b60015460408085015181517f70a08231000000000000000000000000000000000000000000000000000000008152600160a060020a039182166004820152915193945084939216916370a08231916024808201926020929091908290030181600087803b15801561492f57600080fd5b505af1158015614943573d6000803e3d6000fd5b505050506040513d602081101561495957600080fd5b505110614a4a5760015460408084015181517f23b872dd000000000000000000000000000000000000000000000000000000008152600160a060020a0391821660048201523060248201526044810185905291519216916323b872dd916064808201926020929091908290030181600087803b1580156149d857600080fd5b505af11580156149ec573d6000803e3d6000fd5b505050506040513d6020811015614a0257600080fd5b50511515614a0f57600080fd5b6000858152600b602081905260409091200154614a32908263ffffffff613e5e16565b6000868152600b602081905260409091200155614aa5565b6000858152600b60208190526040808320909101549051909187917f51f87cd83a2ce6c4ff7957861f7aba400dc3857d2325e0c94cc69f468874515c9190a3614a9285614c87565b614a9b85614d9e565b5060019350614aaa565b600193505b505050919050565b6000828152600b6020526040902060020154600160a060020a0316331480614ae557506000816002811115614ae357fe5b145b1515614af057600080fd5b6001816002811115614afe57fe5b1415614bbc57600280546000848152600b602090815260408083209485015460019095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614b8a57600080fd5b505af1158015614b9e573d6000803e3d6000fd5b505050506040513d6020811015614bb457600080fd5b50614c839050565b6002816002811115614bca57fe5b1415614c8357600280546000848152600b602090815260408083209485015460039095015481517f473b736f000000000000000000000000000000000000000000000000000000008152600160a060020a03968716600482015290861660248201529051949093169363473b736f93604480820194918390030190829087803b158015614c5657600080fd5b505af1158015614c6a573d6000803e3d6000fd5b505050506040513d6020811015614c8057600080fd5b50505b5050565b60026000828152600b60205260409020600a015460ff166002811115614ca957fe5b1415614cb457613e45565b60016000828152600b60205260409020600a015460ff166002811115614cd657fe5b14614ce057600080fd5b6000818152600b6020526040902060020154600160a060020a0316331480614d2157506000818152600b6020526040902060010154600160a060020a031633145b80614d4557506000818152600b6020526040902060030154600160a060020a031633145b1515614d5057600080fd5b6000818152600b6020526040808220600a8101805460ff19166002179055426009909101555182917f0b27183934cfdbeb1fbbe288c2e163ed7aa8f458a954054970f78446bccb36e091a250565b6000818152600b602081905260408220015415614e61576001546000838152600b602081815260408084206002810154930154815160e060020a63a9059cbb028152600160a060020a03948516600482015260248101919091529051929094169363a9059cbb93604480830194928390030190829087803b158015614e2257600080fd5b505af1158015614e36573d6000803e3d6000fd5b505050506040513d6020811015614e4c57600080fd5b50506000828152600b60208190526040822001555b506001919050565b600080600360009054906101000a9004600160a060020a0316600160a060020a031663eb91d37e6040518163ffffffff1660e060020a028152600401602060405180830381600087803b158015614ebf57600080fd5b505af1158015614ed3573d6000803e3d6000fd5b505050506040513d6020811015614ee957600080fd5b50519050614f25670de0b6b3a7640000614f1985614f0d858963ffffffff614faf16565b9063ffffffff614faf16565b9063ffffffff614fd816565b949350505050565b600160a060020a0381161515614f4257600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a360008054600160a060020a031916600160a060020a0392909216919091179055565b600082821115614fa957fe5b50900390565b6000821515614fc0575060006135ff565b50818102818382811515614fd057fe5b04146135ff57fe5b60008183811515614fe557fe5b049392505050565b604080516101a081019091528060008152602001600081526000602082018190526040820181905260608083018290526080830182905260a083015260c0909101908152600060208201819052604082018190526060808301526080820181905260a09091015290565b6040805160a0810182526000808252602082018190529181018290526060810182905290608082015290565b8280548282559060005260206000209060030160049004810192821561512e5791602002820160005b838211156150f857835183826101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555092602001926008016020816007010492830192600103026150ac565b801561512c5782816101000a81549067ffffffffffffffff02191690556008016020816007010492830192600103026150f8565b505b5061513a929150615275565b5090565b82805482825590600052602060002090601f016020900481019282156151d35791602002820160005b838211156151a457835183826101000a81548160ff0219169083151502179055509260200192600101602081600001049283019260010302615167565b80156151d15782816101000a81549060ff02191690556001016020816000010492830192600103026151a4565b505b5061513a92915061529a565b6101c060405190810160405280606081526020016000600160a060020a031681526020016000600160a060020a031681526020016000600160a060020a031681526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000600281111561525a57fe5b81526020016000815260200160008152602001600081525090565b610c9091905b8082111561513a57805467ffffffffffffffff1916815560010161527b565b610c9091905b8082111561513a57805460ff191681556001016152a056004b92d35447745e95b7344414a41ae94984787d0ebcd2c12021169197bb59af39a165627a7a7230582015a4481d4af7f0151be2d0d778f76077b36f1b7a02879809dae626a9c6ceaef60029",
+  "sourceMap": "254:27107:6:-;;;268:5:13;247:26;;-1:-1:-1;;;;;;247:26:13;;;2700:21:6;;;;2728:19;;;;2754:23;;3290:486;5:2:-1;;;;30:1;27;20:12;5:2;3290:486:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;567:5:15;:18;;-1:-1:-1;;;;;;567:18:15;;;575:10;567:18;;;;;3533:19:6;;-1:-1:-1;;;;;3533:19:6;;;;;;;;;3562:2;:26;;;;;;;;;;;;;;;3598:6;:27;;;;;;;;;;;;;;;3635:2;:38;;;;;;;;;;;;;;;;;3683:18;:40;;;;3733:16;:36;254:27107;;;;;;",
+  "deployedSourceMap": "254:27107:6:-;;;;;;;;;-1:-1:-1;;;254:27107:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2955:34;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2955:34:6;;;;;;;;;;-1:-1:-1;;;;;2955:34:6;-1:-1:-1;;;;;2955:34:6;;;;;;-1:-1:-1;;;;;2955:34:6;-1:-1:-1;;;;;2955:34:6;;;;;;-1:-1:-1;;;;;2955:34:6;-1:-1:-1;;;;;2955:34:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;26494:209;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26494:209:6;-1:-1:-1;;;;;26494:209:6;;;;;;;;;;;;;;;;;;;;;;;16725:344;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16725:344:6;-1:-1:-1;;;;;16725:344:6;;;;;19392:249;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19392:249:6;-1:-1:-1;;;;;19392:249:6;;;;;;;;;-1:-1:-1;;;;;19392:249:6;;;;;;;;;;;;;;20402:102;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20402:102:6;;;;;;;;;;;;;;;;;;;;18123:251;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18123:251:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10893:4087;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10893:4087:6;;;;;;;;;838:92:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:13;;;;;;18885:501:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18885:501:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18380:499;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;18380:499:6;;;;;;;;;;;;;-1:-1:-1;;;;;18380:499:6;-1:-1:-1;;;;;18380:499:6;;;;;;-1:-1:-1;;;;;18380:499:6;-1:-1:-1;;;;;18380:499:6;;;;;;-1:-1:-1;;;;;18380:499:6;-1:-1:-1;;;;;18380:499:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;18380:499:6;;;;;;;;;;;;;;;;;;;;;;;247:26:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:13;;;;19647:457:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;19647:457:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20202:89;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20202:89:6;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;666:90:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:13;;;;5927:878:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5927:878:6;;;;;;;238:20:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;26969:246:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26969:246:6;;;;;5490:431;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5490:431:6;;;;;14986:1338;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;14986:1338:6;;;;;16362:357;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;16362:357:6;-1:-1:-1;;;;;16362:357:6;;;;;2912:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2912:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:6;;;;;;;-1:-1:-1;2912:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;2912:36:6;-1:-1:-1;;;;;;2912:36:6;6834:3240;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6834:3240:6;;;;;;;20297:99;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20297:99:6;;;;27221:138;;8:9:-1;5:2;;;30:1;27;20:12;5:2;27221:138:6;;;;10741:146;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10741:146:6;;;;;10080:655;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10080:655:6;;;;;;;;;17075:300;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17075:300:6;-1:-1:-1;;;;;17075:300:6;;;;;;;;;;26351:137;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26351:137:6;-1:-1:-1;;;;;26351:137:6;;;;;20510:98;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20510:98:6;;;;17397:719;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;17397:719:6;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17397:719:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17397:719:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17397:719:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;17397:719:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;20110:86;;8:9:-1;5:2;;;30:1;27;20:12;5:2;20110:86:6;;;;3823:1661;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3823:1661:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3823:1661:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3823:1661:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3823:1661:6;;;;;;;;;-1:-1:-1;3823:1661:6;-1:-1:-1;3823:1661:6;;;;;-1:-1:-1;3823:1661:6;;-1:-1:-1;3823:1661:6;;;;;;;;;;;;;;-1:-1:-1;3823:1661:6;;-1:-1:-1;3823:1661:6;;-1:-1:-1;;;;;;;3823:1661:6;26709:254;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26709:254:6;;;;;26196:149;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;26196:149:6;-1:-1:-1;;;;;26196:149:6;;;;;1274:103:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;2955:34:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2955:34:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;26494:209::-;26566:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;26600:10:6;-1:-1:-1;;;;;26590:37:6;;:39;;;;;-1:-1:-1;;;26590:39:6;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26590:39:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;26590:39:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;26590:39:6;:44;;26582:53;;;;;;-1:-1:-1;26645:6:6;:30;;-1:-1:-1;;;;;;26645:30:6;-1:-1:-1;;;;;26645:30:6;;;;;-1:-1:-1;731:1:15;26494:209:6;;;:::o;16725:344::-;16795:4;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;16833:10:6;16819:25;;;;:13;:25;;;;;;;;-1:-1:-1;;;;;16819:34:6;;;;;;;;;;;;:42;;:34;:42;16811:51;;;;;;-1:-1:-1;;;;;16872:17:6;;;;;;:8;:17;;;;;;;;:30;;-1:-1:-1;;;;;;16872:30:6;16892:10;16872:30;;;;;;16912:20;;;:8;:20;;;;;:27;;-1:-1:-1;;16912:27:6;;;16872:30;16912:27;;;;16956:13;:25;;;;;:34;;;;;;;;;16949:41;;;;;;;;17005:36;16892:10;;16872:17;17005:36;;;-1:-1:-1;17058:4:6;16725:344;;;:::o;19392:249::-;-1:-1:-1;;;;;19479:17:6;;;19449:14;19479:17;;;:8;:17;;;;;;19449:14;;19479:17;:24;;:56;;-1:-1:-1;;;;;;19507:28:6;;;:17;;;;:8;:17;;;;;;;;;:28;19479:56;19475:160;;;-1:-1:-1;19560:7:6;19475:160;;;-1:-1:-1;;;;;;19607:17:6;;;;;;;:8;:17;;;;;;;;19392:249::o;20402:102::-;20479:18;;20402:102;;:::o;18123:251::-;18195:23;18228:11;18255:18;;:::i;:::-;18276:15;;;;:6;:15;;;;;;;18255:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;18255:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;18255:36:6;;;-1:-1:-1;;18255:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;18255:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18318:5;:17;;;18345:5;:12;;;18301:66;;;;18123:251;;;;:::o;10893:4087::-;10984:20;11354:21;12008:36;;:::i;:::-;11038:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11038:24:6;11024:10;:38;;:78;;-1:-1:-1;11080:13:6;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;11080:22:6;11066:10;:36;11024:78;:120;;;-1:-1:-1;11120:13:6;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11120:24:6;11106:10;:38;11024:120;11016:129;;;;;;;;11187:26;11163:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;11155:59;;;;;;11229:14;11236:6;11229;:14::i;:::-;11225:70;;;11267:16;;11259:25;;;;;;11322:14;;:21;;11341:1;11322:21;:18;:21;:::i;:::-;11305:14;:38;11404:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;11404:24:6;11390:10;:38;11386:166;;;11458:19;11444:33;;11386:166;;;11522:19;11508:33;;11386:166;11589:88;;;;;;;;;11603:6;11589:88;;;;11611:11;11589:88;;;;;;;;;;;;;;;;;;;;;;;;11647:29;11589:88;;11571:14;;11562:24;;;;:8;:24;;;;;;;;:115;;;;;;;;;;;;;;;;-1:-1:-1;;11562:115:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;11713:14:6;;11692:36;;11713:14;;-1:-1:-1;11692:36:6;;;;;11758:19;11743:11;:34;;;;;;;;;11739:1719;;;11823:22;;;;:14;:22;;;;;11846:1;11823:25;;11798:51;;-1:-1:-1;;;;;;;;;;;11798:51:6;;;;11863:35;11872:22;;;:14;:22;;;;;;;;11895:1;11872:25;;;;;11863:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;11863:75:6;11908:30;11863:75;;;;;;11980:14;;11952:42;;;12056:25;;12047:35;;;;;;12008:74;;;;;;;;;;;;;;;;;;12047:35;12008:74;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;12116:13:6;;;;:5;:13;;;;;:22;;;12008:74;;-1:-1:-1;12101:37:6;;:71;;;;-1:-1:-1;12153:13:6;;;;:5;:13;;;;;:19;;;12142:30;;12101:71;12097:1135;;;12201:14;;12192:24;;;;:8;:24;;;;;12226:30;12192:31;;;:64;;-1:-1:-1;;12192:64:6;;;;;;12274:12;12279:6;12274:4;:12::i;:::-;-1:-1:-1;12304:13:6;;;;:5;:13;;;;;;;;:19;;:30;;;12352:14;:22;;;;;12375:1;12352:25;:29;12429:14;;12404:40;;-1:-1:-1;;;;;;;;;;;12404:40:6;;;;12097:1135;;;12495:29;12469:15;:22;;;:55;;;;;;;;;:98;;;;;12556:11;12528:15;:24;;;:39;;12469:98;:135;;;;;12596:8;12571:15;:21;;;:33;;12469:135;12465:767;;;12633:14;;12624:24;;;;:8;:24;;;;;;;;12658:30;12624:31;;;:64;;-1:-1:-1;;12624:64:6;;;;;;;;12715:22;;;:14;:22;;;;;;:25;;12706:35;;;;;;;;:42;;:75;;;;;;;;;;12829:22;;;;;;:25;;12804:51;;12829:25;;-1:-1:-1;;;;;;;;;;;12804:51:6;;12901:1;12873:22;;;:14;:22;;;;;:29;;;12943:1;12920:25;:29;12967:12;12873:22;12967:4;:12::i;:::-;-1:-1:-1;13019:21:6;;;;;12997:13;;;;:5;:13;;;;;:19;;;;:43;;;;13058:22;;:36;;;13142:14;;13117:40;;-1:-1:-1;;;;;;;;;;;13117:40:6;12997:13;13117:40;12465:767;;;13203:14;;13196:21;;;;12465:767;13246:35;13255:22;;;:14;:22;;;;;;;;13278:1;13255:25;;;13246:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;13246:75:6;13291:30;13246:75;;;13365:22;;;;;;;:25;;13340:51;;13365:25;;-1:-1:-1;;;;;;;;;;;13340:51:6;;13433:14;;13405:22;;;;:14;:22;;;;;13428:1;13405:25;:42;11739:1719;13487:19;13472:11;:34;;;;;;;;;13468:1389;;;13552:22;;;;:14;:22;;;;;:25;;13527:51;;-1:-1:-1;;;;;;;;;;;13527:51:6;;;;13592:35;13601:22;;;:14;:22;;;;;;;;:25;;13592:35;;:8;:35;;;;;:42;;:75;;-1:-1:-1;;13592:75:6;13637:30;13592:75;;;;;;13709:14;;13681:42;;-1:-1:-1;13764:25:6;;;;13755:35;;;;;;13737:53;;;;;;;;;;;;;;;;;;13755:35;;13737:53;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;13824:13:6;;;;:5;:13;;;;;:22;;;13737:53;;-1:-1:-1;13809:37:6;;:71;;;;-1:-1:-1;13861:13:6;;;;:5;:13;;;;;:19;;;13850:30;;13809:71;13805:1042;;;13909:14;;13900:24;;;;:8;:24;;;;;13934:30;13900:31;;;:64;;-1:-1:-1;;13900:64:6;;;;;;13982:12;13987:6;13982:4;:12::i;:::-;-1:-1:-1;14012:13:6;;;;:5;:13;;;;;;;;:19;;:30;;;14060:14;:22;;;;;14012:13;14060:25;:29;14137:14;;14112:40;;-1:-1:-1;;;;;;;;;;;14112:40:6;;;;13805:1042;;;14203:29;14177:15;:22;;;:55;;;;;;;;;:98;;;;;14264:11;14236:15;:24;;;:39;;14177:98;:135;;;;;14304:8;14279:15;:21;;;:33;;14177:135;14173:674;;;14341:14;;14332:24;;;;:8;:24;;;;;14366:30;14332:31;;;:64;;-1:-1:-1;;14332:64:6;;14366:30;14332:64;;;;-1:-1:-1;14444:22:6;;;;:14;:22;;;;;14467:1;14444:25;;14419:51;;-1:-1:-1;;;;;;;;;;;14419:51:6;;;;14516:1;14488:22;;;:14;:22;;;;;:29;;;14558:1;14535:25;:29;14582:12;14488:22;14582:4;:12::i;:::-;-1:-1:-1;14612:13:6;;;;:5;:13;;;;;;:19;;;;:30;;;14685:24;;;;14660:22;;;;:49;;;;14757:14;14732:40;;14757:14;;-1:-1:-1;;;;;;;;;;;14732:40:6;;14173:674;14919:13;;;;:5;:13;;;;;:22;;;;14891:23;;;;;:51;;;:27;:51;:::i;:::-;14867:13;;;;:5;:13;;;;;:21;;:75;14959:14;;;-1:-1:-1;10893:4087:6;;;;;;;;:::o;838:92:13:-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;568:6:13;;-1:-1:-1;;;568:6:13;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:13;;;916:9;;;;900:5;916:9;838:92::o;18885:501:6:-;18955:13;19150;;;:5;:13;;;;;;;;:22;;;;19182:19;;;;19211:21;;;;19242:20;;;;19272:28;;;;19310:25;;;;19345:24;;;;;19150:22;;19182:19;;19211:21;;19242:20;;;;;19272:28;;18885:501::o;18380:499::-;18477:18;18646:13;;;:5;:13;;;;;;;;18680:24;;;;18714;;;;18748:22;;;;18780:19;;;;18809;;;;18838:23;;;;18629:243;;;;;;;;;;;;;;;;;18448:19;;18477:18;;;;;;;;;;;18646:13;;-1:-1:-1;;;;;18680:24:6;;;;18714;;;;18748:22;;;;;18780:19;;18809;;18629:243;18646:13;;18629:243;;18646:13;18629:243;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;18380:499;;;;;;;;;:::o;247:26:13:-;;;-1:-1:-1;;;247:26:13;;;;;:::o;19647:457:6:-;19733:11;19881:25;;;:8;:25;;;;;:32;;19923:37;;;;19970:31;;;;20011:34;;;;20055:32;;;;;19881;;19923:37;;;;;19970:31;;20011:34;;20055:32;;;;19647:457::o;20202:89::-;20272:12;;20202:89;:::o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;;;;;1089:18:15;;;1001:111::o;666:90:13:-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:13;-1:-1:-1;;;720:13:13;;;744:7;;;;720:6;744:7;666:90::o;5927:878:6:-;6009:16;;:::i;:::-;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;6028:13:6;;;;:6;:13;;;;;;;6009:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6009:32:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6009:32:6;;;-1:-1:-1;;6009:32:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6009:32:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6009:32:6;;;-1:-1:-1;;6009:32:6;;;;;;;;;;;;;;;;;;;-1:-1:-1;6076:19:6;6059:13;;:36;;;;;;;;;6051:45;;;;;;6133:24;6114:3;:15;;;:43;;;;;;;;;6106:52;;;;;;6177:12;;;;:30;-1:-1:-1;6177:30:6;6169:39;;;;;;6260:3;:17;;;6226:51;;;;;;;;:2;;;:30;;;;;;6245:10;6226:30;;;;;;;;-1:-1:-1;;;;;6226:2:6;;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;6226:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6226:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6226:30:6;:51;;;;;;;;;;6218:60;;;;;;6296:2;;6327:10;;;;-1:-1:-1;;;;;6296:2:6;;;;:8;;6305:10;;6317:21;;:9;:21::i;:::-;6296:43;;;;;-1:-1:-1;;;6296:43:6;;;;;;;-1:-1:-1;;;;;6296:43:6;-1:-1:-1;;;;;6296:43:6;;;;;;-1:-1:-1;;;;;6296:43:6;-1:-1:-1;;;;;6296:43:6;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6296:43:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6296:43:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6296:43:6;:52;;;:97;;-1:-1:-1;6352:2:6;;6361:10;;;;;6352:32;;-1:-1:-1;;;;;6352:32:6;;-1:-1:-1;;;;;6352:32:6;;;;;;;6373:10;6352:32;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;6352:32:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6352:32:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6352:32:6;:41;6296:97;6288:106;;;;;;;;6412:2;;;6421:13;;;6412:35;;;-1:-1:-1;;;;;6412:35:6;;-1:-1:-1;;;;;6412:35:6;;;;;;;6436:10;6412:35;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;6412:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6412:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6412:35:6;:44;6404:53;;;;;;6468:285;6492:19;6525:21;6535:3;:10;;;6525:9;:21::i;:::-;6560:14;6588:3;:9;;;6611:3;:12;;;6637:39;6698:1;6722;6714:10;;6738:3;:14;;;6468:10;:285::i;:::-;;6764:34;6773:5;6780:17;:15;:17::i;:::-;6764:8;:34::i;:::-;5927:878;;;:::o;238:20:15:-;;;-1:-1:-1;;;;;238:20:15;;:::o;26969:246:6:-;27043:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;27082:16:6;;27067:31;;27059:40;;;;;;27114:32;;27133:12;;27114:32;;;;;-1:-1:-1;27156:16:6;:31;27204:4;;26969:246::o;5490:431::-;5575:12;;5541:4;;5564:23;;;5556:32;;;;;;5637:24;5606:15;;;;:6;:15;;;;;:27;;;;;;:55;;;;;;;;;5598:64;;;;;;5680:15;;;;:6;:15;;;;;:22;;;;-1:-1:-1;;;;;5680:22:6;5706:10;5680:36;5672:45;;;;;;5736:5;;;5763:15;;;:6;:15;;;;;;;;:25;;;5736:53;;-1:-1:-1;;;;;5736:53:6;;5751:10;5736:53;;;;;;;;;;;;;-1:-1:-1;;;;;5736:5:6;;;;:14;;:53;;;;;5763:15;5736:53;;;;;;;:5;:53;;;5:2:-1;;;;30:1;27;20:12;5:2;5736:53:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5736:53:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5736:53:6;5728:62;;;;;;;;5800:15;;;;:6;:15;;;;;;:56;;-1:-1:-1;;5800:56:6;;;;;5872:21;5800:15;;5872:21;;;-1:-1:-1;5910:4:6;5490:431;;;:::o;14986:1338::-;15053:4;15069:28;;:::i;:::-;15100:25;;;;:8;:25;;;;;;;;;15069:56;;;;;;;;;;;;;;;;15100:25;;15069:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;15177:14:6;;15171:21;;;;:5;:21;;;;;:32;;;15177:14;;-1:-1:-1;;;;;;15171:32:6;15157:10;:46;;:106;;-1:-1:-1;15239:14:6;;15233:21;;;;:5;:21;;;;;:30;;;-1:-1:-1;;;;;15233:30:6;15219:10;:44;15157:106;:168;;;-1:-1:-1;15299:14:6;;15293:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15293:32:6;15279:10;:46;15157:168;15136:199;;;;;;;;15371:30;15353:7;:14;;;:48;;;;;;;;;;15345:57;;;;;;15440:19;15417:7;:19;;;:42;;;;;;;;;15413:437;;;15499:14;;15493:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15493:32:6;15479:10;:46;15475:254;;;15545:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15545:65:6;15580:30;15545:65;;;15475:254;;;15649:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15649:65:6;15684:30;15649:65;;;15475:254;15757:14;;15778:1;15742:30;;;:14;:30;;;;;;:37;;;15798:41;15823:15;;-1:-1:-1;;;;;;;;;;;15798:41:6;;15413:437;15887:19;15864:7;:19;;;:42;;;;;;;;;15860:437;;;15946:14;;15940:21;;;;:5;:21;;;;;:32;;;-1:-1:-1;;;;;15940:32:6;15926:10;:46;15922:254;;;15992:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;15992:65:6;16027:30;15992:65;;;15922:254;;;16096:25;;;;:8;:25;;;;;:32;;:65;;-1:-1:-1;;16096:65:6;16131:30;16096:65;;;15922:254;16204:14;;16225:1;16189:30;;;:14;:30;;;;;16220:1;16189:33;:37;16245:41;;16270:15;;-1:-1:-1;;;;;;;;;;;16245:41:6;;;;15860:437;-1:-1:-1;16313:4:6;;14986:1338;-1:-1:-1;;14986:1338:6:o;16362:357::-;16433:4;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;16482:10:6;16457:21;16482:10;16457:9;:21::i;:::-;-1:-1:-1;;;;;16457:35:6;;16449:44;;;;;;16520:10;16511:20;;;;:8;:20;;;;;;;;:29;16503:38;;;;;;16581:7;-1:-1:-1;;;;;16559:29:6;:18;16569:7;16559:9;:18::i;:::-;-1:-1:-1;;;;;16559:29:6;;16551:38;;;;;;-1:-1:-1;;;;;16599:22:6;;;;;;:13;:22;;;;;;;;16622:10;16599:34;;;;;;;;:41;;-1:-1:-1;;16599:41:6;16636:4;16599:41;;;16655:36;16622:10;;16655:36;;;-1:-1:-1;16708:4:6;16362:357;;;:::o;2912:36::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2912:36:6;;;;;;;;;;;;;;;;;;;;;;;;;:::o;6834:3240::-;6909:16;;:::i;:::-;6952;;:::i;:::-;8360:6;416::13;;8360::6;;;;;;;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;6928:14:6;;;;:6;:14;;;;;;;6909:33;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6909:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6909:33:6;;;-1:-1:-1;;6909:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6909:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6909:33:6;;;-1:-1:-1;;6909:33:6;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6971:14:6;;;:6;:14;;;;;;;6952:33;;;;;;;;;;6909;;-1:-1:-1;6952:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6952:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6952:33:6;;;-1:-1:-1;;6952:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;6952:33:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;6952:33:6;;;-1:-1:-1;;6952:33:6;;;;;;;;;;;;;;;;;;;-1:-1:-1;7023:24:6;7004:3;:15;;;:43;;;;;;;;;:90;;;;-1:-1:-1;7070:24:6;7051:3;:15;;;:43;;;;;;;;;7004:90;6996:99;;;;;;;;7113:16;;;;-1:-1:-1;;;;;7113:23:6;;;:68;;;7160:21;7170:3;:10;;;7160:9;:21::i;:::-;-1:-1:-1;;;;;7140:41:6;:3;:16;;;-1:-1:-1;;;;;7140:41:6;;7113:68;7105:77;;;;;;;;7200:16;;;;-1:-1:-1;;;;;7200:23:6;;;:68;;;7247:21;7257:3;:10;;;7247:9;:21::i;:::-;-1:-1:-1;;;;;7227:41:6;:3;:16;;;-1:-1:-1;;;;;7227:41:6;;7200:68;7192:77;;;;;;;;7304:19;7287:13;;:36;;;;;;;;;7279:45;;;;;;7359:19;7342:13;;:36;;;;;;;;;7334:45;;;;;;7397:2;;;7406:13;;;7431:10;;;;-1:-1:-1;;;;;7397:2:6;;;;:8;;7406:13;7421:21;;:9;:21::i;:::-;7397:46;;;;;-1:-1:-1;;;7397:46:6;;;;;;;-1:-1:-1;;;;;7397:46:6;-1:-1:-1;;;;;7397:46:6;;;;;;-1:-1:-1;;;;;7397:46:6;-1:-1:-1;;;;;7397:46:6;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7397:46:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7397:46:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7397:46:6;:55;7389:64;;;;;;7471:2;;;7480:13;;;7495:10;;;;;7471:35;;-1:-1:-1;;;;;7471:35:6;;-1:-1:-1;;;;;7471:35:6;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7471:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7471:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7471:35:6;:44;7463:53;;;;;;7534:2;;7543:10;;;;;7565;;;;-1:-1:-1;;;;;7534:2:6;;;;:8;;7543:10;7555:21;;:9;:21::i;:::-;7534:43;;;;;-1:-1:-1;;;7534:43:6;;;;;;;-1:-1:-1;;;;;7534:43:6;-1:-1:-1;;;;;7534:43:6;;;;;;-1:-1:-1;;;;;7534:43:6;-1:-1:-1;;;;;7534:43:6;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7534:43:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7534:43:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7534:43:6;:52;7526:61;;;;;;7605:2;;7614:10;;;;;7626;;;;7605:32;;-1:-1:-1;;;;;7605:32:6;;-1:-1:-1;;;;;7605:32:6;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7605:32:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7605:32:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7605:32:6;:41;7597:50;;;;;;7665:2;;;7674:13;;;7689:10;;;;;7665:35;;-1:-1:-1;;;;;7665:35:6;;-1:-1:-1;;;;;7665:35:6;;;;;;;;;;;;;;;;:2;;;;;:8;;:35;;;;;;;;;;;;;;:2;;:35;;;5:2:-1;;;;30:1;27;20:12;5:2;7665:35:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7665:35:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7665:35:6;:44;7657:53;;;;;;7728:2;;7747:10;;;;-1:-1:-1;;;;;7728:2:6;;;;:8;;7737:21;;:9;:21::i;:::-;7760:10;;;;;7728:43;;-1:-1:-1;;;7728:43:6;;;;;;-1:-1:-1;;;;;7728:43:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;7728:43:6;;;;5:2:-1;;;;30:1;27;20:12;5:2;7728:43:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7728:43:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7728:43:6;:52;7720:61;;;;;;7799:2;;7808:10;;;;;7820;;;;7799:32;;-1:-1:-1;;;;;7799:32:6;;-1:-1:-1;;;;;7799:32:6;;;;;;;;;;;;;;;;:2;;;:8;;:32;;;;;;;;;;;;;;;:2;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;7799:32:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7799:32:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7799:32:6;:41;7791:50;;;;;;7872:9;;;;;7859;;;;:22;;7851:31;;;;;;7916:12;;;;;7900;;;;:28;;7892:37;;;;;;8012:3;:17;;;7978:51;;;;;;;;:2;;;7997:10;;;;;7978:30;;;;;-1:-1:-1;;;;;7978:30:6;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;7978:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7978:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;7978:30:6;:51;;;;;;;;;;7970:60;;;;;;8082:3;:17;;;8048:51;;;;;;;;:2;;;8067:10;;;;;8048:30;;;;;-1:-1:-1;;;;;8048:30:6;;;;;;;;;;;;:2;;;:18;;:30;;;;;;;;;;;;;;:2;;:30;;;5:2:-1;;;;30:1;27;20:12;5:2;8048:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8048:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;8048:30:6;:51;;;;;;;;;;8040:60;;;;;;8137:16;;8115:3;:12;;;:19;:38;8111:112;;;8184:28;8199:3;:12;;;8184:14;:28::i;:::-;8169:12;;;:43;8111:112;8259:16;;8237:3;:12;;;:19;:38;8233:112;;;8306:28;8321:3;:12;;;8306:14;:28::i;:::-;8291:12;;;:43;8233:112;8369:1;8360:10;;8355:254;8376:3;:12;;;:19;8372:1;:23;8355:254;;;8563:12;;;;:15;;8576:1;;8563:15;;;;;;;;;;;;;;8562:16;:35;;;-1:-1:-1;8582:12:6;;;;:15;;8595:1;;8582:15;;;;;;;;;;;;;;8562:35;8554:44;;;;;;;;8397:3;;;;;8355:254;;;8647:18;;8623:3;:14;;;:21;:42;8619:122;;;8698:32;8715:3;:14;;;8698:16;:32::i;:::-;8681:14;;;:49;8619:122;8779:18;;8755:3;:14;;;:21;:42;8751:122;;;8830:32;8847:3;:14;;;8830:16;:32::i;:::-;8813:14;;;:49;8751:122;8892:1;8888:5;;8883:116;8899:3;:14;;;:21;8895:1;:25;8883:116;;;8970:14;;;;:17;;8985:1;;8970:17;;;;;;;;;;;;;;8949:38;;:3;:14;;;8964:1;8949:17;;;;;;;;;;;;;;;;;;;:38;;;;8941:47;;;;;;8922:3;;;;;8883:116;;;9022:10;;:17;;9037:1;9022:17;:14;:17;:::i;:::-;9009:10;:30;9076:10;;;;9066:21;;:9;:21::i;:::-;9097:14;;;;:6;:14;;;;;;:55;;;-1:-1:-1;;9097:55:6;;;;;;;9162:14;;;;;;:55;;;;;;;;9251:10;;9227:21;;;;:34;;;9271:21;;:34;9321:20;9049:38;;-1:-1:-1;9097:14:6;;9321:20;;9097:14;9321:20;9356;;9369:6;;9356:20;;;;;9520:12;;;;9404:15;;-1:-1:-1;9444:1:6;;-1:-1:-1;9520:17:6;9516:85;;9577:12;;;;9563:27;;:9;;:27;:13;:27;:::i;:::-;9553:37;;9516:85;9632:3;:13;;;9610:35;;9675:355;;;;;;;;;9693:3;:14;;;9675:355;;;;9721:3;:10;;;-1:-1:-1;;;;;9675:355:6;;;;;9745:3;:10;;;-1:-1:-1;;;;;9675:355:6;;;;;9769:6;-1:-1:-1;;;;;9675:355:6;;;;;9789:6;9675:355;;;;9809:6;9675:355;;;;9829:3;:12;;;9675:355;;;;9855:3;:9;;;9675:355;;;;9878:9;9675:355;;;;9901:7;9675:355;;;;9922:26;9675:355;;;;;;;;;;;;9962:14;9675:355;;;;9990:1;9675:355;;;;10005:15;9675:355;;;9655:5;:17;9661:10;;9655:17;;;;;;;;;;;:375;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;9655:375:6;;;;;;;;;;-1:-1:-1;;;;;;9655:375:6;;;-1:-1:-1;;;;;9655:375:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;9655:375:6;;;;;;;;;;;;;;;;;;-1:-1:-1;9655:375:6;;;;;;;;;;;;;;;;;;;;;;;;;;10056:10;;10045:22;;;;-1:-1:-1;;10045:22:6;6834:3240;;;;;;;;;:::o;20297:99::-;20375:14;;20297:99;:::o;27221:138::-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;27270:5:6;;;27285;;27292:30;;;;;;27316:4;27292:30;;;;;;-1:-1:-1;;;;;27270:5:6;;;;:14;;27285:5;;;27270;;27292:15;;:30;;;;;;;;;;;;;;;;27270:5;27292:30;;;5:2:-1;;;;30:1;27;20:12;5:2;27292:30:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;27292:30:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;27292:30:6;27270:53;;;-1:-1:-1;;;27270:53:6;;;;;;-1:-1:-1;;;;;27270:53:6;;;;;;;;;;;;;;;;;;;;27292:30;;27270:53;;;;;;;-1:-1:-1;27270:53:6;;;;5:2:-1;;;;30:1;27;20:12;5:2;27270:53:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;27270:53:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;27346:5:6;;-1:-1:-1;;;;;27346:5:6;27333:19;10741:146;10784:4;10799:20;10812:6;10799:12;:20::i;:::-;;10829:30;10852:6;10829:22;:30::i;10080:655::-;10157:4;10205:26;10181:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;10172:61;;;;;;10265:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10265:24:6;10251:10;:38;;:80;;-1:-1:-1;10307:13:6;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10307:24:6;10293:10;:38;10251:80;:120;;;-1:-1:-1;10349:13:6;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;10349:22:6;10335:10;:36;10251:120;10243:129;;;;;;;;10434:13;;;;:5;:13;;;;;:22;;;;10406:23;;;;;:51;;;:27;:51;:::i;:::-;10387:15;:70;10383:177;;10510:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;10510:24:6;10538:10;10510:38;10502:47;;;;;;10569:35;10584:6;10592:11;10569:14;:35::i;:::-;10614:20;10627:6;10614:12;:20::i;:::-;;10644:25;10662:6;10644:17;:25::i;:::-;10679:28;10700:6;10679:20;:28::i;:::-;;10724:4;10717:11;;10080:655;;;;;:::o;17075:300::-;17161:4;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;17207:7:6;-1:-1:-1;;;;;17185:29:6;:18;17195:7;17185:9;:18::i;:::-;-1:-1:-1;;;;;17185:29:6;;:81;;;;-1:-1:-1;17219:10:6;-1:-1:-1;;;;;17219:21:6;;;;:46;;-1:-1:-1;17244:10:6;-1:-1:-1;;;;;17244:21:6;;;17219:46;17177:90;;;;;;;;-1:-1:-1;;;;;17284:17:6;;;;;;;:8;:17;;;;;;17277:24;;-1:-1:-1;;;;;;17277:24:6;;;17316:31;;;;;;;17284:17;17316:31;-1:-1:-1;17364:4:6;17075:300;;;;:::o;26351:137::-;26422:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;26438:2:6;:22;;-1:-1:-1;;;;;26438:22:6;;-1:-1:-1;;;;;;26438:22:6;;;;;;;26351:137;;;:::o;20510:98::-;20585:16;;20510:98;:::o;17397:719::-;17467:19;17496:14;17520:20;17550:13;17573:10;17593:15;17618:43;17671:17;17698:11;17719:19;17748:14;17778:18;;:::i;:::-;17799:15;;;;:6;:15;;;;;;;17778:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17778:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;17778:36:6;;;-1:-1:-1;;17778:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;17778:36:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;17841:5;:15;;;17866:5;:12;;;17888:5;:18;;;17916:5;:14;;;17940:5;:11;;;17961:5;:14;;;17985:5;:19;;;18014:5;:15;;;18039:5;:9;;;18058:5;:16;;;18084:5;:15;;;17824:285;;;;;;;;;;;;;;;;;;;;;;;;;;;;17397:719;;;;;;;;;;;;;;:::o;20110:86::-;20179:10;;20110:86;:::o;3823:1661::-;4148:4;416:6:13;;4148:4:6;;;;;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;4190:39:6;4172:14;:57;;;;;;;;;;4164:66;;;;;;4268:16;;4248;;:36;;4240:45;;;;;;4325:18;;4303;;:40;;4295:49;;;;;;4369:1;4360:10;;4355:117;4376:11;:18;4372:1;:22;4355:117;;;2603:7;4423:11;4435:1;4423:14;;;;;;;;;;;;;;;;;;;:37;;;4415:46;;;;;;4396:3;;;;;4355:117;;;4499:1;;-1:-1:-1;4529:19:6;4515:10;:33;;;;;;;;;4511:463;;;4568:14;;4564:291;;;4614:33;4631:6;4639:7;4614:16;:33::i;:::-;4602:45;;4564:291;;;4684:6;4672:9;:18;4668:187;;;4722:35;4739:6;4747:9;4722:16;:35::i;4668:187::-;4808:32;4825:6;4833;4808:16;:32::i;:::-;4796:44;;4668:187;4915:5;;:47;;;;;;4934:10;4915:47;;;;4946:4;4915:47;;;;;;;;;;;;-1:-1:-1;;;;;4915:5:6;;;;:18;;:47;;;;;;;;;;;;;;;:5;;:47;;;5:2:-1;;;;30:1;27;20:12;5:2;4915:47:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4915:47:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4915:47:6;4907:56;;;;;;;;4999:12;;:19;;5016:1;4999:19;:16;:19;:::i;:::-;4984:12;:34;;;5087:330;;;;;;;;;4984:34;;-1:-1:-1;5087:330:6;5106:10;5087:330;;;;;;;;;;;;5130:24;5087:330;;;;5168:10;-1:-1:-1;;;;;5087:330:6;;;;;5192:16;-1:-1:-1;;;;;5087:330:6;;;;;5222:9;5087:330;;;;5245:6;5087:330;;;;5265:9;5087:330;;;;5288:14;5087:330;;;;;;;;;;-1:-1:-1;;;;;5087:330:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5087:330:6;;;;;;;5069:15;;;:6;:15;;;;;:348;;;;:15;;-1:-1:-1;;5069:348:6;;;;;;;;;;;;;;;-1:-1:-1;5069:348:6;;;;;;;;-1:-1:-1;;5069:348:6;;;;;;;;;;;;;;;-1:-1:-1;5069:348:6;;;;;;-1:-1:-1;;5069:348:6;;-1:-1:-1;;;;;5069:348:6;;;;;;;;;;;-1:-1:-1;5069:348:6;;;;-1:-1:-1;;;;;;5069:348:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;5069:348:6;;;;;;;;;-1:-1:-1;;5069:348:6;;;;;;;;;;;;;;;-1:-1:-1;5069:348:6;;;;;;;;;;-1:-1:-1;;5069:348:6;-1:-1:-1;;;;;5069:348:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;5069:348:6;;;;;;;;;;;;;;;;;;5433:20;;5445:7;;5433:20;;-1:-1:-1;;5433:20:6;5470:7;3823:1661;-1:-1:-1;;;;;;;;;;;;3823:1661:6:o;26709:254::-;26785:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;26824:18:6;;26809:33;;26801:42;;;;;;26858:34;;26879:12;;26858:34;;;;;-1:-1:-1;26902:18:6;:33;26952:4;;26709:254::o;26196:149::-;26273:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;26289:2:6;:28;;-1:-1:-1;;;;;26289:28:6;;-1:-1:-1;;;;;;26289:28:6;;;;;;;26196:149;;;:::o;1274:103:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;24291:108:6:-;24343:4;24365:13;;;:5;:13;;;;;:22;;;:27;;24291:108::o;1238:128:14:-;1319:7;;;1339;;;;1332:15;;;25902:272:6;25967:6;25985:22;26053:6;26021:16;;26010:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;26010:28:6;;25985:53;;26062:1;26053:10;;26048:95;26069:9;:16;26065:1;:20;26048:95;;;26120:9;26130:1;26120:12;;;;;;;;;;;;;;;;;;26106:8;26115:1;26106:11;;;;;;;;;;:26;;;:11;;;;;;;;;;:26;26087:3;;26048:95;;;26159:8;26152:15;;25902:272;;;;;;:::o;25600:296::-;25671:8;25691:26;25767:6;25733:18;;25720:32;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;25720:32:6;;25691:61;;25776:1;25767:10;;25762:101;25783:11;:18;25779:1;:22;25762:101;;;25838:11;25850:1;25838:14;;;;;;;;;;;;;;;;;;25822:10;25833:1;25822:13;;;;;;;;;;:30;;;;:13;;;;;;;;;;:30;25803:3;;25762:101;;20632:1975;20685:4;20908:16;;:::i;:::-;20951:15;20732:26;20708:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;20700:59;;;;;;20791:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20791:24:6;20777:10;:38;;:80;;-1:-1:-1;20833:13:6;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;20833:24:6;20819:10;:38;20777:80;:120;;;-1:-1:-1;20875:13:6;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;20875:22:6;20861:10;:36;20777:120;20769:129;;;;;;;;20927:13;;;;:5;:13;;;;;;;;;20908:32;;;;;;;;;;;;;;;;;;;;;;;20927:13;;20908:32;;20927:13;;20908:32;;20927:13;20908:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;20908:32:6;;;-1:-1:-1;;20908:32:6;;;;-1:-1:-1;;;;;20908:32:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;20982:14;20989:6;20982;:14::i;:::-;20981:15;:50;;;;;21019:4;:12;;;21000:4;:15;;;:31;;20981:50;20977:456;;;21112:4;21105:11;;;;20977:456;21138:14;21145:6;21138;:14::i;:::-;21137:15;:49;;;;;21174:4;:12;;;21156:15;:30;21137:49;:83;;;;;21208:4;:12;;;21190:4;:15;;;:30;21137:83;21133:300;;;21249:63;21266:4;:10;;;21278:33;21295:4;:15;;;21278:4;:12;;;:16;;:33;;;;:::i;:::-;21249:16;:63::i;:::-;21236:76;;21133:300;;;21356:66;21373:4;:10;;;21385:36;21405:4;:15;;;21385;:19;;:36;;;;:::i;21356:66::-;21343:79;;21133:300;21460:4;:19;;;21447:10;:32;21443:820;;;21550:19;;;;21535:35;;:10;;:35;:14;:35;:::i;:::-;21499:5;;21515:15;;;;;21499:32;;;;;-1:-1:-1;;;;;21499:32:6;;;;;;;;;:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;21499:32:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21499:32:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21499:32:6;:71;21495:758;;21598:5;;21617:15;;;;21655:19;;;;-1:-1:-1;;;;;21598:5:6;;;;:18;;21617:15;21634:4;;21640:35;;:10;;:35;:14;:35;:::i;:::-;21598:78;;;-1:-1:-1;;;21598:78:6;;;;;;-1:-1:-1;;;;;21598:78:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;21598:78:6;;;;5:2:-1;;;;30:1;27;20:12;5:2;21598:78:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21598:78:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21598:78:6;21590:87;;;;;;;;21726:69;21759:35;21774:4;:19;;;21759:10;:14;;:35;;;;:::i;:::-;21726:13;;;;:5;:13;;;;;;;;:28;;;:69;:32;:69;:::i;:::-;21695:13;;;;:5;:13;;;;;;;;:28;:100;21495:758;;;21854:13;;;;:5;:13;;;;;;;;:28;;;;21839:44;;21854:28;;21860:6;;21839:44;;21854:13;21839:44;21901:25;21919:6;21901:17;:25::i;:::-;21952:5;;21967:13;;;;21982:19;;;;21952:50;;;-1:-1:-1;;;;;21952:50:6;;-1:-1:-1;;;;;21952:50:6;;;;;;;;;;;;;;;:5;;;;;:14;;:50;;;;;;;;;;;;;;:5;;:50;;;5:2:-1;;;;30:1;27;20:12;5:2;21952:50:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;21952:50:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;21952:50:6;21944:59;;;;;;;;22021:13;;;;:5;:13;;;;;22048:15;22021:24;;;:42;22139:19;;;;22109:25;;;;;:50;;;:29;:50;:::i;:::-;22081:13;;;;:5;:13;;;;;;;:25;;;:78;;;;22177:28;;;;:32;-1:-1:-1;;;22227:11:6;;21495:758;22280:5;;22295:13;;;;22280:41;;;-1:-1:-1;;;;;22280:41:6;;-1:-1:-1;;;;;22280:41:6;;;;;;;;;;;;;;;:5;;;;;:14;;:41;;;;;;;;;;;;;;:5;;:41;;;5:2:-1;;;;30:1;27;20:12;5:2;22280:41:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;22280:41:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;22280:41:6;22272:50;;;;;;;;22363:13;;;;:5;:13;;;;;;;;:28;;:44;;22396:10;22363:44;:32;:44;:::i;:::-;22332:13;;;;:5;:13;;;;;;;;:28;;;:75;;;;22445:25;;;:41;;22475:10;22445:41;:29;:41;:::i;:::-;22417:13;;;;:5;:13;;;;;;:25;;;:69;;;;22523:15;22496:24;;;;:42;;;;22553:26;;22568:10;;22423:6;;22553:26;;22417:13;22553:26;-1:-1:-1;22596:4:6;;20632:1975;-1:-1:-1;;;20632:1975:6:o;22613:1383::-;22676:4;22692:15;22717:16;;:::i;:::-;23394:18;22736:13;;;:5;:13;;;;;;;;22717:32;;;;;;;;;;;;;;;;;;;;;;;22736:13;;22717:32;;22736:13;;22717:32;;;22736:13;22717:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;22717:32:6;;;-1:-1:-1;;22717:32:6;;;;-1:-1:-1;;;;;22717:32:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;22764:14;22771:6;22764;:14::i;:::-;22760:533;;;22813:24;22798:4;:11;;;:39;;;;;;;;;22794:89;;;22864:4;22857:11;;;;22794:89;22909:7;22896:20;;22760:533;;;22969:4;:12;;;22951:15;:30;22947:138;;;23066:4;23059:11;;;;22947:138;23102:12;;;;23138:6;;23102:33;;23119:15;23102:33;:16;:33;:::i;:::-;:42;23098:185;;;23177:12;;;;:33;;23194:15;23177:33;:16;:33;:::i;:::-;23164:46;;23098:185;;;23262:6;23249:19;;23098:185;23350:13;;;;:5;:13;;;;;;;;:28;;23324:10;;;;23307:40;;23336:10;23307:16;:40::i;:::-;:71;23303:666;;;23415:74;23460:5;:13;23466:6;23460:13;;;;;;;;;;;:28;;;23415:40;23432:4;:10;;;23444;23415:16;:40::i;:::-;:44;:74;:44;:74;:::i;:::-;23508:5;;23524:15;;;;;23508:32;;;;;-1:-1:-1;;;;;23508:32:6;;;;;;;;;23394:95;;-1:-1:-1;23394:95:6;;23508:5;;;:15;;:32;;;;;;;;;;;;;;;:5;;:32;;;5:2:-1;;;;30:1;27;20:12;5:2;23508:32:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23508:32:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23508:32:6;:49;23504:455;;23585:5;;23604:15;;;;;23585:56;;;;;-1:-1:-1;;;;;23585:56:6;;;;;;;23621:4;23585:56;;;;;;;;;;;;:5;;;:18;;:56;;;;;;;;;;;;;;;:5;;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;23585:56:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;23585:56:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;23585:56:6;23577:65;;;;;;;;23691:13;;;;:5;:13;;;;;;;;:28;;:47;;23724:13;23691:47;:32;:47;:::i;:::-;23660:13;;;;:5;:13;;;;;;;;:28;:78;23504:455;;;23797:13;;;;:5;:13;;;;;;;;:28;;;;23782:44;;23797:28;;23803:6;;23782:44;;23797:13;23782:44;23844:25;23862:6;23844:17;:25::i;:::-;23887:28;23908:6;23887:20;:28::i;:::-;;23940:4;23933:11;;;;23504:455;23985:4;23978:11;;22613:1383;;;;;;;:::o;24602:486::-;24741:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;24741:24:6;24727:10;:38;;:82;;-1:-1:-1;24777:32:6;24769:4;:40;;;;;;;;;24727:82;24719:91;;;;;;;;24832:32;24824:4;:40;;;;;;;;;24820:262;;;24880:2;;;;24887:13;;;:5;:13;;;;;;;;:24;;;;24880:2;24913:24;;;;24880:58;;;;;-1:-1:-1;;;;;24887:24:6;;;24880:58;;;;24913:24;;;24880:58;;;;;;:2;;;;;:6;;:58;;;;;;;;;;;;;:2;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;24880:58:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24880:58:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24820:262:6;;-1:-1:-1;24820:262:6;;24967:32;24959:4;:40;;;;;;;;;24955:127;;;25015:2;;;;25022:13;;;:5;:13;;;;;;;;:24;;;;25048:22;;;;;25015:56;;;;;-1:-1:-1;;;;;25022:24:6;;;25015:56;;;;25048:22;;;25015:56;;;;;;:2;;;;;:6;;:56;;;;;;;;;;;;;:2;:56;;;5:2:-1;;;;30:1;27;20:12;5:2;25015:56:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;25015:56:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;24955:127:6;24602:486;;:::o;25094:500::-;25181:24;25157:13;;;;:5;:13;;;;;:20;;;;;:48;;;;;;;;;25153:85;;;25221:7;;25153:85;25280:26;25256:13;;;;:5;:13;;;;;:20;;;;;:50;;;;;;;;;25247:61;;;;;;25340:13;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25340:24:6;25326:10;:38;;:80;;-1:-1:-1;25382:13:6;;;;:5;:13;;;;;:24;;;-1:-1:-1;;;;;25382:24:6;25368:10;:38;25326:80;:120;;;-1:-1:-1;25424:13:6;;;;:5;:13;;;;;:22;;;-1:-1:-1;;;;;25424:22:6;25410:10;:36;25326:120;25318:129;;;;;;;;25457:13;;;;:5;:13;;;;;;:20;;;:47;;-1:-1:-1;;25457:47:6;25480:24;25457:47;;;25538:15;25514:21;;;;:39;25568:19;25457:13;;25568:19;;;25094:500;:::o;24002:283::-;24063:4;24082:13;;;:5;:13;;;;;;;:28;;:33;24078:180;;24131:5;;;24146:13;;;:5;:13;;;;;;;;:24;;;;24172:28;;;24131:70;;-1:-1:-1;;;;;24131:70:6;;-1:-1:-1;;;;;24146:24:6;;;24131:70;;;;;;;;;;;;;:5;;;;;:14;;:70;;;;;;;;;;;;;:5;:70;;;5:2:-1;;;;30:1;27;20:12;5:2;24131:70:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24131:70:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;24246:1:6;24215:13;;;:5;24131:70;24215:13;;;;;;:28;:32;24078:180;-1:-1:-1;24274:4:6;24002:283;;;:::o;24405:191::-;24481:4;24497:9;24509:6;;;;;;;;;-1:-1:-1;;;;;24509:6:6;-1:-1:-1;;;;;24509:22:6;;:24;;;;;-1:-1:-1;;;24509:24:6;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;24509:24:6;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;24509:24:6;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;24509:24:6;;-1:-1:-1;24550:39:6;24584:4;24550:29;24571:7;24550:16;24509:24;24559:6;24550:16;:8;:16;:::i;:::-;:20;:29;:20;:29;:::i;:::-;:33;:39;:33;:39;:::i;:::-;24543:46;24405:191;-1:-1:-1;;;;24405:191:6:o;1512:171:15:-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;;;;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o;1060:116:14:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:14;;;1060:116::o;203:380::-;263:9;489:7;;485:36;;;-1:-1:-1;513:1:14;506:8;;485:36;-1:-1:-1;531:7:14;;;536:2;531;:7;551:6;;;;;;;;:12;544:20;;;665:283;725:7;941:2;936;:7;;;;;;;;;665:283;-1:-1:-1;;;665:283:14:o;254:27107:6:-;;;;;;;;;;;-1:-1:-1;254:27107:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;-1:-1:-1;254:27107:6;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:27107:6;;;-1:-1:-1;254:27107:6;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;254:27107:6;;;-1:-1:-1;254:27107:6;:::i;:::-;;;;;;;;;;;;;;;;-1:-1:-1;;;;;254:27107:6;;;;;;-1:-1:-1;;;;;254:27107:6;;;;;;-1:-1:-1;;;;;254:27107:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;254:27107:6;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;254:27107:6;;;;;;",
+  "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"zeppelin-solidity/contracts/lifecycle/Pausable.sol\";\nimport \"./SNM.sol\";\nimport \"./Blacklist.sol\";\nimport \"./OracleUSD.sol\";\nimport \"./ProfileRegistry.sol\";\n\n\ncontract Market is Ownable, Pausable {\n\n    using SafeMath for uint256;\n\n    // DECLARATIONS\n\n    enum DealStatus{\n        STATUS_UNKNOWN,\n        STATUS_ACCEPTED,\n        STATUS_CLOSED\n    }\n\n    enum OrderType {\n        ORDER_UNKNOWN,\n        ORDER_BID,\n        ORDER_ASK\n    }\n\n    enum OrderStatus {\n        UNKNOWN,\n        ORDER_INACTIVE,\n        ORDER_ACTIVE\n    }\n\n    enum RequestStatus {\n        REQUEST_UNKNOWN,\n        REQUEST_CREATED,\n        REQUEST_CANCELED,\n        REQUEST_REJECTED,\n        REQUEST_ACCEPTED\n    }\n\n    enum BlacklistPerson {\n        BLACKLIST_NOBODY,\n        BLACKLIST_WORKER,\n        BLACKLIST_MASTER\n    }\n\n    struct Deal {\n        uint64[] benchmarks;\n        address supplierID;\n        address consumerID;\n        address masterID;\n        uint askID;\n        uint bidID;\n        uint duration;\n        uint price; //usd * 10^-18\n        uint startTime;\n        uint endTime;\n        DealStatus status;\n        uint blockedBalance;\n        uint totalPayout;\n        uint lastBillTS;\n    }\n\n    struct Order {\n        OrderType orderType;\n        OrderStatus orderStatus;\n        address author;\n        address counterparty;\n        uint duration;\n        uint256 price;\n        bool[] netflags;\n        ProfileRegistry.IdentityLevel identityLevel;\n        address blacklist;\n        bytes32 tag;\n        uint64[] benchmarks;\n        uint frozenSum;\n        uint dealID;\n    }\n\n    struct ChangeRequest {\n        uint dealID;\n        OrderType requestType;\n        uint price;\n        uint duration;\n        RequestStatus status;\n    }\n\n    // EVENTS\n\n    event OrderPlaced(uint indexed orderID);\n    event OrderUpdated(uint indexed orderID);\n\n    event DealOpened(uint indexed dealID);\n    event DealUpdated(uint indexed dealID);\n\n    event Billed(uint indexed dealID, uint indexed paidAmount);\n\n    event DealChangeRequestSet(uint indexed changeRequestID);\n    event DealChangeRequestUpdated(uint indexed changeRequestID);\n\n    event WorkerAnnounced(address indexed worker, address indexed master);\n    event WorkerConfirmed(address indexed worker, address indexed master);\n    event WorkerRemoved(address indexed worker, address indexed master);\n\n    event NumBenchmarksUpdated(uint indexed newNum);\n    event NumNetflagsUpdated(uint indexed newNum);\n\n    // VARS\n\n    uint constant MAX_BENCHMARKS_VALUE = 2 ** 63;\n\n    SNM token;\n\n    Blacklist bl;\n\n    OracleUSD oracle;\n\n    ProfileRegistry pr;\n\n    uint ordersAmount = 0;\n\n    uint dealAmount = 0;\n\n    uint requestsAmount = 0;\n\n    // current length of benchmarks\n    uint benchmarksQuantity;\n\n    // current length of netflags\n    uint netflagsQuantity;\n\n    mapping(uint => Order) public orders;\n\n    mapping(uint => Deal) public deals;\n\n    mapping(address => uint[]) dealsID;\n\n    mapping(uint => ChangeRequest) requests;\n\n    mapping(uint => uint[2]) actualRequests;\n\n    mapping(address => address) masterOf;\n\n    mapping(address => bool) isMaster;\n\n    mapping(address => mapping(address => bool)) masterRequest;\n\n    // INIT\n\n    constructor(address _token,\n                address _blacklist,\n                address _oracle,\n                address _profileRegistry,\n                uint _benchmarksQuantity,\n                uint _netflagsQuantity\n    ) public {\n        token = SNM(_token);\n        bl = Blacklist(_blacklist);\n        oracle = OracleUSD(_oracle);\n        pr = ProfileRegistry(_profileRegistry);\n        benchmarksQuantity = _benchmarksQuantity;\n        netflagsQuantity = _netflagsQuantity;\n    }\n\n    // EXTERNAL\n\n    // Order functions\n\n    function PlaceOrder(\n        OrderType _orderType,\n        address _id_counterparty,\n        uint _duration,\n        uint _price,\n        bool[] _netflags,\n        ProfileRegistry.IdentityLevel _identityLevel,\n        address _blacklist,\n        bytes32 _tag,\n        uint64[] _benchmarks\n    ) public whenNotPaused returns (uint){\n\n        require(_identityLevel >= ProfileRegistry.IdentityLevel.ANONYMOUS);\n        require(_netflags.length <= netflagsQuantity);\n        require(_benchmarks.length <= benchmarksQuantity);\n\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            require(_benchmarks[i] < MAX_BENCHMARKS_VALUE);\n        }\n\n        uint lockedSum = 0;\n\n        if (_orderType == OrderType.ORDER_BID) {\n            if (_duration == 0) {\n                lockedSum = CalculatePayment(_price, 1 hours);\n            } else if (_duration < 1 days) {\n                lockedSum = CalculatePayment(_price, _duration);\n            } else {\n                lockedSum = CalculatePayment(_price, 1 days);\n            }\n            // this line contains err.\n            require(token.transferFrom(msg.sender, this, lockedSum));\n        }\n\n        ordersAmount = ordersAmount.add(1);\n        uint256 orderId = ordersAmount;\n\n        orders[orderId] = Order(\n            _orderType,\n            OrderStatus.ORDER_ACTIVE,\n            msg.sender,\n            _id_counterparty,\n            _duration,\n            _price,\n            _netflags,\n            _identityLevel,\n            _blacklist,\n            _tag,\n            _benchmarks,\n            lockedSum,\n            0\n        );\n\n        emit OrderPlaced(orderId);\n        return orderId;\n    }\n\n    function CancelOrder(uint orderID) public returns (bool){\n        require(orderID <= ordersAmount);\n        require(orders[orderID].orderStatus == OrderStatus.ORDER_ACTIVE);\n        require(orders[orderID].author == msg.sender);\n\n        require(token.transfer(msg.sender, orders[orderID].frozenSum));\n        orders[orderID].orderStatus = OrderStatus.ORDER_INACTIVE;\n\n        emit OrderUpdated(orderID);\n        return true;\n    }\n\n    function QuickBuy(uint askID, uint buyoutDuration) public whenNotPaused {\n        Order memory ask = orders[askID];\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE);\n\n        require(ask.duration >= buyoutDuration);\n        require(pr.GetProfileLevel(msg.sender) >= ask.identityLevel);\n        require(bl.Check(msg.sender, GetMaster(ask.author)) == false && bl.Check(ask.author, msg.sender) == false);\n        require(bl.Check(ask.blacklist, msg.sender) == false);\n\n        PlaceOrder(\n            OrderType.ORDER_BID,\n            GetMaster(ask.author),\n            buyoutDuration,\n            ask.price,\n            ask.netflags,\n            ProfileRegistry.IdentityLevel.ANONYMOUS,\n            address(0),\n            bytes32(0),\n            ask.benchmarks);\n\n        OpenDeal(askID, GetOrdersAmount());\n    }\n\n    // Deal functions\n\n    function OpenDeal(uint _askID, uint _bidID) public whenNotPaused {\n        Order memory ask = orders[_askID];\n        Order memory bid = orders[_bidID];\n\n        require(ask.orderStatus == OrderStatus.ORDER_ACTIVE && bid.orderStatus == OrderStatus.ORDER_ACTIVE);\n        require(ask.counterparty == 0x0 || ask.counterparty == GetMaster(bid.author));\n        require(bid.counterparty == 0x0 || bid.counterparty == GetMaster(ask.author));\n        require(ask.orderType == OrderType.ORDER_ASK);\n        require(bid.orderType == OrderType.ORDER_BID);\n        require(bl.Check(bid.blacklist, GetMaster(ask.author)) == false);\n        require(bl.Check(bid.blacklist, ask.author) == false);\n        require(bl.Check(bid.author, GetMaster(ask.author)) == false);\n        require(bl.Check(bid.author, ask.author) == false);\n        require(bl.Check(ask.blacklist, bid.author) == false);\n        require(bl.Check(GetMaster(ask.author), bid.author) == false);\n        require(bl.Check(ask.author, bid.author) == false);\n        require(ask.price <= bid.price);\n        require(ask.duration >= bid.duration);\n        // profile level check\n        require(pr.GetProfileLevel(bid.author) >= ask.identityLevel);\n        require(pr.GetProfileLevel(ask.author) >= bid.identityLevel);\n\n        if (ask.netflags.length < netflagsQuantity) {\n            ask.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        if (bid.netflags.length < netflagsQuantity) {\n            bid.netflags = ResizeNetflags(ask.netflags);\n        }\n\n        for (uint i = 0; i < ask.netflags.length; i++) {\n            // implementation: when bid contains requirement, ask necessary needs to have this\n            // if ask have this one - pass\n            require(!bid.netflags[i] || ask.netflags[i]);\n        }\n\n        if (ask.benchmarks.length < benchmarksQuantity) {\n            ask.benchmarks = ResizeBenchmarks(ask.benchmarks);\n        }\n\n        if (bid.benchmarks.length < benchmarksQuantity) {\n            bid.benchmarks = ResizeBenchmarks(bid.benchmarks);\n        }\n\n        for (i = 0; i < ask.benchmarks.length; i++) {\n            require(ask.benchmarks[i] >= bid.benchmarks[i]);\n        }\n\n        dealAmount = dealAmount.add(1);\n        address master = GetMaster(ask.author);\n        orders[_askID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_bidID].orderStatus = OrderStatus.ORDER_INACTIVE;\n        orders[_askID].dealID = dealAmount;\n        orders[_bidID].dealID = dealAmount;\n\n        emit OrderUpdated(_askID);\n        emit OrderUpdated(_bidID);\n\n        uint startTime = block.timestamp;\n        uint endTime = 0;\n        // `0` - for spot deal\n\n        // if deal is normal\n        if (ask.duration != 0) {\n            endTime = startTime.add(bid.duration);\n        }\n        uint blockedBalance = bid.frozenSum;\n        deals[dealAmount] = Deal(\n            ask.benchmarks,\n            ask.author,\n            bid.author,\n            master,\n            _askID,\n            _bidID,\n            bid.duration,\n            ask.price,\n            startTime,\n            endTime,\n            DealStatus.STATUS_ACCEPTED,\n            blockedBalance,\n            0,\n            block.timestamp\n        );\n        emit DealOpened(dealAmount);\n    }\n\n    function CloseDeal(uint dealID, BlacklistPerson blacklisted) public returns (bool){\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n\n        if (block.timestamp <= deals[dealID].startTime.add(deals[dealID].duration)) {\n            // after endTime\n            require(deals[dealID].consumerID == msg.sender);\n        }\n        AddToBlacklist(dealID, blacklisted);\n        InternalBill(dealID);\n        InternalCloseDeal(dealID);\n        RefundRemainingFunds(dealID);\n        return true;\n    }\n\n    function Bill(uint dealID) public returns (bool){\n        InternalBill(dealID);\n        ReserveNextPeriodFunds(dealID);\n        return true;\n    }\n\n    function CreateChangeRequest(uint dealID, uint newPrice, uint newDuration) public returns (uint changeRequestID) {\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID || msg.sender == deals[dealID].supplierID);\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n\n        if (IsSpot(dealID)) {\n            require(newDuration == 0);\n        }\n\n        requestsAmount = requestsAmount.add(1);\n\n        OrderType requestType;\n\n        if (msg.sender == deals[dealID].consumerID) {\n            requestType = OrderType.ORDER_BID;\n        } else {\n            requestType = OrderType.ORDER_ASK;\n        }\n\n        requests[requestsAmount] = ChangeRequest(dealID, requestType, newPrice, newDuration, RequestStatus.REQUEST_CREATED);\n        emit DealChangeRequestSet(requestsAmount);\n\n        if (requestType == OrderType.ORDER_BID) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][1] = requestsAmount;\n            ChangeRequest memory matchingRequest = requests[actualRequests[dealID][0]];\n\n            if (newDuration == deals[dealID].duration && newPrice > deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][1] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration >= newDuration && matchingRequest.price <= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = matchingRequest.price;\n                deals[dealID].duration = newDuration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n\n            requests[actualRequests[dealID][1]].status = RequestStatus.REQUEST_CANCELED;\n            emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n            actualRequests[dealID][1] = requestsAmount;\n        }\n\n        if (requestType == OrderType.ORDER_ASK) {\n            emit DealChangeRequestUpdated(actualRequests[dealID][0]);\n            requests[actualRequests[dealID][0]].status = RequestStatus.REQUEST_CANCELED;\n            actualRequests[dealID][0] = requestsAmount;\n            matchingRequest = requests[actualRequests[dealID][1]];\n\n            if (newDuration == deals[dealID].duration && newPrice < deals[dealID].price) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                actualRequests[dealID][0] = 0;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else if (matchingRequest.status == RequestStatus.REQUEST_CREATED && matchingRequest.duration <= newDuration && matchingRequest.price >= newPrice) {\n                requests[requestsAmount].status = RequestStatus.REQUEST_ACCEPTED;\n                emit DealChangeRequestUpdated(actualRequests[dealID][1]);\n                actualRequests[dealID][0] = 0;\n                actualRequests[dealID][1] = 0;\n                Bill(dealID);\n                deals[dealID].price = newPrice;\n                deals[dealID].duration = matchingRequest.duration;\n                emit DealChangeRequestUpdated(requestsAmount);\n            } else {\n                return requestsAmount;\n            }\n        }\n\n        deals[dealID].endTime = deals[dealID].startTime.add(deals[dealID].duration);\n        return requestsAmount;\n    }\n\n    function CancelChangeRequest(uint changeRequestID) public returns (bool) {\n        ChangeRequest memory request = requests[changeRequestID];\n\n        require(\n            msg.sender == deals[request.dealID].supplierID ||\n            msg.sender == deals[request.dealID].masterID ||\n            msg.sender == deals[request.dealID].consumerID\n        );\n        require(request.status != RequestStatus.REQUEST_ACCEPTED);\n\n        if (request.requestType == OrderType.ORDER_ASK) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            }\n            actualRequests[request.dealID][0] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n\n        if (request.requestType == OrderType.ORDER_BID) {\n            if (msg.sender == deals[request.dealID].consumerID) {\n                requests[changeRequestID].status = RequestStatus.REQUEST_CANCELED;\n            } else {\n                requests[changeRequestID].status = RequestStatus.REQUEST_REJECTED;\n            }\n            actualRequests[request.dealID][1] = 0;\n            emit DealChangeRequestUpdated(changeRequestID);\n        }\n        return true;\n    }\n\n    // Master-worker functions\n\n    function RegisterWorker(address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(msg.sender) == msg.sender);\n        require(isMaster[msg.sender] == false);\n        require(GetMaster(_master) == _master);\n        masterRequest[_master][msg.sender] = true;\n        emit WorkerAnnounced(msg.sender, _master);\n        return true;\n    }\n\n    function ConfirmWorker(address _worker) public whenNotPaused returns (bool) {\n        require(masterRequest[msg.sender][_worker] == true);\n        masterOf[_worker] = msg.sender;\n        isMaster[msg.sender] = true;\n        delete masterRequest[msg.sender][_worker];\n        emit WorkerConfirmed(_worker, msg.sender);\n        return true;\n    }\n\n    function RemoveWorker(address _worker, address _master) public whenNotPaused returns (bool) {\n        require(GetMaster(_worker) == _master && (msg.sender == _worker || msg.sender == _master));\n        delete masterOf[_worker];\n        emit WorkerRemoved(_worker, _master);\n        return true;\n    }\n\n    // GETTERS\n\n    function GetOrderInfo(uint orderID) public view\n    returns (\n        OrderType orderType,\n        address author,\n        address counterparty,\n        uint duration,\n        uint price,\n        bool[] netflags,\n        ProfileRegistry.IdentityLevel identityLevel,\n        address blacklist,\n        bytes32 tag,\n        uint64[] benchmarks,\n        uint frozenSum\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderType,\n        order.author,\n        order.counterparty,\n        order.duration,\n        order.price,\n        order.netflags,\n        order.identityLevel,\n        order.blacklist,\n        order.tag,\n        order.benchmarks,\n        order.frozenSum\n        );\n    }\n\n\n    function GetOrderParams(uint orderID) public view\n    returns (\n        OrderStatus orderStatus,\n        uint dealID\n    ){\n        Order memory order = orders[orderID];\n        return (\n        order.orderStatus,\n        order.dealID\n        );\n    }\n\n    function GetDealInfo(uint dealID) public view\n    returns (\n        uint64[] benchmarks,\n        address supplierID,\n        address consumerID,\n        address masterID,\n        uint askID,\n        uint bidID,\n        uint startTime\n    ){\n        return (\n        deals[dealID].benchmarks,\n        deals[dealID].supplierID,\n        deals[dealID].consumerID,\n        deals[dealID].masterID,\n        deals[dealID].askID,\n        deals[dealID].bidID,\n        deals[dealID].startTime\n\n        );\n    }\n\n    function GetDealParams(uint dealID) public view\n    returns (\n        uint duration,\n        uint price,\n        uint endTime,\n        DealStatus status,\n        uint blockedBalance,\n        uint totalPayout,\n        uint lastBillTS\n    ){\n        return (\n        deals[dealID].duration,\n        deals[dealID].price,\n        deals[dealID].endTime,\n        deals[dealID].status,\n        deals[dealID].blockedBalance,\n        deals[dealID].totalPayout,\n        deals[dealID].lastBillTS\n        );\n    }\n\n    function GetMaster(address _worker) public view returns (address master) {\n        if (masterOf[_worker] == 0x0 || masterOf[_worker] == _worker) {\n            master = _worker;\n        } else {\n            master = masterOf[_worker];\n        }\n    }\n\n    function GetChangeRequestInfo(uint changeRequestID) public view\n    returns (\n        uint dealID,\n        OrderType requestType,\n        uint price,\n        uint duration,\n        RequestStatus status\n    ){\n        return (\n        requests[changeRequestID].dealID,\n        requests[changeRequestID].requestType,\n        requests[changeRequestID].price,\n        requests[changeRequestID].duration,\n        requests[changeRequestID].status\n        );\n    }\n\n    function GetDealsAmount() public view returns (uint){\n        return dealAmount;\n    }\n\n    function GetOrdersAmount() public view returns (uint){\n        return ordersAmount;\n    }\n\n    function GetChangeRequestsAmount() public view returns (uint){\n        return requestsAmount;\n    }\n\n    function GetBenchmarksQuantity() public view returns (uint) {\n        return benchmarksQuantity;\n    }\n\n    function GetNetflagsQuantity() public view returns (uint) {\n        return netflagsQuantity;\n    }\n\n\n    // INTERNAL\n\n    function InternalBill(uint dealID) internal returns (bool){\n        require(deals[dealID].status == DealStatus.STATUS_ACCEPTED);\n        require(msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].masterID);\n        Deal memory deal = deals[dealID];\n\n        uint paidAmount;\n\n        if (!IsSpot(dealID) && deal.lastBillTS >= deal.endTime) {\n            // means we already billed deal after endTime\n            return true;\n        } else if (!IsSpot(dealID) && block.timestamp > deal.endTime && deal.lastBillTS < deal.endTime) {\n            paidAmount = CalculatePayment(deal.price, deal.endTime.sub(deal.lastBillTS));\n        } else {\n            paidAmount = CalculatePayment(deal.price, block.timestamp.sub(deal.lastBillTS));\n        }\n\n        if (paidAmount > deal.blockedBalance) {\n            if (token.balanceOf(deal.consumerID) >= paidAmount.sub(deal.blockedBalance)) {\n                require(token.transferFrom(deal.consumerID, this, paidAmount.sub(deal.blockedBalance)));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(paidAmount.sub(deal.blockedBalance));\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                require(token.transfer(deal.masterID, deal.blockedBalance));\n                deals[dealID].lastBillTS = block.timestamp;\n                deals[dealID].totalPayout = deals[dealID].totalPayout.add(deal.blockedBalance);\n                deals[dealID].blockedBalance = 0;\n                return true;\n            }\n        }\n        require(token.transfer(deal.masterID, paidAmount));\n        deals[dealID].blockedBalance = deals[dealID].blockedBalance.sub(paidAmount);\n        deals[dealID].totalPayout = deals[dealID].totalPayout.add(paidAmount);\n        deals[dealID].lastBillTS = block.timestamp;\n        emit Billed(dealID, paidAmount);\n        return true;\n    }\n\n    function ReserveNextPeriodFunds(uint dealID) internal returns (bool) {\n        uint nextPeriod;\n        Deal memory deal = deals[dealID];\n\n        if (IsSpot(dealID)) {\n            if (deal.status == DealStatus.STATUS_CLOSED) {\n                return true;\n            }\n            nextPeriod = 1 hours;\n        } else {\n            if (block.timestamp > deal.endTime) {\n                // we don't reserve funds for next period\n                return true;\n            }\n            if (deal.endTime.sub(block.timestamp) < 1 days) {\n                nextPeriod = deal.endTime.sub(block.timestamp);\n            } else {\n                nextPeriod = 1 days;\n            }\n        }\n\n        if (CalculatePayment(deal.price, nextPeriod) > deals[dealID].blockedBalance) {\n            uint nextPeriodSum = CalculatePayment(deal.price, nextPeriod).sub(deals[dealID].blockedBalance);\n\n            if (token.balanceOf(deal.consumerID) >= nextPeriodSum) {\n                require(token.transferFrom(deal.consumerID, this, nextPeriodSum));\n                deals[dealID].blockedBalance = deals[dealID].blockedBalance.add(nextPeriodSum);\n            } else {\n                emit Billed(dealID, deals[dealID].blockedBalance);\n                InternalCloseDeal(dealID);\n                RefundRemainingFunds(dealID);\n                return true;\n            }\n        }\n        return true;\n    }\n\n    function RefundRemainingFunds(uint dealID) internal returns (bool){\n        if (deals[dealID].blockedBalance != 0) {\n            token.transfer(deals[dealID].consumerID, deals[dealID].blockedBalance);\n            deals[dealID].blockedBalance = 0;\n        }\n        return true;\n    }\n\n    function IsSpot(uint dealID) internal view returns (bool){\n        return deals[dealID].duration == 0;\n    }\n\n    function CalculatePayment(uint _price, uint _period) internal view returns (uint) {\n        uint rate = oracle.getCurrentPrice();\n        return rate.mul(_price).mul(_period).div(1e18);\n    }\n\n    function AddToBlacklist(uint dealID, BlacklistPerson role) internal {\n        // only consumer can blacklist\n        require(msg.sender == deals[dealID].consumerID || role == BlacklistPerson.BLACKLIST_NOBODY);\n        if (role == BlacklistPerson.BLACKLIST_WORKER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].supplierID);\n        } else if (role == BlacklistPerson.BLACKLIST_MASTER) {\n            bl.Add(deals[dealID].consumerID, deals[dealID].masterID);\n        }\n    }\n\n    function InternalCloseDeal(uint dealID) internal {\n        if (deals[dealID].status == DealStatus.STATUS_CLOSED) {\n            return;\n        }\n        require((deals[dealID].status == DealStatus.STATUS_ACCEPTED));\n        require(msg.sender == deals[dealID].consumerID || msg.sender == deals[dealID].supplierID || msg.sender == deals[dealID].masterID);\n        deals[dealID].status = DealStatus.STATUS_CLOSED;\n        deals[dealID].endTime = block.timestamp;\n        emit DealUpdated(dealID);\n    }\n\n    function ResizeBenchmarks(uint64[] _benchmarks) internal view returns (uint64[]) {\n        uint64[] memory benchmarks = new uint64[](benchmarksQuantity);\n        for (uint i = 0; i < _benchmarks.length; i++) {\n            benchmarks[i] = _benchmarks[i];\n        }\n        return benchmarks;\n    }\n\n    function ResizeNetflags(bool[] _netflags) internal view returns (bool[]) {\n        bool[] memory netflags = new bool[](netflagsQuantity);\n        for (uint i = 0; i < _netflags.length; i++) {\n            netflags[i] = _netflags[i];\n        }\n        return netflags;\n    }\n\n    // SETTERS\n\n    function SetProfileRegistryAddress(address _newPR) public onlyOwner returns (bool) {\n        pr = ProfileRegistry(_newPR);\n        return true;\n    }\n\n    function SetBlacklistAddress(address _newBL) public onlyOwner returns (bool) {\n        bl = Blacklist(_newBL);\n        return true;\n    }\n\n    function SetOracleAddress(address _newOracle) public onlyOwner returns (bool) {\n        require(OracleUSD(_newOracle).getCurrentPrice() != 0);\n        oracle = OracleUSD(_newOracle);\n        return true;\n    }\n\n    function SetBenchmarksQuantity(uint _newQuantity) public onlyOwner returns (bool) {\n        require(_newQuantity > benchmarksQuantity);\n        emit NumBenchmarksUpdated(_newQuantity);\n        benchmarksQuantity = _newQuantity;\n        return true;\n    }\n\n    function SetNetflagsQuantity(uint _newQuantity) public onlyOwner returns (bool) {\n        require(_newQuantity > netflagsQuantity);\n        emit NumNetflagsUpdated(_newQuantity);\n        netflagsQuantity = _newQuantity;\n        return true;\n    }\n\n    function KillMarket() public onlyOwner {\n        token.transfer(owner, token.balanceOf(address(this)));\n        selfdestruct(owner);\n    }\n}\n",
   "sourcePath": "contracts/Market.sol",
   "ast": {
     "absolutePath": "contracts/Market.sol",
     "exportedSymbols": {
       "Market": [
-        5229
+        5065
       ]
     },
-    "id": 5230,
+    "id": 5066,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 2147,
+        "id": 1971,
         "literals": [
           "solidity",
           "^",
@@ -1109,71 +1109,71 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:7"
+        "src": "0:24:6"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 2148,
+        "id": 1972,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10883,
-        "src": "27:59:7",
+        "scope": 5066,
+        "sourceUnit": 11167,
+        "src": "27:59:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 2149,
+        "id": 1973,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10703,
-        "src": "87:60:7",
+        "scope": 5066,
+        "sourceUnit": 10987,
+        "src": "87:60:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 2150,
+        "id": 1974,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10081,
-        "src": "148:19:7",
+        "scope": 5066,
+        "sourceUnit": 10927,
+        "src": "148:19:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/Blacklist.sol",
         "file": "./Blacklist.sol",
-        "id": 2151,
+        "id": 1975,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 1162,
-        "src": "168:25:7",
+        "scope": 5066,
+        "sourceUnit": 986,
+        "src": "168:25:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/OracleUSD.sol",
         "file": "./OracleUSD.sol",
-        "id": 2152,
+        "id": 1976,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 8678,
-        "src": "194:25:7",
+        "scope": 5066,
+        "sourceUnit": 9524,
+        "src": "194:25:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/ProfileRegistry.sol",
         "file": "./ProfileRegistry.sol",
-        "id": 2153,
+        "id": 1977,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10036,
-        "src": "220:31:7",
+        "scope": 5066,
+        "sourceUnit": 10882,
+        "src": "220:31:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -1183,76 +1183,76 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 2154,
+              "id": 1978,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "273:7:7",
+              "referencedDeclaration": 11166,
+              "src": "273:7:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 2155,
+            "id": 1979,
             "nodeType": "InheritanceSpecifier",
-            "src": "273:7:7"
+            "src": "273:7:6"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 2156,
+              "id": 1980,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10702,
-              "src": "282:8:7",
+              "referencedDeclaration": 10986,
+              "src": "282:8:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$10702",
+                "typeIdentifier": "t_contract$_Pausable_$10986",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 2157,
+            "id": 1981,
             "nodeType": "InheritanceSpecifier",
-            "src": "282:8:7"
+            "src": "282:8:6"
           }
         ],
         "contractDependencies": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5229,
+        "id": 5065,
         "linearizedBaseContracts": [
-          5229,
-          10702,
-          10882
+          5065,
+          10986,
+          11166
         ],
         "name": "Market",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 2160,
+            "id": 1984,
             "libraryName": {
               "contractScope": null,
-              "id": 2158,
+              "id": 1982,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
-              "src": "304:8:7",
+              "referencedDeclaration": 11080,
+              "src": "304:8:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "298:27:7",
+            "src": "298:27:6",
             "typeName": {
-              "id": 2159,
+              "id": 1983,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "317:7:7",
+              "src": "317:7:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1261,162 +1261,162 @@
           },
           {
             "canonicalName": "Market.DealStatus",
-            "id": 2164,
+            "id": 1988,
             "members": [
               {
-                "id": 2161,
+                "id": 1985,
                 "name": "STATUS_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "377:14:7"
+                "src": "377:14:6"
               },
               {
-                "id": 2162,
+                "id": 1986,
                 "name": "STATUS_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "401:15:7"
+                "src": "401:15:6"
               },
               {
-                "id": 2163,
+                "id": 1987,
                 "name": "STATUS_CLOSED",
                 "nodeType": "EnumValue",
-                "src": "426:13:7"
+                "src": "426:13:6"
               }
             ],
             "name": "DealStatus",
             "nodeType": "EnumDefinition",
-            "src": "352:93:7"
+            "src": "352:93:6"
           },
           {
             "canonicalName": "Market.OrderType",
-            "id": 2168,
+            "id": 1992,
             "members": [
               {
-                "id": 2165,
+                "id": 1989,
                 "name": "ORDER_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "476:13:7"
+                "src": "476:13:6"
               },
               {
-                "id": 2166,
+                "id": 1990,
                 "name": "ORDER_BID",
                 "nodeType": "EnumValue",
-                "src": "499:9:7"
+                "src": "499:9:6"
               },
               {
-                "id": 2167,
+                "id": 1991,
                 "name": "ORDER_ASK",
                 "nodeType": "EnumValue",
-                "src": "518:9:7"
+                "src": "518:9:6"
               }
             ],
             "name": "OrderType",
             "nodeType": "EnumDefinition",
-            "src": "451:82:7"
+            "src": "451:82:6"
           },
           {
             "canonicalName": "Market.OrderStatus",
-            "id": 2172,
+            "id": 1996,
             "members": [
               {
-                "id": 2169,
+                "id": 1993,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "566:7:7"
+                "src": "566:7:6"
               },
               {
-                "id": 2170,
+                "id": 1994,
                 "name": "ORDER_INACTIVE",
                 "nodeType": "EnumValue",
-                "src": "583:14:7"
+                "src": "583:14:6"
               },
               {
-                "id": 2171,
+                "id": 1995,
                 "name": "ORDER_ACTIVE",
                 "nodeType": "EnumValue",
-                "src": "607:12:7"
+                "src": "607:12:6"
               }
             ],
             "name": "OrderStatus",
             "nodeType": "EnumDefinition",
-            "src": "539:86:7"
+            "src": "539:86:6"
           },
           {
             "canonicalName": "Market.RequestStatus",
-            "id": 2178,
+            "id": 2002,
             "members": [
               {
-                "id": 2173,
+                "id": 1997,
                 "name": "REQUEST_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "660:15:7"
+                "src": "660:15:6"
               },
               {
-                "id": 2174,
+                "id": 1998,
                 "name": "REQUEST_CREATED",
                 "nodeType": "EnumValue",
-                "src": "685:15:7"
+                "src": "685:15:6"
               },
               {
-                "id": 2175,
+                "id": 1999,
                 "name": "REQUEST_CANCELED",
                 "nodeType": "EnumValue",
-                "src": "710:16:7"
+                "src": "710:16:6"
               },
               {
-                "id": 2176,
+                "id": 2000,
                 "name": "REQUEST_REJECTED",
                 "nodeType": "EnumValue",
-                "src": "736:16:7"
+                "src": "736:16:6"
               },
               {
-                "id": 2177,
+                "id": 2001,
                 "name": "REQUEST_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "762:16:7"
+                "src": "762:16:6"
               }
             ],
             "name": "RequestStatus",
             "nodeType": "EnumDefinition",
-            "src": "631:153:7"
+            "src": "631:153:6"
           },
           {
             "canonicalName": "Market.BlacklistPerson",
-            "id": 2182,
+            "id": 2006,
             "members": [
               {
-                "id": 2179,
+                "id": 2003,
                 "name": "BLACKLIST_NOBODY",
                 "nodeType": "EnumValue",
-                "src": "821:16:7"
+                "src": "821:16:6"
               },
               {
-                "id": 2180,
+                "id": 2004,
                 "name": "BLACKLIST_WORKER",
                 "nodeType": "EnumValue",
-                "src": "847:16:7"
+                "src": "847:16:6"
               },
               {
-                "id": 2181,
+                "id": 2005,
                 "name": "BLACKLIST_MASTER",
                 "nodeType": "EnumValue",
-                "src": "873:16:7"
+                "src": "873:16:6"
               }
             ],
             "name": "BlacklistPerson",
             "nodeType": "EnumDefinition",
-            "src": "790:105:7"
+            "src": "790:105:6"
           },
           {
             "canonicalName": "Market.Deal",
-            "id": 2212,
+            "id": 2036,
             "members": [
               {
                 "constant": false,
-                "id": 2185,
+                "id": 2009,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "923:19:7",
+                "scope": 2036,
+                "src": "923:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1425,19 +1425,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2183,
+                    "id": 2007,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "923:6:7",
+                    "src": "923:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 2184,
+                  "id": 2008,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "923:8:7",
+                  "src": "923:8:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -1448,11 +1448,11 @@
               },
               {
                 "constant": false,
-                "id": 2187,
+                "id": 2011,
                 "name": "supplierID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "952:18:7",
+                "scope": 2036,
+                "src": "952:18:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1460,10 +1460,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2186,
+                  "id": 2010,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "952:7:7",
+                  "src": "952:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1474,11 +1474,11 @@
               },
               {
                 "constant": false,
-                "id": 2189,
+                "id": 2013,
                 "name": "consumerID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "980:18:7",
+                "scope": 2036,
+                "src": "980:18:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1486,10 +1486,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2188,
+                  "id": 2012,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "980:7:7",
+                  "src": "980:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1500,11 +1500,11 @@
               },
               {
                 "constant": false,
-                "id": 2191,
+                "id": 2015,
                 "name": "masterID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1008:16:7",
+                "scope": 2036,
+                "src": "1008:16:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1512,10 +1512,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2190,
+                  "id": 2014,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1008:7:7",
+                  "src": "1008:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1526,11 +1526,11 @@
               },
               {
                 "constant": false,
-                "id": 2193,
+                "id": 2017,
                 "name": "askID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1034:10:7",
+                "scope": 2036,
+                "src": "1034:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1538,10 +1538,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2192,
+                  "id": 2016,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1034:4:7",
+                  "src": "1034:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1552,11 +1552,11 @@
               },
               {
                 "constant": false,
-                "id": 2195,
+                "id": 2019,
                 "name": "bidID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1054:10:7",
+                "scope": 2036,
+                "src": "1054:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1564,10 +1564,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2194,
+                  "id": 2018,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1054:4:7",
+                  "src": "1054:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1578,11 +1578,11 @@
               },
               {
                 "constant": false,
-                "id": 2197,
+                "id": 2021,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1074:13:7",
+                "scope": 2036,
+                "src": "1074:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1590,10 +1590,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2196,
+                  "id": 2020,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1074:4:7",
+                  "src": "1074:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1604,11 +1604,11 @@
               },
               {
                 "constant": false,
-                "id": 2199,
+                "id": 2023,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1097:10:7",
+                "scope": 2036,
+                "src": "1097:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1616,10 +1616,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2198,
+                  "id": 2022,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1097:4:7",
+                  "src": "1097:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1630,11 +1630,11 @@
               },
               {
                 "constant": false,
-                "id": 2201,
+                "id": 2025,
                 "name": "startTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1132:14:7",
+                "scope": 2036,
+                "src": "1132:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1642,10 +1642,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2200,
+                  "id": 2024,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1132:4:7",
+                  "src": "1132:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1656,11 +1656,11 @@
               },
               {
                 "constant": false,
-                "id": 2203,
+                "id": 2027,
                 "name": "endTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1156:12:7",
+                "scope": 2036,
+                "src": "1156:12:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1668,10 +1668,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2202,
+                  "id": 2026,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1156:4:7",
+                  "src": "1156:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1682,26 +1682,26 @@
               },
               {
                 "constant": false,
-                "id": 2205,
+                "id": 2029,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1178:17:7",
+                "scope": 2036,
+                "src": "1178:17:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_DealStatus_$2164",
+                  "typeIdentifier": "t_enum$_DealStatus_$1988",
                   "typeString": "enum Market.DealStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2204,
+                  "id": 2028,
                   "name": "DealStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2164,
-                  "src": "1178:10:7",
+                  "referencedDeclaration": 1988,
+                  "src": "1178:10:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$2164",
+                    "typeIdentifier": "t_enum$_DealStatus_$1988",
                     "typeString": "enum Market.DealStatus"
                   }
                 },
@@ -1710,11 +1710,11 @@
               },
               {
                 "constant": false,
-                "id": 2207,
+                "id": 2031,
                 "name": "blockedBalance",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1205:19:7",
+                "scope": 2036,
+                "src": "1205:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1722,10 +1722,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2206,
+                  "id": 2030,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1205:4:7",
+                  "src": "1205:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1736,11 +1736,11 @@
               },
               {
                 "constant": false,
-                "id": 2209,
+                "id": 2033,
                 "name": "totalPayout",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1234:16:7",
+                "scope": 2036,
+                "src": "1234:16:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1748,10 +1748,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2208,
+                  "id": 2032,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1234:4:7",
+                  "src": "1234:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1762,11 +1762,11 @@
               },
               {
                 "constant": false,
-                "id": 2211,
+                "id": 2035,
                 "name": "lastBillTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1260:15:7",
+                "scope": 2036,
+                "src": "1260:15:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1774,10 +1774,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2210,
+                  "id": 2034,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1260:4:7",
+                  "src": "1260:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1789,36 +1789,36 @@
             ],
             "name": "Deal",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "901:381:7",
+            "scope": 5065,
+            "src": "901:381:6",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.Order",
-            "id": 2241,
+            "id": 2065,
             "members": [
               {
                 "constant": false,
-                "id": 2214,
+                "id": 2038,
                 "name": "orderType",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1311:19:7",
+                "scope": 2065,
+                "src": "1311:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$2168",
+                  "typeIdentifier": "t_enum$_OrderType_$1992",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2213,
+                  "id": 2037,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2168,
-                  "src": "1311:9:7",
+                  "referencedDeclaration": 1992,
+                  "src": "1311:9:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -1827,26 +1827,26 @@
               },
               {
                 "constant": false,
-                "id": 2216,
+                "id": 2040,
                 "name": "orderStatus",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1340:23:7",
+                "scope": 2065,
+                "src": "1340:23:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                  "typeIdentifier": "t_enum$_OrderStatus_$1996",
                   "typeString": "enum Market.OrderStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2215,
+                  "id": 2039,
                   "name": "OrderStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2172,
-                  "src": "1340:11:7",
+                  "referencedDeclaration": 1996,
+                  "src": "1340:11:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                    "typeIdentifier": "t_enum$_OrderStatus_$1996",
                     "typeString": "enum Market.OrderStatus"
                   }
                 },
@@ -1855,11 +1855,11 @@
               },
               {
                 "constant": false,
-                "id": 2218,
+                "id": 2042,
                 "name": "author",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1373:14:7",
+                "scope": 2065,
+                "src": "1373:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1867,10 +1867,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2217,
+                  "id": 2041,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1373:7:7",
+                  "src": "1373:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1881,11 +1881,11 @@
               },
               {
                 "constant": false,
-                "id": 2220,
+                "id": 2044,
                 "name": "counterparty",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1397:20:7",
+                "scope": 2065,
+                "src": "1397:20:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1893,10 +1893,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2219,
+                  "id": 2043,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1397:7:7",
+                  "src": "1397:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1907,11 +1907,11 @@
               },
               {
                 "constant": false,
-                "id": 2222,
+                "id": 2046,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1427:13:7",
+                "scope": 2065,
+                "src": "1427:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1919,10 +1919,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2221,
+                  "id": 2045,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1427:4:7",
+                  "src": "1427:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1933,11 +1933,11 @@
               },
               {
                 "constant": false,
-                "id": 2224,
+                "id": 2048,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1450:13:7",
+                "scope": 2065,
+                "src": "1450:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1945,10 +1945,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2223,
+                  "id": 2047,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1450:7:7",
+                  "src": "1450:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1959,11 +1959,11 @@
               },
               {
                 "constant": false,
-                "id": 2227,
+                "id": 2051,
                 "name": "netflags",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1473:15:7",
+                "scope": 2065,
+                "src": "1473:15:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1972,19 +1972,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2225,
+                    "id": 2049,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1473:4:7",
+                    "src": "1473:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2226,
+                  "id": 2050,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1473:6:7",
+                  "src": "1473:6:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                     "typeString": "bool[]"
@@ -1995,26 +1995,26 @@
               },
               {
                 "constant": false,
-                "id": 2229,
+                "id": 2053,
                 "name": "identityLevel",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1498:43:7",
+                "scope": 2065,
+                "src": "1498:43:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                  "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                   "typeString": "enum ProfileRegistry.IdentityLevel"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2228,
+                  "id": 2052,
                   "name": "ProfileRegistry.IdentityLevel",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 9497,
-                  "src": "1498:29:7",
+                  "referencedDeclaration": 10343,
+                  "src": "1498:29:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   }
                 },
@@ -2023,11 +2023,11 @@
               },
               {
                 "constant": false,
-                "id": 2231,
+                "id": 2055,
                 "name": "blacklist",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1551:17:7",
+                "scope": 2065,
+                "src": "1551:17:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2035,10 +2035,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2230,
+                  "id": 2054,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1551:7:7",
+                  "src": "1551:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -2049,11 +2049,11 @@
               },
               {
                 "constant": false,
-                "id": 2233,
+                "id": 2057,
                 "name": "tag",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1578:11:7",
+                "scope": 2065,
+                "src": "1578:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2061,10 +2061,10 @@
                   "typeString": "bytes32"
                 },
                 "typeName": {
-                  "id": 2232,
+                  "id": 2056,
                   "name": "bytes32",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1578:7:7",
+                  "src": "1578:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes32",
                     "typeString": "bytes32"
@@ -2075,11 +2075,11 @@
               },
               {
                 "constant": false,
-                "id": 2236,
+                "id": 2060,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1599:19:7",
+                "scope": 2065,
+                "src": "1599:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2088,19 +2088,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2234,
+                    "id": 2058,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1599:6:7",
+                    "src": "1599:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 2235,
+                  "id": 2059,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1599:8:7",
+                  "src": "1599:8:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -2111,11 +2111,11 @@
               },
               {
                 "constant": false,
-                "id": 2238,
+                "id": 2062,
                 "name": "frozenSum",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1628:14:7",
+                "scope": 2065,
+                "src": "1628:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2123,10 +2123,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2237,
+                  "id": 2061,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1628:4:7",
+                  "src": "1628:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2137,11 +2137,11 @@
               },
               {
                 "constant": false,
-                "id": 2240,
+                "id": 2064,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1652:11:7",
+                "scope": 2065,
+                "src": "1652:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2149,10 +2149,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2239,
+                  "id": 2063,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1652:4:7",
+                  "src": "1652:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2164,21 +2164,21 @@
             ],
             "name": "Order",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "1288:382:7",
+            "scope": 5065,
+            "src": "1288:382:6",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.ChangeRequest",
-            "id": 2252,
+            "id": 2076,
             "members": [
               {
                 "constant": false,
-                "id": 2243,
+                "id": 2067,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1707:11:7",
+                "scope": 2076,
+                "src": "1707:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2186,10 +2186,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2242,
+                  "id": 2066,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1707:4:7",
+                  "src": "1707:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2200,26 +2200,26 @@
               },
               {
                 "constant": false,
-                "id": 2245,
+                "id": 2069,
                 "name": "requestType",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1728:21:7",
+                "scope": 2076,
+                "src": "1728:21:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$2168",
+                  "typeIdentifier": "t_enum$_OrderType_$1992",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2244,
+                  "id": 2068,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2168,
-                  "src": "1728:9:7",
+                  "referencedDeclaration": 1992,
+                  "src": "1728:9:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -2228,11 +2228,11 @@
               },
               {
                 "constant": false,
-                "id": 2247,
+                "id": 2071,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1759:10:7",
+                "scope": 2076,
+                "src": "1759:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2240,10 +2240,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2246,
+                  "id": 2070,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1759:4:7",
+                  "src": "1759:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2254,11 +2254,11 @@
               },
               {
                 "constant": false,
-                "id": 2249,
+                "id": 2073,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1779:13:7",
+                "scope": 2076,
+                "src": "1779:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -2266,10 +2266,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2248,
+                  "id": 2072,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1779:4:7",
+                  "src": "1779:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -2280,26 +2280,26 @@
               },
               {
                 "constant": false,
-                "id": 2251,
+                "id": 2075,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1802:20:7",
+                "scope": 2076,
+                "src": "1802:20:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                   "typeString": "enum Market.RequestStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2250,
+                  "id": 2074,
                   "name": "RequestStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2178,
-                  "src": "1802:13:7",
+                  "referencedDeclaration": 2002,
+                  "src": "1802:13:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                     "typeString": "enum Market.RequestStatus"
                   }
                 },
@@ -2309,28 +2309,28 @@
             ],
             "name": "ChangeRequest",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "1676:153:7",
+            "scope": 5065,
+            "src": "1676:153:6",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2256,
+            "id": 2080,
             "name": "OrderPlaced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2255,
+              "id": 2079,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2254,
+                  "id": 2078,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2256,
-                  "src": "1868:20:7",
+                  "scope": 2080,
+                  "src": "1868:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2338,10 +2338,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2253,
+                    "id": 2077,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1868:4:7",
+                    "src": "1868:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2351,28 +2351,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1867:22:7"
+              "src": "1867:22:6"
             },
-            "src": "1850:40:7"
+            "src": "1850:40:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2260,
+            "id": 2084,
             "name": "OrderUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2259,
+              "id": 2083,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2258,
+                  "id": 2082,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2260,
-                  "src": "1914:20:7",
+                  "scope": 2084,
+                  "src": "1914:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2380,10 +2380,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2257,
+                    "id": 2081,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1914:4:7",
+                    "src": "1914:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2393,28 +2393,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1913:22:7"
+              "src": "1913:22:6"
             },
-            "src": "1895:41:7"
+            "src": "1895:41:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2264,
+            "id": 2088,
             "name": "DealOpened",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2263,
+              "id": 2087,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2262,
+                  "id": 2086,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2264,
-                  "src": "1959:19:7",
+                  "scope": 2088,
+                  "src": "1959:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2422,10 +2422,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2261,
+                    "id": 2085,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1959:4:7",
+                    "src": "1959:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2435,28 +2435,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1958:21:7"
+              "src": "1958:21:6"
             },
-            "src": "1942:38:7"
+            "src": "1942:38:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2268,
+            "id": 2092,
             "name": "DealUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2267,
+              "id": 2091,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2266,
+                  "id": 2090,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2268,
-                  "src": "2003:19:7",
+                  "scope": 2092,
+                  "src": "2003:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2464,10 +2464,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2265,
+                    "id": 2089,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2003:4:7",
+                    "src": "2003:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2477,28 +2477,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2002:21:7"
+              "src": "2002:21:6"
             },
-            "src": "1985:39:7"
+            "src": "1985:39:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2274,
+            "id": 2098,
             "name": "Billed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2273,
+              "id": 2097,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2270,
+                  "id": 2094,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2274,
-                  "src": "2043:19:7",
+                  "scope": 2098,
+                  "src": "2043:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2506,10 +2506,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2269,
+                    "id": 2093,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2043:4:7",
+                    "src": "2043:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2520,12 +2520,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2272,
+                  "id": 2096,
                   "indexed": true,
                   "name": "paidAmount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2274,
-                  "src": "2064:23:7",
+                  "scope": 2098,
+                  "src": "2064:23:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2533,10 +2533,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2271,
+                    "id": 2095,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2064:4:7",
+                    "src": "2064:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2546,28 +2546,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2042:46:7"
+              "src": "2042:46:6"
             },
-            "src": "2030:59:7"
+            "src": "2030:59:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2278,
+            "id": 2102,
             "name": "DealChangeRequestSet",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2277,
+              "id": 2101,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2276,
+                  "id": 2100,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2278,
-                  "src": "2122:28:7",
+                  "scope": 2102,
+                  "src": "2122:28:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2575,10 +2575,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2275,
+                    "id": 2099,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2122:4:7",
+                    "src": "2122:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2588,28 +2588,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2121:30:7"
+              "src": "2121:30:6"
             },
-            "src": "2095:57:7"
+            "src": "2095:57:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2282,
+            "id": 2106,
             "name": "DealChangeRequestUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2281,
+              "id": 2105,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2280,
+                  "id": 2104,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2282,
-                  "src": "2188:28:7",
+                  "scope": 2106,
+                  "src": "2188:28:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2617,10 +2617,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2279,
+                    "id": 2103,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2188:4:7",
+                    "src": "2188:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2630,28 +2630,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2187:30:7"
+              "src": "2187:30:6"
             },
-            "src": "2157:61:7"
+            "src": "2157:61:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2288,
+            "id": 2112,
             "name": "WorkerAnnounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2287,
+              "id": 2111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2284,
+                  "id": 2108,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2288,
-                  "src": "2246:22:7",
+                  "scope": 2112,
+                  "src": "2246:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2659,10 +2659,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2283,
+                    "id": 2107,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2246:7:7",
+                    "src": "2246:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2673,12 +2673,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2286,
+                  "id": 2110,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2288,
-                  "src": "2270:22:7",
+                  "scope": 2112,
+                  "src": "2270:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2686,10 +2686,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2285,
+                    "id": 2109,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2270:7:7",
+                    "src": "2270:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2699,28 +2699,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2245:48:7"
+              "src": "2245:48:6"
             },
-            "src": "2224:70:7"
+            "src": "2224:70:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2294,
+            "id": 2118,
             "name": "WorkerConfirmed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2293,
+              "id": 2117,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2290,
+                  "id": 2114,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2294,
-                  "src": "2321:22:7",
+                  "scope": 2118,
+                  "src": "2321:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2728,10 +2728,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2289,
+                    "id": 2113,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2321:7:7",
+                    "src": "2321:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2742,12 +2742,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2292,
+                  "id": 2116,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2294,
-                  "src": "2345:22:7",
+                  "scope": 2118,
+                  "src": "2345:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2755,10 +2755,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2291,
+                    "id": 2115,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:7",
+                    "src": "2345:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2768,28 +2768,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2320:48:7"
+              "src": "2320:48:6"
             },
-            "src": "2299:70:7"
+            "src": "2299:70:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2300,
+            "id": 2124,
             "name": "WorkerRemoved",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2299,
+              "id": 2123,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2296,
+                  "id": 2120,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2300,
-                  "src": "2394:22:7",
+                  "scope": 2124,
+                  "src": "2394:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2797,10 +2797,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2295,
+                    "id": 2119,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2394:7:7",
+                    "src": "2394:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2811,12 +2811,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2298,
+                  "id": 2122,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2300,
-                  "src": "2418:22:7",
+                  "scope": 2124,
+                  "src": "2418:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2824,10 +2824,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2297,
+                    "id": 2121,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2418:7:7",
+                    "src": "2418:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2837,28 +2837,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2393:48:7"
+              "src": "2393:48:6"
             },
-            "src": "2374:68:7"
+            "src": "2374:68:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2304,
+            "id": 2128,
             "name": "NumBenchmarksUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2303,
+              "id": 2127,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2302,
+                  "id": 2126,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2304,
-                  "src": "2475:19:7",
+                  "scope": 2128,
+                  "src": "2475:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2866,10 +2866,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2301,
+                    "id": 2125,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2475:4:7",
+                    "src": "2475:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2879,28 +2879,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2474:21:7"
+              "src": "2474:21:6"
             },
-            "src": "2448:48:7"
+            "src": "2448:48:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2308,
+            "id": 2132,
             "name": "NumNetflagsUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2307,
+              "id": 2131,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2306,
+                  "id": 2130,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2308,
-                  "src": "2526:19:7",
+                  "scope": 2132,
+                  "src": "2526:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2908,10 +2908,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2305,
+                    "id": 2129,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2526:4:7",
+                    "src": "2526:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2921,17 +2921,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2525:21:7"
+              "src": "2525:21:6"
             },
-            "src": "2501:46:7"
+            "src": "2501:46:6"
           },
           {
             "constant": true,
-            "id": 2313,
+            "id": 2137,
             "name": "MAX_BENCHMARKS_VALUE",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2566:44:7",
+            "scope": 5065,
+            "src": "2566:44:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -2939,10 +2939,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2309,
+              "id": 2133,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2566:4:7",
+              "src": "2566:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -2954,7 +2954,7 @@
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
               },
-              "id": 2312,
+              "id": 2136,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -2962,14 +2962,14 @@
               "leftExpression": {
                 "argumentTypes": null,
                 "hexValue": "32",
-                "id": 2310,
+                "id": 2134,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2603:1:7",
+                "src": "2603:1:6",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_2_by_1",
@@ -2982,14 +2982,14 @@
               "rightExpression": {
                 "argumentTypes": null,
                 "hexValue": "3633",
-                "id": 2311,
+                "id": 2135,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2608:2:7",
+                "src": "2608:2:6",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_63_by_1",
@@ -2997,7 +2997,7 @@
                 },
                 "value": "63"
               },
-              "src": "2603:7:7",
+              "src": "2603:7:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
@@ -3007,26 +3007,26 @@
           },
           {
             "constant": false,
-            "id": 2315,
+            "id": 2139,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2617:9:7",
+            "scope": 5065,
+            "src": "2617:9:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$10080",
+              "typeIdentifier": "t_contract$_SNM_$10926",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2314,
+              "id": 2138,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10080,
-              "src": "2617:3:7",
+              "referencedDeclaration": 10926,
+              "src": "2617:3:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$10080",
+                "typeIdentifier": "t_contract$_SNM_$10926",
                 "typeString": "contract SNM"
               }
             },
@@ -3035,26 +3035,26 @@
           },
           {
             "constant": false,
-            "id": 2317,
+            "id": 2141,
             "name": "bl",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2633:12:7",
+            "scope": 5065,
+            "src": "2633:12:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_Blacklist_$1161",
+              "typeIdentifier": "t_contract$_Blacklist_$985",
               "typeString": "contract Blacklist"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2316,
+              "id": 2140,
               "name": "Blacklist",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 1161,
-              "src": "2633:9:7",
+              "referencedDeclaration": 985,
+              "src": "2633:9:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                "typeIdentifier": "t_contract$_Blacklist_$985",
                 "typeString": "contract Blacklist"
               }
             },
@@ -3063,26 +3063,26 @@
           },
           {
             "constant": false,
-            "id": 2319,
+            "id": 2143,
             "name": "oracle",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2652:16:7",
+            "scope": 5065,
+            "src": "2652:16:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_OracleUSD_$8677",
+              "typeIdentifier": "t_contract$_OracleUSD_$9523",
               "typeString": "contract OracleUSD"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2318,
+              "id": 2142,
               "name": "OracleUSD",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 8677,
-              "src": "2652:9:7",
+              "referencedDeclaration": 9523,
+              "src": "2652:9:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                "typeIdentifier": "t_contract$_OracleUSD_$9523",
                 "typeString": "contract OracleUSD"
               }
             },
@@ -3091,26 +3091,26 @@
           },
           {
             "constant": false,
-            "id": 2321,
+            "id": 2145,
             "name": "pr",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2675:18:7",
+            "scope": 5065,
+            "src": "2675:18:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+              "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
               "typeString": "contract ProfileRegistry"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2320,
+              "id": 2144,
               "name": "ProfileRegistry",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10035,
-              "src": "2675:15:7",
+              "referencedDeclaration": 10881,
+              "src": "2675:15:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                 "typeString": "contract ProfileRegistry"
               }
             },
@@ -3119,11 +3119,11 @@
           },
           {
             "constant": false,
-            "id": 2324,
+            "id": 2148,
             "name": "ordersAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2700:21:7",
+            "scope": 5065,
+            "src": "2700:21:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3131,10 +3131,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2322,
+              "id": 2146,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2700:4:7",
+              "src": "2700:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3143,14 +3143,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2323,
+              "id": 2147,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2720:1:7",
+              "src": "2720:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3162,11 +3162,11 @@
           },
           {
             "constant": false,
-            "id": 2327,
+            "id": 2151,
             "name": "dealAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2728:19:7",
+            "scope": 5065,
+            "src": "2728:19:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3174,10 +3174,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2325,
+              "id": 2149,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2728:4:7",
+              "src": "2728:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3186,14 +3186,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2326,
+              "id": 2150,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2746:1:7",
+              "src": "2746:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3205,11 +3205,11 @@
           },
           {
             "constant": false,
-            "id": 2330,
+            "id": 2154,
             "name": "requestsAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2754:23:7",
+            "scope": 5065,
+            "src": "2754:23:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3217,10 +3217,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2328,
+              "id": 2152,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2754:4:7",
+              "src": "2754:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3229,14 +3229,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2329,
+              "id": 2153,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2776:1:7",
+              "src": "2776:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -3248,11 +3248,11 @@
           },
           {
             "constant": false,
-            "id": 2332,
+            "id": 2156,
             "name": "benchmarksQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2820:23:7",
+            "scope": 5065,
+            "src": "2820:23:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3260,10 +3260,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2331,
+              "id": 2155,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2820:4:7",
+              "src": "2820:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3274,11 +3274,11 @@
           },
           {
             "constant": false,
-            "id": 2334,
+            "id": 2158,
             "name": "netflagsQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2884:21:7",
+            "scope": 5065,
+            "src": "2884:21:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3286,10 +3286,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2333,
+              "id": 2157,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2884:4:7",
+              "src": "2884:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -3300,44 +3300,44 @@
           },
           {
             "constant": false,
-            "id": 2338,
+            "id": 2162,
             "name": "orders",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2912:36:7",
+            "scope": 5065,
+            "src": "2912:36:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
               "typeString": "mapping(uint256 => struct Market.Order)"
             },
             "typeName": {
-              "id": 2337,
+              "id": 2161,
               "keyType": {
-                "id": 2335,
+                "id": 2159,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2920:4:7",
+                "src": "2920:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2912:22:7",
+              "src": "2912:22:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Order)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2336,
+                "id": 2160,
                 "name": "Order",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2241,
-                "src": "2928:5:7",
+                "referencedDeclaration": 2065,
+                "src": "2928:5:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                  "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                   "typeString": "struct Market.Order"
                 }
               }
@@ -3347,44 +3347,44 @@
           },
           {
             "constant": false,
-            "id": 2342,
+            "id": 2166,
             "name": "deals",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2955:34:7",
+            "scope": 5065,
+            "src": "2955:34:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
               "typeString": "mapping(uint256 => struct Market.Deal)"
             },
             "typeName": {
-              "id": 2341,
+              "id": 2165,
               "keyType": {
-                "id": 2339,
+                "id": 2163,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2963:4:7",
+                "src": "2963:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2955:21:7",
+              "src": "2955:21:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Deal)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2340,
+                "id": 2164,
                 "name": "Deal",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2212,
-                "src": "2971:4:7",
+                "referencedDeclaration": 2036,
+                "src": "2971:4:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                  "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                   "typeString": "struct Market.Deal"
                 }
               }
@@ -3394,11 +3394,11 @@
           },
           {
             "constant": false,
-            "id": 2347,
+            "id": 2171,
             "name": "dealsID",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2996:34:7",
+            "scope": 5065,
+            "src": "2996:34:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3406,38 +3406,38 @@
               "typeString": "mapping(address => uint256[])"
             },
             "typeName": {
-              "id": 2346,
+              "id": 2170,
               "keyType": {
-                "id": 2343,
+                "id": 2167,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3004:7:7",
+                "src": "3004:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2996:26:7",
+              "src": "2996:26:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_uint256_$dyn_storage_$",
                 "typeString": "mapping(address => uint256[])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 2344,
+                  "id": 2168,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3015:4:7",
+                  "src": "3015:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 2345,
+                "id": 2169,
                 "length": null,
                 "nodeType": "ArrayTypeName",
-                "src": "3015:6:7",
+                "src": "3015:6:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                   "typeString": "uint256[]"
@@ -3449,44 +3449,44 @@
           },
           {
             "constant": false,
-            "id": 2351,
+            "id": 2175,
             "name": "requests",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3037:39:7",
+            "scope": 5065,
+            "src": "3037:39:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
               "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
             },
             "typeName": {
-              "id": 2350,
+              "id": 2174,
               "keyType": {
-                "id": 2348,
+                "id": 2172,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3045:4:7",
+                "src": "3045:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3037:30:7",
+              "src": "3037:30:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                 "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2349,
+                "id": 2173,
                 "name": "ChangeRequest",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2252,
-                "src": "3053:13:7",
+                "referencedDeclaration": 2076,
+                "src": "3053:13:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                  "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                   "typeString": "struct Market.ChangeRequest"
                 }
               }
@@ -3496,11 +3496,11 @@
           },
           {
             "constant": false,
-            "id": 2357,
+            "id": 2181,
             "name": "actualRequests",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3083:39:7",
+            "scope": 5065,
+            "src": "3083:39:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3508,46 +3508,46 @@
               "typeString": "mapping(uint256 => uint256[2])"
             },
             "typeName": {
-              "id": 2356,
+              "id": 2180,
               "keyType": {
-                "id": 2352,
+                "id": 2176,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3091:4:7",
+                "src": "3091:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3083:24:7",
+              "src": "3083:24:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                 "typeString": "mapping(uint256 => uint256[2])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 2353,
+                  "id": 2177,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3099:4:7",
+                  "src": "3099:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 2355,
+                "id": 2179,
                 "length": {
                   "argumentTypes": null,
                   "hexValue": "32",
-                  "id": 2354,
+                  "id": 2178,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "kind": "number",
                   "lValueRequested": false,
                   "nodeType": "Literal",
-                  "src": "3104:1:7",
+                  "src": "3104:1:6",
                   "subdenomination": null,
                   "typeDescriptions": {
                     "typeIdentifier": null,
@@ -3556,7 +3556,7 @@
                   "value": "2"
                 },
                 "nodeType": "ArrayTypeName",
-                "src": "3099:7:7",
+                "src": "3099:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$2_storage_ptr",
                   "typeString": "uint256[2]"
@@ -3568,11 +3568,11 @@
           },
           {
             "constant": false,
-            "id": 2361,
+            "id": 2185,
             "name": "masterOf",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3129:36:7",
+            "scope": 5065,
+            "src": "3129:36:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3580,28 +3580,28 @@
               "typeString": "mapping(address => address)"
             },
             "typeName": {
-              "id": 2360,
+              "id": 2184,
               "keyType": {
-                "id": 2358,
+                "id": 2182,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3137:7:7",
+                "src": "3137:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3129:27:7",
+              "src": "3129:27:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                 "typeString": "mapping(address => address)"
               },
               "valueType": {
-                "id": 2359,
+                "id": 2183,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3148:7:7",
+                "src": "3148:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
@@ -3613,11 +3613,11 @@
           },
           {
             "constant": false,
-            "id": 2365,
+            "id": 2189,
             "name": "isMaster",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3172:33:7",
+            "scope": 5065,
+            "src": "3172:33:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3625,28 +3625,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 2364,
+              "id": 2188,
               "keyType": {
-                "id": 2362,
+                "id": 2186,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3180:7:7",
+                "src": "3180:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3172:24:7",
+              "src": "3172:24:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 2363,
+                "id": 2187,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "3191:4:7",
+                "src": "3191:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -3658,11 +3658,11 @@
           },
           {
             "constant": false,
-            "id": 2371,
+            "id": 2195,
             "name": "masterRequest",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3212:58:7",
+            "scope": 5065,
+            "src": "3212:58:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3670,46 +3670,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 2370,
+              "id": 2194,
               "keyType": {
-                "id": 2366,
+                "id": 2190,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3220:7:7",
+                "src": "3220:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3212:44:7",
+              "src": "3212:44:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 2369,
+                "id": 2193,
                 "keyType": {
-                  "id": 2367,
+                  "id": 2191,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3239:7:7",
+                  "src": "3239:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "3231:24:7",
+                "src": "3231:24:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 2368,
+                  "id": 2192,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3250:4:7",
+                  "src": "3250:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -3722,28 +3722,28 @@
           },
           {
             "body": {
-              "id": 2418,
+              "id": 2242,
               "nodeType": "Block",
-              "src": "3438:253:7",
+              "src": "3523:253:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2390,
+                    "id": 2214,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2386,
+                      "id": 2210,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2315,
-                      "src": "3448:5:7",
+                      "referencedDeclaration": 2139,
+                      "src": "3533:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$10080",
+                        "typeIdentifier": "t_contract$_SNM_$10926",
                         "typeString": "contract SNM"
                       }
                     },
@@ -3754,12 +3754,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2388,
+                          "id": 2212,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2373,
-                          "src": "3460:6:7",
+                          "referencedDeclaration": 2197,
+                          "src": "3545:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3773,18 +3773,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2387,
+                        "id": 2211,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10080,
-                        "src": "3456:3:7",
+                        "referencedDeclaration": 10926,
+                        "src": "3541:3:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10926_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 2389,
+                      "id": 2213,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3792,40 +3792,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3456:11:7",
+                      "src": "3541:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$10080",
+                        "typeIdentifier": "t_contract$_SNM_$10926",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "3448:19:7",
+                    "src": "3533:19:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$10080",
+                      "typeIdentifier": "t_contract$_SNM_$10926",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 2391,
+                  "id": 2215,
                   "nodeType": "ExpressionStatement",
-                  "src": "3448:19:7"
+                  "src": "3533:19:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2396,
+                    "id": 2220,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2392,
+                      "id": 2216,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2317,
-                      "src": "3477:2:7",
+                      "referencedDeclaration": 2141,
+                      "src": "3562:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -3836,12 +3836,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2394,
+                          "id": 2218,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2375,
-                          "src": "3492:10:7",
+                          "referencedDeclaration": 2199,
+                          "src": "3577:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3855,18 +3855,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2393,
+                        "id": 2217,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1161,
-                        "src": "3482:9:7",
+                        "referencedDeclaration": 985,
+                        "src": "3567:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$985_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 2395,
+                      "id": 2219,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3874,40 +3874,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3482:21:7",
+                      "src": "3567:21:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "3477:26:7",
+                    "src": "3562:26:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$1161",
+                      "typeIdentifier": "t_contract$_Blacklist_$985",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 2397,
+                  "id": 2221,
                   "nodeType": "ExpressionStatement",
-                  "src": "3477:26:7"
+                  "src": "3562:26:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2402,
+                    "id": 2226,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2398,
+                      "id": 2222,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2319,
-                      "src": "3513:6:7",
+                      "referencedDeclaration": 2143,
+                      "src": "3598:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -3918,12 +3918,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2400,
+                          "id": 2224,
                           "name": "_oracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2377,
-                          "src": "3532:7:7",
+                          "referencedDeclaration": 2201,
+                          "src": "3617:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3937,18 +3937,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2399,
+                        "id": 2223,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8677,
-                        "src": "3522:9:7",
+                        "referencedDeclaration": 9523,
+                        "src": "3607:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 2401,
+                      "id": 2225,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3956,40 +3956,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3522:18:7",
+                      "src": "3607:18:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "3513:27:7",
+                    "src": "3598:27:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                      "typeIdentifier": "t_contract$_OracleUSD_$9523",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 2403,
+                  "id": 2227,
                   "nodeType": "ExpressionStatement",
-                  "src": "3513:27:7"
+                  "src": "3598:27:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2408,
+                    "id": 2232,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2404,
+                      "id": 2228,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2321,
-                      "src": "3550:2:7",
+                      "referencedDeclaration": 2145,
+                      "src": "3635:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -4000,12 +4000,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2406,
+                          "id": 2230,
                           "name": "_profileRegistry",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2379,
-                          "src": "3571:16:7",
+                          "referencedDeclaration": 2203,
+                          "src": "3656:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4019,18 +4019,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2405,
+                        "id": 2229,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10035,
-                        "src": "3555:15:7",
+                        "referencedDeclaration": 10881,
+                        "src": "3640:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 2407,
+                      "id": 2231,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4038,38 +4038,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3555:33:7",
+                      "src": "3640:33:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "3550:38:7",
+                    "src": "3635:38:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 2409,
+                  "id": 2233,
                   "nodeType": "ExpressionStatement",
-                  "src": "3550:38:7"
+                  "src": "3635:38:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2412,
+                    "id": 2236,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2410,
+                      "id": 2234,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "3598:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "3683:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4079,43 +4079,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 2411,
+                      "id": 2235,
                       "name": "_benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2381,
-                      "src": "3619:19:7",
+                      "referencedDeclaration": 2205,
+                      "src": "3704:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3598:40:7",
+                    "src": "3683:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2413,
+                  "id": 2237,
                   "nodeType": "ExpressionStatement",
-                  "src": "3598:40:7"
+                  "src": "3683:40:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2416,
+                    "id": 2240,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2414,
+                      "id": 2238,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "3648:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "3733:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4125,31 +4125,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 2415,
+                      "id": 2239,
                       "name": "_netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2383,
-                      "src": "3667:17:7",
+                      "referencedDeclaration": 2207,
+                      "src": "3752:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3648:36:7",
+                    "src": "3733:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2417,
+                  "id": 2241,
                   "nodeType": "ExpressionStatement",
-                  "src": "3648:36:7"
+                  "src": "3733:36:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2419,
+            "id": 2243,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -4157,16 +4157,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2384,
+              "id": 2208,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2373,
+                  "id": 2197,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3302:14:7",
+                  "scope": 2243,
+                  "src": "3302:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4174,10 +4174,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2372,
+                    "id": 2196,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3302:7:7",
+                    "src": "3302:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4188,11 +4188,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2375,
+                  "id": 2199,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3318:18:7",
+                  "scope": 2243,
+                  "src": "3334:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4200,10 +4200,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2374,
+                    "id": 2198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3318:7:7",
+                    "src": "3334:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4214,11 +4214,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2377,
+                  "id": 2201,
                   "name": "_oracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3338:15:7",
+                  "scope": 2243,
+                  "src": "3370:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4226,10 +4226,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2376,
+                    "id": 2200,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3338:7:7",
+                    "src": "3370:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4240,11 +4240,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2379,
+                  "id": 2203,
                   "name": "_profileRegistry",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3355:24:7",
+                  "scope": 2243,
+                  "src": "3403:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4252,10 +4252,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2378,
+                    "id": 2202,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3355:7:7",
+                    "src": "3403:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4266,11 +4266,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2381,
+                  "id": 2205,
                   "name": "_benchmarksQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3381:24:7",
+                  "scope": 2243,
+                  "src": "3445:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4278,10 +4278,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2380,
+                    "id": 2204,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3381:4:7",
+                    "src": "3445:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4292,11 +4292,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2383,
+                  "id": 2207,
                   "name": "_netflagsQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3407:22:7",
+                  "scope": 2243,
+                  "src": "3487:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4304,10 +4304,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2382,
+                    "id": 2206,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3407:4:7",
+                    "src": "3487:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4317,26 +4317,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3301:129:7"
+              "src": "3301:214:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2385,
+              "id": 2209,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3438:0:7"
+              "src": "3523:0:6"
             },
-            "scope": 5229,
-            "src": "3290:401:7",
+            "scope": 5065,
+            "src": "3290:486:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2580,
+              "id": 2404,
               "nodeType": "Block",
-              "src": "4068:1331:7",
+              "src": "4153:1331:6",
               "statements": [
                 {
                   "expression": {
@@ -4345,24 +4345,24 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2451,
+                        "id": 2275,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2447,
+                          "id": 2271,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2432,
-                          "src": "4087:14:7",
+                          "referencedDeclaration": 2256,
+                          "src": "4172:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -4374,32 +4374,32 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2448,
+                              "id": 2272,
                               "name": "ProfileRegistry",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 10035,
-                              "src": "4105:15:7",
+                              "referencedDeclaration": 10881,
+                              "src": "4190:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                                 "typeString": "type(contract ProfileRegistry)"
                               }
                             },
-                            "id": 2449,
+                            "id": 2273,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "IdentityLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9497,
-                            "src": "4105:29:7",
+                            "referencedDeclaration": 10343,
+                            "src": "4190:29:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2450,
+                          "id": 2274,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4407,13 +4407,13 @@
                           "memberName": "ANONYMOUS",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4105:39:7",
+                          "src": "4190:39:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "4087:57:7",
+                        "src": "4172:57:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4427,21 +4427,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2446,
+                      "id": 2270,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4079:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4164:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2452,
+                    "id": 2276,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4449,15 +4449,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4079:66:7",
+                    "src": "4164:66:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2453,
+                  "id": 2277,
                   "nodeType": "ExpressionStatement",
-                  "src": "4079:66:7"
+                  "src": "4164:66:6"
                 },
                 {
                   "expression": {
@@ -4469,7 +4469,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2458,
+                        "id": 2282,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4478,18 +4478,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2455,
+                            "id": 2279,
                             "name": "_netflags",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2430,
-                            "src": "4163:9:7",
+                            "referencedDeclaration": 2254,
+                            "src": "4248:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "id": 2456,
+                          "id": 2280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4497,7 +4497,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4163:16:7",
+                          "src": "4248:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4507,18 +4507,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2457,
+                          "id": 2281,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2334,
-                          "src": "4183:16:7",
+                          "referencedDeclaration": 2158,
+                          "src": "4268:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4163:36:7",
+                        "src": "4248:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4532,21 +4532,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2454,
+                      "id": 2278,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4155:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4240:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2459,
+                    "id": 2283,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4554,15 +4554,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4155:45:7",
+                    "src": "4240:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2460,
+                  "id": 2284,
                   "nodeType": "ExpressionStatement",
-                  "src": "4155:45:7"
+                  "src": "4240:45:6"
                 },
                 {
                   "expression": {
@@ -4574,7 +4574,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2465,
+                        "id": 2289,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4583,18 +4583,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2462,
+                            "id": 2286,
                             "name": "_benchmarks",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2439,
-                            "src": "4218:11:7",
+                            "referencedDeclaration": 2263,
+                            "src": "4303:11:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "id": 2463,
+                          "id": 2287,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4602,7 +4602,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4218:18:7",
+                          "src": "4303:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4612,18 +4612,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2464,
+                          "id": 2288,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2332,
-                          "src": "4240:18:7",
+                          "referencedDeclaration": 2156,
+                          "src": "4325:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4218:40:7",
+                        "src": "4303:40:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4637,21 +4637,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2461,
+                      "id": 2285,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4210:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4295:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2466,
+                    "id": 2290,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4659,21 +4659,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4210:49:7",
+                    "src": "4295:49:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2467,
+                  "id": 2291,
                   "nodeType": "ExpressionStatement",
-                  "src": "4210:49:7"
+                  "src": "4295:49:6"
                 },
                 {
                   "body": {
-                    "id": 2487,
+                    "id": 2311,
                     "nodeType": "Block",
-                    "src": "4316:71:7",
+                    "src": "4401:71:6",
                     "statements": [
                       {
                         "expression": {
@@ -4685,7 +4685,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2484,
+                              "id": 2308,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4694,26 +4694,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2480,
+                                  "id": 2304,
                                   "name": "_benchmarks",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2439,
-                                  "src": "4338:11:7",
+                                  "referencedDeclaration": 2263,
+                                  "src": "4423:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 2482,
+                                "id": 2306,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2481,
+                                  "id": 2305,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2469,
-                                  "src": "4350:1:7",
+                                  "referencedDeclaration": 2293,
+                                  "src": "4435:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -4724,7 +4724,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "4338:14:7",
+                                "src": "4423:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -4734,18 +4734,18 @@
                               "operator": "<",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2483,
+                                "id": 2307,
                                 "name": "MAX_BENCHMARKS_VALUE",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2313,
-                                "src": "4355:20:7",
+                                "referencedDeclaration": 2137,
+                                "src": "4440:20:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "4338:37:7",
+                              "src": "4423:37:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -4759,21 +4759,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 2479,
+                            "id": 2303,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "4330:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "4415:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 2485,
+                          "id": 2309,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4781,15 +4781,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4330:46:7",
+                          "src": "4415:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2486,
+                        "id": 2310,
                         "nodeType": "ExpressionStatement",
-                        "src": "4330:46:7"
+                        "src": "4415:46:6"
                       }
                     ]
                   },
@@ -4799,19 +4799,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 2475,
+                    "id": 2299,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2472,
+                      "id": 2296,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2469,
-                      "src": "4287:1:7",
+                      "referencedDeclaration": 2293,
+                      "src": "4372:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4823,18 +4823,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2473,
+                        "id": 2297,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2439,
-                        "src": "4291:11:7",
+                        "referencedDeclaration": 2263,
+                        "src": "4376:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 2474,
+                      "id": 2298,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4842,31 +4842,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4291:18:7",
+                      "src": "4376:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4287:22:7",
+                    "src": "4372:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2488,
+                  "id": 2312,
                   "initializationExpression": {
                     "assignments": [
-                      2469
+                      2293
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 2469,
+                        "id": 2293,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 2581,
-                        "src": "4275:6:7",
+                        "scope": 2405,
+                        "src": "4360:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -4874,10 +4874,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 2468,
+                          "id": 2292,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4275:4:7",
+                          "src": "4360:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4887,18 +4887,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 2471,
+                    "id": 2295,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 2470,
+                      "id": 2294,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4284:1:7",
+                      "src": "4369:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -4907,12 +4907,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4275:10:7"
+                    "src": "4360:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 2477,
+                      "id": 2301,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4920,15 +4920,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4311:3:7",
+                      "src": "4396:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 2476,
+                        "id": 2300,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2469,
-                        "src": "4311:1:7",
+                        "referencedDeclaration": 2293,
+                        "src": "4396:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4939,25 +4939,25 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 2478,
+                    "id": 2302,
                     "nodeType": "ExpressionStatement",
-                    "src": "4311:3:7"
+                    "src": "4396:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4270:117:7"
+                  "src": "4355:117:6"
                 },
                 {
                   "assignments": [
-                    2490
+                    2314
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2490,
+                      "id": 2314,
                       "name": "lockedSum",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2581,
-                      "src": "4397:14:7",
+                      "scope": 2405,
+                      "src": "4482:14:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -4965,10 +4965,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2489,
+                        "id": 2313,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4397:4:7",
+                        "src": "4482:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4978,18 +4978,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2492,
+                  "id": 2316,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 2491,
+                    "id": 2315,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4414:1:7",
+                    "src": "4499:1:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -4998,30 +4998,30 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4397:18:7"
+                  "src": "4482:18:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2496,
+                    "id": 2320,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2493,
+                      "id": 2317,
                       "name": "_orderType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2421,
-                      "src": "4430:10:7",
+                      "referencedDeclaration": 2245,
+                      "src": "4515:10:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -5031,18 +5031,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2494,
+                        "id": 2318,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "4444:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "4529:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2495,
+                      "id": 2319,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5050,26 +5050,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4444:19:7",
+                      "src": "4529:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "4430:33:7",
+                    "src": "4515:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2540,
+                  "id": 2364,
                   "nodeType": "IfStatement",
-                  "src": "4426:463:7",
+                  "src": "4511:463:6",
                   "trueBody": {
-                    "id": 2539,
+                    "id": 2363,
                     "nodeType": "Block",
-                    "src": "4465:424:7",
+                    "src": "4550:424:6",
                     "statements": [
                       {
                         "condition": {
@@ -5078,19 +5078,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 2499,
+                          "id": 2323,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 2497,
+                            "id": 2321,
                             "name": "_duration",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2425,
-                            "src": "4483:9:7",
+                            "referencedDeclaration": 2249,
+                            "src": "4568:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -5101,14 +5101,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2498,
+                            "id": 2322,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4496:1:7",
+                            "src": "4581:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -5116,7 +5116,7 @@
                             },
                             "value": "0"
                           },
-                          "src": "4483:14:7",
+                          "src": "4568:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -5129,19 +5129,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2510,
+                            "id": 2334,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2508,
+                              "id": 2332,
                               "name": "_duration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2425,
-                              "src": "4587:9:7",
+                              "referencedDeclaration": 2249,
+                              "src": "4672:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5152,14 +5152,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2509,
+                              "id": 2333,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4599:6:7",
+                              "src": "4684:6:6",
                               "subdenomination": "days",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_86400_by_1",
@@ -5167,33 +5167,33 @@
                               },
                               "value": "1"
                             },
-                            "src": "4587:18:7",
+                            "src": "4672:18:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2526,
+                            "id": 2350,
                             "nodeType": "Block",
-                            "src": "4693:77:7",
+                            "src": "4778:77:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2524,
+                                  "id": 2348,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2519,
+                                    "id": 2343,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2490,
-                                    "src": "4711:9:7",
+                                    "referencedDeclaration": 2314,
+                                    "src": "4796:9:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -5206,12 +5206,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 2521,
+                                        "id": 2345,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2427,
-                                        "src": "4740:6:7",
+                                        "referencedDeclaration": 2251,
+                                        "src": "4825:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5220,14 +5220,14 @@
                                       {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 2522,
+                                        "id": 2346,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "4748:6:7",
+                                        "src": "4833:6:6",
                                         "subdenomination": "days",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_86400_by_1",
@@ -5247,18 +5247,18 @@
                                           "typeString": "int_const 86400"
                                         }
                                       ],
-                                      "id": 2520,
+                                      "id": 2344,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4870,
-                                      "src": "4723:16:7",
+                                      "referencedDeclaration": 4706,
+                                      "src": "4808:16:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 2523,
+                                    "id": 2347,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -5266,48 +5266,48 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4723:32:7",
+                                    "src": "4808:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4711:44:7",
+                                  "src": "4796:44:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2525,
+                                "id": 2349,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4711:44:7"
+                                "src": "4796:44:6"
                               }
                             ]
                           },
-                          "id": 2527,
+                          "id": 2351,
                           "nodeType": "IfStatement",
-                          "src": "4583:187:7",
+                          "src": "4668:187:6",
                           "trueBody": {
-                            "id": 2518,
+                            "id": 2342,
                             "nodeType": "Block",
-                            "src": "4607:80:7",
+                            "src": "4692:80:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2516,
+                                  "id": 2340,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2511,
+                                    "id": 2335,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2490,
-                                    "src": "4625:9:7",
+                                    "referencedDeclaration": 2314,
+                                    "src": "4710:9:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -5320,12 +5320,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 2513,
+                                        "id": 2337,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2427,
-                                        "src": "4654:6:7",
+                                        "referencedDeclaration": 2251,
+                                        "src": "4739:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5333,12 +5333,12 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 2514,
+                                        "id": 2338,
                                         "name": "_duration",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2425,
-                                        "src": "4662:9:7",
+                                        "referencedDeclaration": 2249,
+                                        "src": "4747:9:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -5356,18 +5356,18 @@
                                           "typeString": "uint256"
                                         }
                                       ],
-                                      "id": 2512,
+                                      "id": 2336,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4870,
-                                      "src": "4637:16:7",
+                                      "referencedDeclaration": 4706,
+                                      "src": "4722:16:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 2515,
+                                    "id": 2339,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -5375,49 +5375,49 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4637:35:7",
+                                    "src": "4722:35:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4625:47:7",
+                                  "src": "4710:47:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2517,
+                                "id": 2341,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4625:47:7"
+                                "src": "4710:47:6"
                               }
                             ]
                           }
                         },
-                        "id": 2528,
+                        "id": 2352,
                         "nodeType": "IfStatement",
-                        "src": "4479:291:7",
+                        "src": "4564:291:6",
                         "trueBody": {
-                          "id": 2507,
+                          "id": 2331,
                           "nodeType": "Block",
-                          "src": "4499:78:7",
+                          "src": "4584:78:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2505,
+                                "id": 2329,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2500,
+                                  "id": 2324,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2490,
-                                  "src": "4517:9:7",
+                                  "referencedDeclaration": 2314,
+                                  "src": "4602:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -5430,12 +5430,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2502,
+                                      "id": 2326,
                                       "name": "_price",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2427,
-                                      "src": "4546:6:7",
+                                      "referencedDeclaration": 2251,
+                                      "src": "4631:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -5444,14 +5444,14 @@
                                     {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2503,
+                                      "id": 2327,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "4554:7:7",
+                                      "src": "4639:7:6",
                                       "subdenomination": "hours",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_3600_by_1",
@@ -5471,18 +5471,18 @@
                                         "typeString": "int_const 3600"
                                       }
                                     ],
-                                    "id": 2501,
+                                    "id": 2325,
                                     "name": "CalculatePayment",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4870,
-                                    "src": "4529:16:7",
+                                    "referencedDeclaration": 4706,
+                                    "src": "4614:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) view returns (uint256)"
                                     }
                                   },
-                                  "id": 2504,
+                                  "id": 2328,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5490,21 +5490,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "4529:33:7",
+                                  "src": "4614:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "4517:45:7",
+                                "src": "4602:45:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2506,
+                              "id": 2330,
                               "nodeType": "ExpressionStatement",
-                              "src": "4517:45:7"
+                              "src": "4602:45:6"
                             }
                           ]
                         }
@@ -5520,18 +5520,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2532,
+                                    "id": 2356,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "4849:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "4934:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2533,
+                                  "id": 2357,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5539,7 +5539,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "4849:10:7",
+                                  "src": "4934:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -5547,25 +5547,25 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 2534,
+                                  "id": 2358,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11366,
-                                  "src": "4861:4:7",
+                                  "referencedDeclaration": 11646,
+                                  "src": "4946:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Market_$5229",
+                                    "typeIdentifier": "t_contract$_Market_$5065",
                                     "typeString": "contract Market"
                                   }
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 2535,
+                                  "id": 2359,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2490,
-                                  "src": "4867:9:7",
+                                  "referencedDeclaration": 2314,
+                                  "src": "4952:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -5579,7 +5579,7 @@
                                     "typeString": "address"
                                   },
                                   {
-                                    "typeIdentifier": "t_contract$_Market_$5229",
+                                    "typeIdentifier": "t_contract$_Market_$5065",
                                     "typeString": "contract Market"
                                   },
                                   {
@@ -5589,32 +5589,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2530,
+                                  "id": 2354,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2315,
-                                  "src": "4830:5:7",
+                                  "referencedDeclaration": 2139,
+                                  "src": "4915:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SNM_$10080",
+                                    "typeIdentifier": "t_contract$_SNM_$10926",
                                     "typeString": "contract SNM"
                                   }
                                 },
-                                "id": 2531,
+                                "id": 2355,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transferFrom",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 11153,
-                                "src": "4830:18:7",
+                                "referencedDeclaration": 11437,
+                                "src": "4915:18:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 2536,
+                              "id": 2360,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -5622,7 +5622,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "4830:47:7",
+                              "src": "4915:47:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -5636,21 +5636,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 2529,
+                            "id": 2353,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "4822:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "4907:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 2537,
+                          "id": 2361,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5658,15 +5658,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4822:56:7",
+                          "src": "4907:56:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2538,
+                        "id": 2362,
                         "nodeType": "ExpressionStatement",
-                        "src": "4822:56:7"
+                        "src": "4907:56:6"
                       }
                     ]
                   }
@@ -5674,19 +5674,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2546,
+                    "id": 2370,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2541,
+                      "id": 2365,
                       "name": "ordersAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2324,
-                      "src": "4899:12:7",
+                      "referencedDeclaration": 2148,
+                      "src": "4984:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5700,14 +5700,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 2544,
+                          "id": 2368,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4931:1:7",
+                          "src": "5016:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -5725,32 +5725,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2542,
+                          "id": 2366,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2324,
-                          "src": "4914:12:7",
+                          "referencedDeclaration": 2148,
+                          "src": "4999:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2543,
+                        "id": 2367,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "4914:16:7",
+                        "referencedDeclaration": 11079,
+                        "src": "4999:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 2545,
+                      "id": 2369,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5758,34 +5758,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4914:19:7",
+                      "src": "4999:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4899:34:7",
+                    "src": "4984:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2547,
+                  "id": 2371,
                   "nodeType": "ExpressionStatement",
-                  "src": "4899:34:7"
+                  "src": "4984:34:6"
                 },
                 {
                   "assignments": [
-                    2549
+                    2373
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2549,
+                      "id": 2373,
                       "name": "orderId",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2581,
-                      "src": "4943:15:7",
+                      "scope": 2405,
+                      "src": "5028:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -5793,10 +5793,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2548,
+                        "id": 2372,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4943:7:7",
+                        "src": "5028:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5806,27 +5806,27 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2551,
+                  "id": 2375,
                   "initialValue": {
                     "argumentTypes": null,
-                    "id": 2550,
+                    "id": 2374,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2324,
-                    "src": "4961:12:7",
+                    "referencedDeclaration": 2148,
+                    "src": "5046:12:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4943:30:7"
+                  "src": "5028:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2572,
+                    "id": 2396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5835,26 +5835,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2552,
+                        "id": 2376,
                         "name": "orders",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2338,
-                        "src": "4984:6:7",
+                        "referencedDeclaration": 2162,
+                        "src": "5069:6:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                         }
                       },
-                      "id": 2554,
+                      "id": 2378,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2553,
+                        "id": 2377,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "4991:7:7",
+                        "referencedDeclaration": 2373,
+                        "src": "5076:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5865,9 +5865,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4984:15:7",
+                      "src": "5069:15:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_storage",
+                        "typeIdentifier": "t_struct$_Order_$2065_storage",
                         "typeString": "struct Market.Order storage ref"
                       }
                     },
@@ -5878,14 +5878,14 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2556,
+                          "id": 2380,
                           "name": "_orderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2421,
-                          "src": "5021:10:7",
+                          "referencedDeclaration": 2245,
+                          "src": "5106:10:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -5893,18 +5893,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2557,
+                            "id": 2381,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "5045:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "5130:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2558,
+                          "id": 2382,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5912,9 +5912,9 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5045:24:7",
+                          "src": "5130:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -5922,18 +5922,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2559,
+                            "id": 2383,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "5083:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "5168:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2560,
+                          "id": 2384,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5941,7 +5941,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5083:10:7",
+                          "src": "5168:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5949,12 +5949,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2561,
+                          "id": 2385,
                           "name": "_id_counterparty",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2423,
-                          "src": "5107:16:7",
+                          "referencedDeclaration": 2247,
+                          "src": "5192:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5962,12 +5962,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2562,
+                          "id": 2386,
                           "name": "_duration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2425,
-                          "src": "5137:9:7",
+                          "referencedDeclaration": 2249,
+                          "src": "5222:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5975,12 +5975,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2563,
+                          "id": 2387,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2427,
-                          "src": "5160:6:7",
+                          "referencedDeclaration": 2251,
+                          "src": "5245:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5988,12 +5988,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2564,
+                          "id": 2388,
                           "name": "_netflags",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2430,
-                          "src": "5180:9:7",
+                          "referencedDeclaration": 2254,
+                          "src": "5265:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                             "typeString": "bool[] memory"
@@ -6001,25 +6001,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2565,
+                          "id": 2389,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2432,
-                          "src": "5203:14:7",
+                          "referencedDeclaration": 2256,
+                          "src": "5288:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2566,
+                          "id": 2390,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2434,
-                          "src": "5231:10:7",
+                          "referencedDeclaration": 2258,
+                          "src": "5316:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6027,12 +6027,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2567,
+                          "id": 2391,
                           "name": "_tag",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2436,
-                          "src": "5255:4:7",
+                          "referencedDeclaration": 2260,
+                          "src": "5340:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -6040,12 +6040,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2568,
+                          "id": 2392,
                           "name": "_benchmarks",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2439,
-                          "src": "5273:11:7",
+                          "referencedDeclaration": 2263,
+                          "src": "5358:11:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                             "typeString": "uint64[] memory"
@@ -6053,12 +6053,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2569,
+                          "id": 2393,
                           "name": "lockedSum",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2490,
-                          "src": "5298:9:7",
+                          "referencedDeclaration": 2314,
+                          "src": "5383:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6067,14 +6067,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 2570,
+                          "id": 2394,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "5321:1:7",
+                          "src": "5406:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -6086,11 +6086,11 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
                           {
@@ -6114,7 +6114,7 @@
                             "typeString": "bool[] memory"
                           },
                           {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           },
                           {
@@ -6138,18 +6138,18 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 2555,
+                        "id": 2379,
                         "name": "Order",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2241,
-                        "src": "5002:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "5087:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Order_$2241_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Order_$2065_storage_ptr_$",
                           "typeString": "type(struct Market.Order storage pointer)"
                         }
                       },
-                      "id": 2571,
+                      "id": 2395,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6157,21 +6157,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5002:330:7",
+                      "src": "5087:330:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "src": "4984:348:7",
+                    "src": "5069:348:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
-                  "id": 2573,
+                  "id": 2397,
                   "nodeType": "ExpressionStatement",
-                  "src": "4984:348:7"
+                  "src": "5069:348:6"
                 },
                 {
                   "eventCall": {
@@ -6179,12 +6179,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2575,
+                        "id": 2399,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "5360:7:7",
+                        "referencedDeclaration": 2373,
+                        "src": "5445:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6198,18 +6198,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2574,
+                      "id": 2398,
                       "name": "OrderPlaced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2256,
-                      "src": "5348:11:7",
+                      "referencedDeclaration": 2080,
+                      "src": "5433:11:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 2576,
+                    "id": 2400,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6217,91 +6217,91 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5348:20:7",
+                    "src": "5433:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2577,
+                  "id": 2401,
                   "nodeType": "EmitStatement",
-                  "src": "5343:25:7"
+                  "src": "5428:25:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2578,
+                    "id": 2402,
                     "name": "orderId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2549,
-                    "src": "5385:7:7",
+                    "referencedDeclaration": 2373,
+                    "src": "5470:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2445,
-                  "id": 2579,
+                  "functionReturnParameters": 2269,
+                  "id": 2403,
                   "nodeType": "Return",
-                  "src": "5378:14:7"
+                  "src": "5463:14:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2581,
+            "id": 2405,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2442,
+                "id": 2266,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2441,
+                  "id": 2265,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "4033:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "4125:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4033:13:7"
+                "src": "4125:13:6"
               }
             ],
             "name": "PlaceOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2440,
+              "id": 2264,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2421,
+                  "id": 2245,
                   "name": "_orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3767:20:7",
+                  "scope": 2405,
+                  "src": "3852:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2420,
+                    "id": 2244,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "3767:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "3852:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -6310,11 +6310,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2423,
+                  "id": 2247,
                   "name": "_id_counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3797:24:7",
+                  "scope": 2405,
+                  "src": "3882:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6322,10 +6322,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2422,
+                    "id": 2246,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3797:7:7",
+                    "src": "3882:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6336,11 +6336,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2425,
+                  "id": 2249,
                   "name": "_duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3831:14:7",
+                  "scope": 2405,
+                  "src": "3916:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6348,10 +6348,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2424,
+                    "id": 2248,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3831:4:7",
+                    "src": "3916:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6362,11 +6362,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2427,
+                  "id": 2251,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3855:11:7",
+                  "scope": 2405,
+                  "src": "3940:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6374,10 +6374,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2426,
+                    "id": 2250,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3855:4:7",
+                    "src": "3940:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6388,11 +6388,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2430,
+                  "id": 2254,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3876:16:7",
+                  "scope": 2405,
+                  "src": "3961:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6401,19 +6401,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2428,
+                      "id": 2252,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "3876:4:7",
+                      "src": "3961:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 2429,
+                    "id": 2253,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "3876:6:7",
+                    "src": "3961:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -6424,26 +6424,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2432,
+                  "id": 2256,
                   "name": "_identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3902:44:7",
+                  "scope": 2405,
+                  "src": "3987:44:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2431,
+                    "id": 2255,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
-                    "src": "3902:29:7",
+                    "referencedDeclaration": 10343,
+                    "src": "3987:29:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -6452,11 +6452,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2434,
+                  "id": 2258,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3956:18:7",
+                  "scope": 2405,
+                  "src": "4041:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6464,10 +6464,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2433,
+                    "id": 2257,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3956:7:7",
+                    "src": "4041:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6478,11 +6478,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2436,
+                  "id": 2260,
                   "name": "_tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3984:12:7",
+                  "scope": 2405,
+                  "src": "4069:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6490,10 +6490,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 2435,
+                    "id": 2259,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3984:7:7",
+                    "src": "4069:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -6504,11 +6504,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2439,
+                  "id": 2263,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "4006:20:7",
+                  "scope": 2405,
+                  "src": "4091:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6517,19 +6517,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2437,
+                      "id": 2261,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "4006:6:7",
+                      "src": "4091:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2438,
+                    "id": 2262,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "4006:8:7",
+                    "src": "4091:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -6539,20 +6539,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3757:275:7"
+              "src": "3842:275:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2445,
+              "id": 2269,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2444,
+                  "id": 2268,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "4063:4:7",
+                  "scope": 2405,
+                  "src": "4148:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6560,10 +6560,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2443,
+                    "id": 2267,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4063:4:7",
+                    "src": "4148:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6573,19 +6573,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4062:6:7"
+              "src": "4147:6:6"
             },
-            "scope": 5229,
-            "src": "3738:1661:7",
+            "scope": 5065,
+            "src": "3823:1661:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2640,
+              "id": 2464,
               "nodeType": "Block",
-              "src": "5461:375:7",
+              "src": "5546:375:6",
               "statements": [
                 {
                   "expression": {
@@ -6597,19 +6597,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2591,
+                        "id": 2415,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2589,
+                          "id": 2413,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2583,
-                          "src": "5479:7:7",
+                          "referencedDeclaration": 2407,
+                          "src": "5564:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6619,18 +6619,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2590,
+                          "id": 2414,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2324,
-                          "src": "5490:12:7",
+                          "referencedDeclaration": 2148,
+                          "src": "5575:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "5479:23:7",
+                        "src": "5564:23:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6644,21 +6644,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2588,
+                      "id": 2412,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5471:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5556:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2592,
+                    "id": 2416,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6666,15 +6666,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5471:32:7",
+                    "src": "5556:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2593,
+                  "id": 2417,
                   "nodeType": "ExpressionStatement",
-                  "src": "5471:32:7"
+                  "src": "5556:32:6"
                 },
                 {
                   "expression": {
@@ -6683,10 +6683,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 2601,
+                        "id": 2425,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6697,26 +6697,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2595,
+                              "id": 2419,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2338,
-                              "src": "5521:6:7",
+                              "referencedDeclaration": 2162,
+                              "src": "5606:6:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 2597,
+                            "id": 2421,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2596,
+                              "id": 2420,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2583,
-                              "src": "5528:7:7",
+                              "referencedDeclaration": 2407,
+                              "src": "5613:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -6727,23 +6727,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5521:15:7",
+                            "src": "5606:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_storage",
+                              "typeIdentifier": "t_struct$_Order_$2065_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 2598,
+                          "id": 2422,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2216,
-                          "src": "5521:27:7",
+                          "referencedDeclaration": 2040,
+                          "src": "5606:27:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -6753,18 +6753,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2599,
+                            "id": 2423,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "5552:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "5637:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2600,
+                          "id": 2424,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -6772,13 +6772,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5552:24:7",
+                          "src": "5637:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "5521:55:7",
+                        "src": "5606:55:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6792,21 +6792,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2594,
+                      "id": 2418,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5513:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5598:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2602,
+                    "id": 2426,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6814,15 +6814,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5513:64:7",
+                    "src": "5598:64:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2603,
+                  "id": 2427,
                   "nodeType": "ExpressionStatement",
-                  "src": "5513:64:7"
+                  "src": "5598:64:6"
                 },
                 {
                   "expression": {
@@ -6834,7 +6834,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2611,
+                        "id": 2435,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6845,26 +6845,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2605,
+                              "id": 2429,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2338,
-                              "src": "5595:6:7",
+                              "referencedDeclaration": 2162,
+                              "src": "5680:6:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 2607,
+                            "id": 2431,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2606,
+                              "id": 2430,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2583,
-                              "src": "5602:7:7",
+                              "referencedDeclaration": 2407,
+                              "src": "5687:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -6875,21 +6875,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5595:15:7",
+                            "src": "5680:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_storage",
+                              "typeIdentifier": "t_struct$_Order_$2065_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 2608,
+                          "id": 2432,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "5595:22:7",
+                          "referencedDeclaration": 2042,
+                          "src": "5680:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6901,18 +6901,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2609,
+                            "id": 2433,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "5621:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "5706:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2610,
+                          "id": 2434,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6920,13 +6920,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5621:10:7",
+                          "src": "5706:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "5595:36:7",
+                        "src": "5680:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -6940,21 +6940,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2604,
+                      "id": 2428,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5587:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5672:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2612,
+                    "id": 2436,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6962,15 +6962,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5587:45:7",
+                    "src": "5672:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2613,
+                  "id": 2437,
                   "nodeType": "ExpressionStatement",
-                  "src": "5587:45:7"
+                  "src": "5672:45:6"
                 },
                 {
                   "expression": {
@@ -6983,18 +6983,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2617,
+                              "id": 2441,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "5666:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "5751:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2618,
+                            "id": 2442,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -7002,7 +7002,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "5666:10:7",
+                            "src": "5751:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -7014,26 +7014,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2619,
+                                "id": 2443,
                                 "name": "orders",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2338,
-                                "src": "5678:6:7",
+                                "referencedDeclaration": 2162,
+                                "src": "5763:6:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                                 }
                               },
-                              "id": 2621,
+                              "id": 2445,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2620,
+                                "id": 2444,
                                 "name": "orderID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2583,
-                                "src": "5685:7:7",
+                                "referencedDeclaration": 2407,
+                                "src": "5770:7:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -7044,21 +7044,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "5678:15:7",
+                              "src": "5763:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_storage",
+                                "typeIdentifier": "t_struct$_Order_$2065_storage",
                                 "typeString": "struct Market.Order storage ref"
                               }
                             },
-                            "id": 2622,
+                            "id": 2446,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "frozenSum",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2238,
-                            "src": "5678:25:7",
+                            "referencedDeclaration": 2062,
+                            "src": "5763:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -7078,32 +7078,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2615,
+                            "id": 2439,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "5651:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "5736:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 2616,
+                          "id": 2440,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10965,
-                          "src": "5651:14:7",
+                          "referencedDeclaration": 11249,
+                          "src": "5736:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 2623,
+                        "id": 2447,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7111,7 +7111,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5651:53:7",
+                        "src": "5736:53:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7125,21 +7125,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2614,
+                      "id": 2438,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5643:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5728:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2624,
+                    "id": 2448,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7147,20 +7147,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5643:62:7",
+                    "src": "5728:62:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2625,
+                  "id": 2449,
                   "nodeType": "ExpressionStatement",
-                  "src": "5643:62:7"
+                  "src": "5728:62:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2632,
+                    "id": 2456,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7171,26 +7171,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2626,
+                          "id": 2450,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "5715:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "5800:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 2628,
+                        "id": 2452,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2627,
+                          "id": 2451,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2583,
-                          "src": "5722:7:7",
+                          "referencedDeclaration": 2407,
+                          "src": "5807:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7201,23 +7201,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5715:15:7",
+                        "src": "5800:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 2629,
+                      "id": 2453,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "5715:27:7",
+                      "referencedDeclaration": 2040,
+                      "src": "5800:27:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -7227,18 +7227,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2630,
+                        "id": 2454,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "5745:11:7",
+                        "referencedDeclaration": 1996,
+                        "src": "5830:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 2631,
+                      "id": 2455,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7246,21 +7246,21 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5745:26:7",
+                      "src": "5830:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "5715:56:7",
+                    "src": "5800:56:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 2633,
+                  "id": 2457,
                   "nodeType": "ExpressionStatement",
-                  "src": "5715:56:7"
+                  "src": "5800:56:6"
                 },
                 {
                   "eventCall": {
@@ -7268,12 +7268,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2635,
+                        "id": 2459,
                         "name": "orderID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2583,
-                        "src": "5800:7:7",
+                        "referencedDeclaration": 2407,
+                        "src": "5885:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7287,18 +7287,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2634,
+                      "id": 2458,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "5787:12:7",
+                      "referencedDeclaration": 2084,
+                      "src": "5872:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 2636,
+                    "id": 2460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7306,28 +7306,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5787:21:7",
+                    "src": "5872:21:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2637,
+                  "id": 2461,
                   "nodeType": "EmitStatement",
-                  "src": "5782:26:7"
+                  "src": "5867:26:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2638,
+                    "id": 2462,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "5825:4:7",
+                    "src": "5910:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -7335,15 +7335,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2587,
-                  "id": 2639,
+                  "functionReturnParameters": 2411,
+                  "id": 2463,
                   "nodeType": "Return",
-                  "src": "5818:11:7"
+                  "src": "5903:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2641,
+            "id": 2465,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -7351,16 +7351,16 @@
             "name": "CancelOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2584,
+              "id": 2408,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2583,
+                  "id": 2407,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "5426:12:7",
+                  "scope": 2465,
+                  "src": "5511:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7368,10 +7368,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2582,
+                    "id": 2406,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5426:4:7",
+                    "src": "5511:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7381,20 +7381,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5425:14:7"
+              "src": "5510:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2587,
+              "id": 2411,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2586,
+                  "id": 2410,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "5456:4:7",
+                  "scope": 2465,
+                  "src": "5541:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7402,10 +7402,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2585,
+                    "id": 2409,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5456:4:7",
+                    "src": "5541:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -7415,47 +7415,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5455:6:7"
+              "src": "5540:6:6"
             },
-            "scope": 5229,
-            "src": "5405:431:7",
+            "scope": 5065,
+            "src": "5490:431:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2757,
+              "id": 2581,
               "nodeType": "Block",
-              "src": "5914:806:7",
+              "src": "5999:806:6",
               "statements": [
                 {
                   "assignments": [
-                    2651
+                    2475
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2651,
+                      "id": 2475,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2758,
-                      "src": "5924:16:7",
+                      "scope": 2582,
+                      "src": "6009:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2650,
+                        "id": 2474,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "5924:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6009:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -7463,31 +7463,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2655,
+                  "id": 2479,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2652,
+                      "id": 2476,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "5943:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6028:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2654,
+                    "id": 2478,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2653,
+                      "id": 2477,
                       "name": "askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2643,
-                      "src": "5950:5:7",
+                      "referencedDeclaration": 2467,
+                      "src": "6035:5:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -7498,14 +7498,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "5943:13:7",
+                    "src": "6028:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "5924:32:7"
+                  "src": "6009:32:6"
                 },
                 {
                   "expression": {
@@ -7514,10 +7514,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2661,
+                        "id": 2485,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7526,28 +7526,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2657,
+                            "id": 2481,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "5974:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6059:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2658,
+                          "id": 2482,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "5974:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "6059:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -7557,18 +7557,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2659,
+                            "id": 2483,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "5991:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "6076:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2660,
+                          "id": 2484,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7576,13 +7576,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5991:19:7",
+                          "src": "6076:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "5974:36:7",
+                        "src": "6059:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7596,21 +7596,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2656,
+                      "id": 2480,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5966:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6051:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2662,
+                    "id": 2486,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7618,15 +7618,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5966:45:7",
+                    "src": "6051:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2663,
+                  "id": 2487,
                   "nodeType": "ExpressionStatement",
-                  "src": "5966:45:7"
+                  "src": "6051:45:6"
                 },
                 {
                   "expression": {
@@ -7635,10 +7635,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 2669,
+                        "id": 2493,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7647,28 +7647,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2665,
+                            "id": 2489,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6029:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6114:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2666,
+                          "id": 2490,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2216,
-                          "src": "6029:15:7",
+                          "referencedDeclaration": 2040,
+                          "src": "6114:15:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -7678,18 +7678,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2667,
+                            "id": 2491,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "6048:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "6133:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2668,
+                          "id": 2492,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7697,13 +7697,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "6048:24:7",
+                          "src": "6133:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "6029:43:7",
+                        "src": "6114:43:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7717,21 +7717,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2664,
+                      "id": 2488,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6021:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6106:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2670,
+                    "id": 2494,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7739,15 +7739,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6021:52:7",
+                    "src": "6106:52:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2671,
+                  "id": 2495,
                   "nodeType": "ExpressionStatement",
-                  "src": "6021:52:7"
+                  "src": "6106:52:6"
                 },
                 {
                   "expression": {
@@ -7759,7 +7759,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2676,
+                        "id": 2500,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7768,26 +7768,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2673,
+                            "id": 2497,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6092:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6177:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2674,
+                          "id": 2498,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "6092:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "6177:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7797,18 +7797,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2675,
+                          "id": 2499,
                           "name": "buyoutDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2645,
-                          "src": "6108:14:7",
+                          "referencedDeclaration": 2469,
+                          "src": "6193:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "6092:30:7",
+                        "src": "6177:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7822,21 +7822,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2672,
+                      "id": 2496,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6084:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6169:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2677,
+                    "id": 2501,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7844,15 +7844,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6084:39:7",
+                    "src": "6169:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2678,
+                  "id": 2502,
                   "nodeType": "ExpressionStatement",
-                  "src": "6084:39:7"
+                  "src": "6169:39:6"
                 },
                 {
                   "expression": {
@@ -7861,10 +7861,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2687,
+                        "id": 2511,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7876,18 +7876,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2682,
+                                "id": 2506,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "6160:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "6245:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2683,
+                              "id": 2507,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -7895,7 +7895,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6160:10:7",
+                              "src": "6245:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -7911,32 +7911,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2680,
+                              "id": 2504,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "6141:2:7",
+                              "referencedDeclaration": 2145,
+                              "src": "6226:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 2681,
+                            "id": 2505,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "6141:18:7",
+                            "referencedDeclaration": 10834,
+                            "src": "6226:18:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2684,
+                          "id": 2508,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7944,9 +7944,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6141:30:7",
+                          "src": "6226:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -7956,32 +7956,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2685,
+                            "id": 2509,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6175:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6260:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2686,
+                          "id": 2510,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "6175:17:7",
+                          "referencedDeclaration": 2053,
+                          "src": "6260:17:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "6141:51:7",
+                        "src": "6226:51:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -7995,21 +7995,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2679,
+                      "id": 2503,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6133:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6218:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2688,
+                    "id": 2512,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8017,15 +8017,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6133:60:7",
+                    "src": "6218:60:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2689,
+                  "id": 2513,
                   "nodeType": "ExpressionStatement",
-                  "src": "6133:60:7"
+                  "src": "6218:60:6"
                 },
                 {
                   "expression": {
@@ -8037,7 +8037,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2711,
+                        "id": 2535,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8048,7 +8048,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2701,
+                          "id": 2525,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8060,18 +8060,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2693,
+                                  "id": 2517,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "6220:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "6305:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 2694,
+                                "id": 2518,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8079,7 +8079,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6220:10:7",
+                                "src": "6305:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8092,26 +8092,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2696,
+                                      "id": 2520,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2651,
-                                      "src": "6242:3:7",
+                                      "referencedDeclaration": 2475,
+                                      "src": "6327:3:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 2697,
+                                    "id": 2521,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2218,
-                                    "src": "6242:10:7",
+                                    "referencedDeclaration": 2042,
+                                    "src": "6327:10:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -8125,18 +8125,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 2695,
+                                  "id": 2519,
                                   "name": "GetMaster",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4298,
-                                  "src": "6232:9:7",
+                                  "referencedDeclaration": 4134,
+                                  "src": "6317:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                     "typeString": "function (address) view returns (address)"
                                   }
                                 },
-                                "id": 2698,
+                                "id": 2522,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8144,7 +8144,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "6232:21:7",
+                                "src": "6317:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8164,32 +8164,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2691,
+                                "id": 2515,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "6211:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "6296:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 2692,
+                              "id": 2516,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "6211:8:7",
+                              "referencedDeclaration": 853,
+                              "src": "6296:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 2699,
+                            "id": 2523,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -8197,7 +8197,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6211:43:7",
+                            "src": "6296:43:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -8208,14 +8208,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 2700,
+                            "id": 2524,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6258:5:7",
+                            "src": "6343:5:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -8223,7 +8223,7 @@
                             },
                             "value": "false"
                           },
-                          "src": "6211:52:7",
+                          "src": "6296:52:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -8237,7 +8237,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2710,
+                          "id": 2534,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8249,26 +8249,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2704,
+                                  "id": 2528,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2651,
-                                  "src": "6276:3:7",
+                                  "referencedDeclaration": 2475,
+                                  "src": "6361:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 2705,
+                                "id": 2529,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "6276:10:7",
+                                "referencedDeclaration": 2042,
+                                "src": "6361:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8278,18 +8278,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2706,
+                                  "id": 2530,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "6288:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "6373:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 2707,
+                                "id": 2531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8297,7 +8297,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6288:10:7",
+                                "src": "6373:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -8317,32 +8317,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2702,
+                                "id": 2526,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "6267:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "6352:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 2703,
+                              "id": 2527,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "6267:8:7",
+                              "referencedDeclaration": 853,
+                              "src": "6352:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 2708,
+                            "id": 2532,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -8350,7 +8350,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6267:32:7",
+                            "src": "6352:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -8361,14 +8361,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 2709,
+                            "id": 2533,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6303:5:7",
+                            "src": "6388:5:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -8376,13 +8376,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "6267:41:7",
+                          "src": "6352:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6211:97:7",
+                        "src": "6296:97:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8396,21 +8396,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2690,
+                      "id": 2514,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6203:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6288:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2712,
+                    "id": 2536,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8418,15 +8418,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6203:106:7",
+                    "src": "6288:106:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2713,
+                  "id": 2537,
                   "nodeType": "ExpressionStatement",
-                  "src": "6203:106:7"
+                  "src": "6288:106:6"
                 },
                 {
                   "expression": {
@@ -8438,7 +8438,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2723,
+                        "id": 2547,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8450,26 +8450,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2717,
+                                "id": 2541,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2651,
-                                "src": "6336:3:7",
+                                "referencedDeclaration": 2475,
+                                "src": "6421:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2718,
+                              "id": 2542,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blacklist",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2231,
-                              "src": "6336:13:7",
+                              "referencedDeclaration": 2055,
+                              "src": "6421:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -8479,18 +8479,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2719,
+                                "id": 2543,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "6351:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "6436:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2720,
+                              "id": 2544,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8498,7 +8498,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6351:10:7",
+                              "src": "6436:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -8518,32 +8518,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2715,
+                              "id": 2539,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2317,
-                              "src": "6327:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "6412:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2716,
+                            "id": 2540,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 1029,
-                            "src": "6327:8:7",
+                            "referencedDeclaration": 853,
+                            "src": "6412:8:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2721,
+                          "id": 2545,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8551,7 +8551,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6327:35:7",
+                          "src": "6412:35:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -8562,14 +8562,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 2722,
+                          "id": 2546,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "6366:5:7",
+                          "src": "6451:5:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -8577,7 +8577,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "6327:44:7",
+                        "src": "6412:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8591,21 +8591,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2714,
+                      "id": 2538,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6319:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6404:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2724,
+                    "id": 2548,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8613,15 +8613,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6319:53:7",
+                    "src": "6404:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2725,
+                  "id": 2549,
                   "nodeType": "ExpressionStatement",
-                  "src": "6319:53:7"
+                  "src": "6404:53:6"
                 },
                 {
                   "expression": {
@@ -8631,18 +8631,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2727,
+                          "id": 2551,
                           "name": "OrderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2168,
-                          "src": "6407:9:7",
+                          "referencedDeclaration": 1992,
+                          "src": "6492:9:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                            "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                             "typeString": "type(enum Market.OrderType)"
                           }
                         },
-                        "id": 2728,
+                        "id": 2552,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8650,9 +8650,9 @@
                         "memberName": "ORDER_BID",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6407:19:7",
+                        "src": "6492:19:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -8663,26 +8663,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2730,
+                              "id": 2554,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2651,
-                              "src": "6450:3:7",
+                              "referencedDeclaration": 2475,
+                              "src": "6535:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2731,
+                            "id": 2555,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "author",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2218,
-                            "src": "6450:10:7",
+                            "referencedDeclaration": 2042,
+                            "src": "6535:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -8696,18 +8696,18 @@
                               "typeString": "address"
                             }
                           ],
-                          "id": 2729,
+                          "id": 2553,
                           "name": "GetMaster",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4298,
-                          "src": "6440:9:7",
+                          "referencedDeclaration": 4134,
+                          "src": "6525:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                             "typeString": "function (address) view returns (address)"
                           }
                         },
-                        "id": 2732,
+                        "id": 2556,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8715,7 +8715,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6440:21:7",
+                        "src": "6525:21:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -8723,12 +8723,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2733,
+                        "id": 2557,
                         "name": "buyoutDuration",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2645,
-                        "src": "6475:14:7",
+                        "referencedDeclaration": 2469,
+                        "src": "6560:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -8738,26 +8738,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2734,
+                          "id": 2558,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6503:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6588:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2735,
+                        "id": 2559,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2224,
-                        "src": "6503:9:7",
+                        "referencedDeclaration": 2048,
+                        "src": "6588:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -8767,26 +8767,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2736,
+                          "id": 2560,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6526:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6611:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2737,
+                        "id": 2561,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "6526:12:7",
+                        "referencedDeclaration": 2051,
+                        "src": "6611:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -8798,32 +8798,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2738,
+                            "id": 2562,
                             "name": "ProfileRegistry",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10035,
-                            "src": "6552:15:7",
+                            "referencedDeclaration": 10881,
+                            "src": "6637:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                               "typeString": "type(contract ProfileRegistry)"
                             }
                           },
-                          "id": 2739,
+                          "id": 2563,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "IdentityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9497,
-                          "src": "6552:29:7",
+                          "referencedDeclaration": 10343,
+                          "src": "6637:29:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                             "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                           }
                         },
-                        "id": 2740,
+                        "id": 2564,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8831,9 +8831,9 @@
                         "memberName": "ANONYMOUS",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6552:39:7",
+                        "src": "6637:39:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -8843,14 +8843,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2742,
+                            "id": 2566,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6613:1:7",
+                            "src": "6698:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -8866,20 +8866,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 2741,
+                          "id": 2565,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6605:7:7",
+                          "src": "6690:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 2743,
+                        "id": 2567,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8887,7 +8887,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6605:10:7",
+                        "src": "6690:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -8899,14 +8899,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2745,
+                            "id": 2569,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6637:1:7",
+                            "src": "6722:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -8922,20 +8922,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 2744,
+                          "id": 2568,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6629:7:7",
+                          "src": "6714:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_bytes32_$",
                             "typeString": "type(bytes32)"
                           },
                           "typeName": "bytes32"
                         },
-                        "id": 2746,
+                        "id": 2570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8943,7 +8943,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6629:10:7",
+                        "src": "6714:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -8953,26 +8953,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2747,
+                          "id": 2571,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6653:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6738:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2748,
+                        "id": 2572,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "6653:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "6738:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -8982,7 +8982,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
                         {
@@ -9002,7 +9002,7 @@
                           "typeString": "bool[] memory"
                         },
                         {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
                         {
@@ -9018,18 +9018,18 @@
                           "typeString": "uint64[] memory"
                         }
                       ],
-                      "id": 2726,
+                      "id": 2550,
                       "name": "PlaceOrder",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2581,
-                      "src": "6383:10:7",
+                      "referencedDeclaration": 2405,
+                      "src": "6468:10:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$2168_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$1992_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$10343_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
                         "typeString": "function (enum Market.OrderType,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory) returns (uint256)"
                       }
                     },
-                    "id": 2749,
+                    "id": 2573,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9037,15 +9037,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6383:285:7",
+                    "src": "6468:285:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2750,
+                  "id": 2574,
                   "nodeType": "ExpressionStatement",
-                  "src": "6383:285:7"
+                  "src": "6468:285:6"
                 },
                 {
                   "expression": {
@@ -9053,12 +9053,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2752,
+                        "id": 2576,
                         "name": "askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2643,
-                        "src": "6688:5:7",
+                        "referencedDeclaration": 2467,
+                        "src": "6773:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9069,18 +9069,18 @@
                         "arguments": [],
                         "expression": {
                           "argumentTypes": [],
-                          "id": 2753,
+                          "id": 2577,
                           "name": "GetOrdersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4352,
-                          "src": "6695:15:7",
+                          "referencedDeclaration": 4188,
+                          "src": "6780:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                             "typeString": "function () view returns (uint256)"
                           }
                         },
-                        "id": 2754,
+                        "id": 2578,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9088,7 +9088,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6695:17:7",
+                        "src": "6780:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9106,18 +9106,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2751,
+                      "id": 2575,
                       "name": "OpenDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3185,
-                      "src": "6679:8:7",
+                      "referencedDeclaration": 3021,
+                      "src": "6764:8:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 2755,
+                    "id": 2579,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9125,57 +9125,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6679:34:7",
+                    "src": "6764:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2756,
+                  "id": 2580,
                   "nodeType": "ExpressionStatement",
-                  "src": "6679:34:7"
+                  "src": "6764:34:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2758,
+            "id": 2582,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2648,
+                "id": 2472,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2647,
+                  "id": 2471,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "5900:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "5985:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5900:13:7"
+                "src": "5985:13:6"
               }
             ],
             "name": "QuickBuy",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2646,
+              "id": 2470,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2643,
+                  "id": 2467,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2758,
-                  "src": "5860:10:7",
+                  "scope": 2582,
+                  "src": "5945:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9183,10 +9183,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2642,
+                    "id": 2466,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5860:4:7",
+                    "src": "5945:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9197,11 +9197,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2645,
+                  "id": 2469,
                   "name": "buyoutDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2758,
-                  "src": "5872:19:7",
+                  "scope": 2582,
+                  "src": "5957:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9209,10 +9209,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2644,
+                    "id": 2468,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5872:4:7",
+                    "src": "5957:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9222,54 +9222,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5859:33:7"
+              "src": "5944:33:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2649,
+              "id": 2473,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5914:0:7"
+              "src": "5999:0:6"
             },
-            "scope": 5229,
-            "src": "5842:878:7",
+            "scope": 5065,
+            "src": "5927:878:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3184,
+              "id": 3020,
               "nodeType": "Block",
-              "src": "6814:2981:7",
+              "src": "6899:3175:6",
               "statements": [
                 {
                   "assignments": [
-                    2768
+                    2592
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2768,
+                      "id": 2592,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "6824:16:7",
+                      "scope": 3021,
+                      "src": "6909:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2767,
+                        "id": 2591,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "6824:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6909:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -9277,31 +9277,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2772,
+                  "id": 2596,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2769,
+                      "id": 2593,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "6843:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6928:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2771,
+                    "id": 2595,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2770,
+                      "id": 2594,
                       "name": "_askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2760,
-                      "src": "6850:6:7",
+                      "referencedDeclaration": 2584,
+                      "src": "6935:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9312,42 +9312,42 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6843:14:7",
+                    "src": "6928:14:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6824:33:7"
+                  "src": "6909:33:6"
                 },
                 {
                   "assignments": [
-                    2774
+                    2598
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2774,
+                      "id": 2598,
                       "name": "bid",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "6867:16:7",
+                      "scope": 3021,
+                      "src": "6952:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2773,
+                        "id": 2597,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "6867:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6952:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -9355,31 +9355,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2778,
+                  "id": 2602,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2775,
+                      "id": 2599,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "6886:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6971:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2777,
+                    "id": 2601,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2776,
+                      "id": 2600,
                       "name": "_bidID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2762,
-                      "src": "6893:6:7",
+                      "referencedDeclaration": 2586,
+                      "src": "6978:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9390,14 +9390,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6886:14:7",
+                    "src": "6971:14:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6867:33:7"
+                  "src": "6952:33:6"
                 },
                 {
                   "expression": {
@@ -9409,7 +9409,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2790,
+                        "id": 2614,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9417,10 +9417,10 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 2784,
+                          "id": 2608,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9429,28 +9429,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2780,
+                              "id": 2604,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "6919:3:7",
+                              "referencedDeclaration": 2592,
+                              "src": "7004:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2781,
+                            "id": 2605,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2216,
-                            "src": "6919:15:7",
+                            "referencedDeclaration": 2040,
+                            "src": "7004:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -9460,18 +9460,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2782,
+                              "id": 2606,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2172,
-                              "src": "6938:11:7",
+                              "referencedDeclaration": 1996,
+                              "src": "7023:11:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 2783,
+                            "id": 2607,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -9479,13 +9479,13 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6938:24:7",
+                            "src": "7023:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6919:43:7",
+                          "src": "7004:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -9496,10 +9496,10 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 2789,
+                          "id": 2613,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9508,28 +9508,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2785,
+                              "id": 2609,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "6966:3:7",
+                              "referencedDeclaration": 2598,
+                              "src": "7051:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2786,
+                            "id": 2610,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2216,
-                            "src": "6966:15:7",
+                            "referencedDeclaration": 2040,
+                            "src": "7051:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -9539,18 +9539,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2787,
+                              "id": 2611,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2172,
-                              "src": "6985:11:7",
+                              "referencedDeclaration": 1996,
+                              "src": "7070:11:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 2788,
+                            "id": 2612,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -9558,19 +9558,19 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6985:24:7",
+                            "src": "7070:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6966:43:7",
+                          "src": "7051:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6919:90:7",
+                        "src": "7004:90:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -9584,21 +9584,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2779,
+                      "id": 2603,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6911:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6996:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2791,
+                    "id": 2615,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9606,15 +9606,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6911:99:7",
+                    "src": "6996:99:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2792,
+                  "id": 2616,
                   "nodeType": "ExpressionStatement",
-                  "src": "6911:99:7"
+                  "src": "6996:99:6"
                 },
                 {
                   "expression": {
@@ -9626,444 +9626,435 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2820,
+                        "id": 2629,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "components": [
-                            {
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2621,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
                               "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 2805,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
+                              "id": 2618,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "7113:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2619,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7113:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "307830",
+                            "id": 2620,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "7133:3:6",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0x0"
+                          },
+                          "src": "7113:23:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "||",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2628,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2622,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "7140:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2623,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7140:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
                                 "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2797,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
+                                "expression": {
                                   "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2794,
-                                    "name": "ask",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "7029:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2795,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7029:16:7",
+                                  "id": 2625,
+                                  "name": "bid",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2598,
+                                  "src": "7170:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "307830",
-                                  "id": 2796,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "number",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7049:3:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_rational_0_by_1",
-                                    "typeString": "int_const 0"
-                                  },
-                                  "value": "0x0"
-                                },
-                                "src": "7029:23:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "||",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2804,
+                                "id": 2626,
                                 "isConstant": false,
-                                "isLValue": false,
+                                "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2798,
-                                    "name": "ask",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "7056:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2799,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7056:16:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2801,
-                                        "name": "bid",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2774,
-                                        "src": "7086:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2802,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7086:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2800,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7076:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2803,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7076:21:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "src": "7056:41:7",
+                                "memberName": "author",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2042,
+                                "src": "7170:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
                                 }
-                              },
-                              "src": "7029:68:7",
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              ],
+                              "id": 2624,
+                              "name": "GetMaster",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4134,
+                              "src": "7160:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                "typeString": "function (address) view returns (address)"
                               }
+                            },
+                            "id": 2627,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "7160:21:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
                             }
-                          ],
-                          "id": 2806,
+                          },
+                          "src": "7140:41:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "7113:68:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2617,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7105:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2630,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7105:77:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2631,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7105:77:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2644,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2636,
                           "isConstant": false,
-                          "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
-                          "nodeType": "TupleExpression",
-                          "src": "7028:70:7",
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2633,
+                              "name": "bid",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2598,
+                              "src": "7200:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2634,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7200:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "307830",
+                            "id": 2635,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "7220:3:6",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0x0"
+                          },
+                          "src": "7200:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": "&&",
+                        "operator": "||",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "components": [
-                            {
-                              "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 2818,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2643,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2637,
+                              "name": "bid",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2598,
+                              "src": "7227:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2638,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7227:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
                                 "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2810,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
+                                "expression": {
                                   "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2807,
-                                    "name": "bid",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7103:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2808,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7103:16:7",
+                                  "id": 2640,
+                                  "name": "ask",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2592,
+                                  "src": "7257:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "307830",
-                                  "id": 2809,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "number",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7123:3:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_rational_0_by_1",
-                                    "typeString": "int_const 0"
-                                  },
-                                  "value": "0x0"
-                                },
-                                "src": "7103:23:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "||",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2817,
+                                "id": 2641,
                                 "isConstant": false,
-                                "isLValue": false,
+                                "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2811,
-                                    "name": "bid",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7130:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2812,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7130:16:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2814,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7160:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2815,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7160:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2813,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7150:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2816,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7150:21:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "src": "7130:41:7",
+                                "memberName": "author",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2042,
+                                "src": "7257:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
                                 }
-                              },
-                              "src": "7103:68:7",
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              ],
+                              "id": 2639,
+                              "name": "GetMaster",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4134,
+                              "src": "7247:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                "typeString": "function (address) view returns (address)"
                               }
+                            },
+                            "id": 2642,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "7247:21:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
                             }
-                          ],
-                          "id": 2819,
-                          "isConstant": false,
-                          "isInlineArray": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "nodeType": "TupleExpression",
-                          "src": "7102:70:7",
+                          },
+                          "src": "7227:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7028:144:7",
+                        "src": "7200:68:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10077,21 +10068,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2793,
+                      "id": 2632,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7020:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7192:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2821,
+                    "id": 2645,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10099,15 +10090,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7020:153:7",
+                    "src": "7192:77:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2822,
+                  "id": 2646,
                   "nodeType": "ExpressionStatement",
-                  "src": "7020:153:7"
+                  "src": "7192:77:6"
                 },
                 {
                   "expression": {
@@ -10116,10 +10107,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2828,
+                        "id": 2652,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10128,28 +10119,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2824,
+                            "id": 2648,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7191:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "7287:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2825,
+                          "id": 2649,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "7191:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "7287:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -10159,18 +10150,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2826,
+                            "id": 2650,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "7208:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "7304:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2827,
+                          "id": 2651,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10178,13 +10169,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7208:19:7",
+                          "src": "7304:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7191:36:7",
+                        "src": "7287:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10198,21 +10189,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2823,
+                      "id": 2647,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7183:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7279:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2829,
+                    "id": 2653,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10220,15 +10211,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7183:45:7",
+                    "src": "7279:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2830,
+                  "id": 2654,
                   "nodeType": "ExpressionStatement",
-                  "src": "7183:45:7"
+                  "src": "7279:45:6"
                 },
                 {
                   "expression": {
@@ -10237,10 +10228,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2836,
+                        "id": 2660,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10249,28 +10240,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2832,
+                            "id": 2656,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7246:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "7342:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2833,
+                          "id": 2657,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "7246:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "7342:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -10280,18 +10271,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2834,
+                            "id": 2658,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "7263:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "7359:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2835,
+                          "id": 2659,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10299,13 +10290,13 @@
                           "memberName": "ORDER_BID",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7263:19:7",
+                          "src": "7359:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7246:36:7",
+                        "src": "7342:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10319,21 +10310,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2831,
+                      "id": 2655,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7238:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7334:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2837,
+                    "id": 2661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10341,15 +10332,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7238:45:7",
+                    "src": "7334:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2838,
+                  "id": 2662,
                   "nodeType": "ExpressionStatement",
-                  "src": "7238:45:7"
+                  "src": "7334:45:6"
                 },
                 {
                   "expression": {
@@ -10361,1030 +10352,70 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2914,
+                        "id": 2674,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "commonType": {
-                            "typeIdentifier": "t_bool",
-                            "typeString": "bool"
-                          },
-                          "id": 2904,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "leftExpression": {
-                            "argumentTypes": null,
-                            "commonType": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            },
-                            "id": 2892,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": false,
-                            "lValueRequested": false,
-                            "leftExpression": {
+                          "arguments": [
+                            {
                               "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2666,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7406:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
                               },
-                              "id": 2882,
+                              "id": 2667,
                               "isConstant": false,
-                              "isLValue": false,
+                              "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "id": 2872,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7406:13:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
                                   "argumentTypes": null,
-                                  "commonType": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "id": 2860,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "leftExpression": {
-                                    "argumentTypes": null,
-                                    "commonType": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "id": 2850,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "leftExpression": {
-                                      "argumentTypes": null,
-                                      "arguments": [
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2842,
-                                            "name": "bid",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2774,
-                                            "src": "7323:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2843,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "blacklist",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2231,
-                                          "src": "7323:13:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        },
-                                        {
-                                          "argumentTypes": null,
-                                          "arguments": [
-                                            {
-                                              "argumentTypes": null,
-                                              "expression": {
-                                                "argumentTypes": null,
-                                                "id": 2845,
-                                                "name": "ask",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 2768,
-                                                "src": "7348:3:7",
-                                                "typeDescriptions": {
-                                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                                  "typeString": "struct Market.Order memory"
-                                                }
-                                              },
-                                              "id": 2846,
-                                              "isConstant": false,
-                                              "isLValue": true,
-                                              "isPure": false,
-                                              "lValueRequested": false,
-                                              "memberName": "author",
-                                              "nodeType": "MemberAccess",
-                                              "referencedDeclaration": 2218,
-                                              "src": "7348:10:7",
-                                              "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                              }
-                                            }
-                                          ],
-                                          "expression": {
-                                            "argumentTypes": [
-                                              {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                              }
-                                            ],
-                                            "id": 2844,
-                                            "name": "GetMaster",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4298,
-                                            "src": "7338:9:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                              "typeString": "function (address) view returns (address)"
-                                            }
-                                          },
-                                          "id": 2847,
-                                          "isConstant": false,
-                                          "isLValue": false,
-                                          "isPure": false,
-                                          "kind": "functionCall",
-                                          "lValueRequested": false,
-                                          "names": [],
-                                          "nodeType": "FunctionCall",
-                                          "src": "7338:21:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": [
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          },
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2840,
-                                          "name": "bl",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2317,
-                                          "src": "7314:2:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                            "typeString": "contract Blacklist"
-                                          }
-                                        },
-                                        "id": 2841,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "Check",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 1029,
-                                        "src": "7314:8:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                          "typeString": "function (address,address) view external returns (bool)"
-                                        }
-                                      },
-                                      "id": 2848,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "kind": "functionCall",
-                                      "lValueRequested": false,
-                                      "names": [],
-                                      "nodeType": "FunctionCall",
-                                      "src": "7314:46:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      }
-                                    },
-                                    "nodeType": "BinaryOperation",
-                                    "operator": "==",
-                                    "rightExpression": {
-                                      "argumentTypes": null,
-                                      "hexValue": "66616c7365",
-                                      "id": 2849,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": true,
-                                      "kind": "bool",
-                                      "lValueRequested": false,
-                                      "nodeType": "Literal",
-                                      "src": "7364:5:7",
-                                      "subdenomination": null,
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      },
-                                      "value": "false"
-                                    },
-                                    "src": "7314:55:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    }
-                                  },
-                                  "nodeType": "BinaryOperation",
-                                  "operator": "&&",
-                                  "rightExpression": {
+                                  "expression": {
                                     "argumentTypes": null,
-                                    "commonType": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "id": 2859,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "leftExpression": {
-                                      "argumentTypes": null,
-                                      "arguments": [
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2853,
-                                            "name": "bid",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2774,
-                                            "src": "7394:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2854,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "blacklist",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2231,
-                                          "src": "7394:13:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        },
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2855,
-                                            "name": "ask",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2768,
-                                            "src": "7409:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2856,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "author",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2218,
-                                          "src": "7409:10:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": [
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          },
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2851,
-                                          "name": "bl",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2317,
-                                          "src": "7385:2:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                            "typeString": "contract Blacklist"
-                                          }
-                                        },
-                                        "id": 2852,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "Check",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 1029,
-                                        "src": "7385:8:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                          "typeString": "function (address,address) view external returns (bool)"
-                                        }
-                                      },
-                                      "id": 2857,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "kind": "functionCall",
-                                      "lValueRequested": false,
-                                      "names": [],
-                                      "nodeType": "FunctionCall",
-                                      "src": "7385:35:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      }
-                                    },
-                                    "nodeType": "BinaryOperation",
-                                    "operator": "==",
-                                    "rightExpression": {
-                                      "argumentTypes": null,
-                                      "hexValue": "66616c7365",
-                                      "id": 2858,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": true,
-                                      "kind": "bool",
-                                      "lValueRequested": false,
-                                      "nodeType": "Literal",
-                                      "src": "7424:5:7",
-                                      "subdenomination": null,
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      },
-                                      "value": "false"
-                                    },
-                                    "src": "7385:44:7",
+                                    "id": 2669,
+                                    "name": "ask",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2592,
+                                    "src": "7431:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "src": "7314:115:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "&&",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "commonType": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "id": 2871,
+                                  "id": 2670,
                                   "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "leftExpression": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                      {
-                                        "argumentTypes": null,
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2863,
-                                          "name": "bid",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2774,
-                                          "src": "7454:3:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                            "typeString": "struct Market.Order memory"
-                                          }
-                                        },
-                                        "id": 2864,
-                                        "isConstant": false,
-                                        "isLValue": true,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "author",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2218,
-                                        "src": "7454:10:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      },
-                                      {
-                                        "argumentTypes": null,
-                                        "arguments": [
-                                          {
-                                            "argumentTypes": null,
-                                            "expression": {
-                                              "argumentTypes": null,
-                                              "id": 2866,
-                                              "name": "ask",
-                                              "nodeType": "Identifier",
-                                              "overloadedDeclarations": [],
-                                              "referencedDeclaration": 2768,
-                                              "src": "7476:3:7",
-                                              "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                                "typeString": "struct Market.Order memory"
-                                              }
-                                            },
-                                            "id": 2867,
-                                            "isConstant": false,
-                                            "isLValue": true,
-                                            "isPure": false,
-                                            "lValueRequested": false,
-                                            "memberName": "author",
-                                            "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 2218,
-                                            "src": "7476:10:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_address",
-                                              "typeString": "address"
-                                            }
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": [
-                                            {
-                                              "typeIdentifier": "t_address",
-                                              "typeString": "address"
-                                            }
-                                          ],
-                                          "id": 2865,
-                                          "name": "GetMaster",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4298,
-                                          "src": "7466:9:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                            "typeString": "function (address) view returns (address)"
-                                          }
-                                        },
-                                        "id": 2868,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "kind": "functionCall",
-                                        "lValueRequested": false,
-                                        "names": [],
-                                        "nodeType": "FunctionCall",
-                                        "src": "7466:21:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      }
-                                    ],
-                                    "expression": {
-                                      "argumentTypes": [
-                                        {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        },
-                                        {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2861,
-                                        "name": "bl",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2317,
-                                        "src": "7445:2:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                          "typeString": "contract Blacklist"
-                                        }
-                                      },
-                                      "id": 2862,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "Check",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 1029,
-                                      "src": "7445:8:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                        "typeString": "function (address,address) view external returns (bool)"
-                                      }
-                                    },
-                                    "id": 2869,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "kind": "functionCall",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "7445:43:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    }
-                                  },
-                                  "nodeType": "BinaryOperation",
-                                  "operator": "==",
-                                  "rightExpression": {
-                                    "argumentTypes": null,
-                                    "hexValue": "66616c7365",
-                                    "id": 2870,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "bool",
-                                    "lValueRequested": false,
-                                    "nodeType": "Literal",
-                                    "src": "7492:5:7",
-                                    "subdenomination": null,
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "value": "false"
-                                  },
-                                  "src": "7445:52:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "src": "7314:183:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "&&",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "id": 2881,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2875,
-                                        "name": "bid",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2774,
-                                        "src": "7522:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2876,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7522:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    },
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2877,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7534:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2878,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7534:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      },
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2873,
-                                      "name": "bl",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2317,
-                                      "src": "7513:2:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                        "typeString": "contract Blacklist"
-                                      }
-                                    },
-                                    "id": 2874,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "Check",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 1029,
-                                    "src": "7513:8:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                      "typeString": "function (address,address) view external returns (bool)"
-                                    }
-                                  },
-                                  "id": 2879,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7513:32:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "66616c7365",
-                                  "id": 2880,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "bool",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7549:5:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "value": "false"
-                                },
-                                "src": "7513:41:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "src": "7314:240:7",
-                              "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              }
-                            },
-                            "nodeType": "BinaryOperation",
-                            "operator": "&&",
-                            "rightExpression": {
-                              "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 2891,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "arguments": [
-                                  {
-                                    "argumentTypes": null,
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2885,
-                                      "name": "ask",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2768,
-                                      "src": "7579:3:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                        "typeString": "struct Market.Order memory"
-                                      }
-                                    },
-                                    "id": 2886,
-                                    "isConstant": false,
-                                    "isLValue": true,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "blacklist",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2231,
-                                    "src": "7579:13:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  },
-                                  {
-                                    "argumentTypes": null,
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2887,
-                                      "name": "bid",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2774,
-                                      "src": "7594:3:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                        "typeString": "struct Market.Order memory"
-                                      }
-                                    },
-                                    "id": 2888,
-                                    "isConstant": false,
-                                    "isLValue": true,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "author",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2218,
-                                    "src": "7594:10:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  }
-                                ],
-                                "expression": {
-                                  "argumentTypes": [
-                                    {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    },
-                                    {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2883,
-                                    "name": "bl",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2317,
-                                    "src": "7570:2:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                      "typeString": "contract Blacklist"
-                                    }
-                                  },
-                                  "id": 2884,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "Check",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 1029,
-                                  "src": "7570:8:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                    "typeString": "function (address,address) view external returns (bool)"
-                                  }
-                                },
-                                "id": 2889,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "kind": "functionCall",
-                                "lValueRequested": false,
-                                "names": [],
-                                "nodeType": "FunctionCall",
-                                "src": "7570:35:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "==",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "hexValue": "66616c7365",
-                                "id": 2890,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": true,
-                                "kind": "bool",
-                                "lValueRequested": false,
-                                "nodeType": "Literal",
-                                "src": "7609:5:7",
-                                "subdenomination": null,
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "value": "false"
-                              },
-                              "src": "7570:44:7",
-                              "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              }
-                            },
-                            "src": "7314:300:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            }
-                          },
-                          "nodeType": "BinaryOperation",
-                          "operator": "&&",
-                          "rightExpression": {
-                            "argumentTypes": null,
-                            "commonType": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            },
-                            "id": 2903,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": false,
-                            "lValueRequested": false,
-                            "leftExpression": {
-                              "argumentTypes": null,
-                              "arguments": [
-                                {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2896,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7649:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2897,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7649:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2895,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7639:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2898,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7639:21:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2899,
-                                    "name": "bid",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7662:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2900,
-                                  "isConstant": false,
-                                  "isLValue": true,
+                                  "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "author",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2218,
-                                  "src": "7662:10:7",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7431:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -11393,43 +10424,23 @@
                               ],
                               "expression": {
                                 "argumentTypes": [
-                                  {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  },
                                   {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 ],
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2893,
-                                  "name": "bl",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2317,
-                                  "src": "7630:2:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                    "typeString": "contract Blacklist"
-                                  }
-                                },
-                                "id": 2894,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "Check",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 1029,
-                                "src": "7630:8:7",
+                                "id": 2668,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7421:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                  "typeString": "function (address,address) view external returns (bool)"
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
                                 }
                               },
-                              "id": 2901,
+                              "id": 2671,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -11437,198 +10448,86 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "7630:43:7",
+                              "src": "7421:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
-                            },
-                            "nodeType": "BinaryOperation",
-                            "operator": "==",
-                            "rightExpression": {
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
                               "argumentTypes": null,
-                              "hexValue": "66616c7365",
-                              "id": 2902,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": true,
-                              "kind": "bool",
-                              "lValueRequested": false,
-                              "nodeType": "Literal",
-                              "src": "7677:5:7",
-                              "subdenomination": null,
+                              "id": 2664,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7397:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "value": "false"
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
                             },
-                            "src": "7630:52:7",
+                            "id": 2665,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7397:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "src": "7314:368:7",
+                          "id": 2672,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7397:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": "&&",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "commonType": {
-                            "typeIdentifier": "t_bool",
-                            "typeString": "bool"
-                          },
-                          "id": 2913,
+                          "hexValue": "66616c7365",
+                          "id": 2673,
                           "isConstant": false,
                           "isLValue": false,
-                          "isPure": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "leftExpression": {
-                            "argumentTypes": null,
-                            "arguments": [
-                              {
-                                "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2907,
-                                  "name": "ask",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "7707:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2908,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "author",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "7707:10:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                }
-                              },
-                              {
-                                "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2909,
-                                  "name": "bid",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "7719:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2910,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "author",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "7719:10:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                }
-                              }
-                            ],
-                            "expression": {
-                              "argumentTypes": [
-                                {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                }
-                              ],
-                              "expression": {
-                                "argumentTypes": null,
-                                "id": 2905,
-                                "name": "bl",
-                                "nodeType": "Identifier",
-                                "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "7698:2:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                  "typeString": "contract Blacklist"
-                                }
-                              },
-                              "id": 2906,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "memberName": "Check",
-                              "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "7698:8:7",
-                              "typeDescriptions": {
-                                "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                "typeString": "function (address,address) view external returns (bool)"
-                              }
-                            },
-                            "id": 2911,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": false,
-                            "kind": "functionCall",
-                            "lValueRequested": false,
-                            "names": [],
-                            "nodeType": "FunctionCall",
-                            "src": "7698:32:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            }
-                          },
-                          "nodeType": "BinaryOperation",
-                          "operator": "==",
-                          "rightExpression": {
-                            "argumentTypes": null,
-                            "hexValue": "66616c7365",
-                            "id": 2912,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": true,
-                            "kind": "bool",
-                            "lValueRequested": false,
-                            "nodeType": "Literal",
-                            "src": "7734:5:7",
-                            "subdenomination": null,
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            },
-                            "value": "false"
-                          },
-                          "src": "7698:41:7",
+                          "nodeType": "Literal",
+                          "src": "7447:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
-                          }
+                          },
+                          "value": "false"
                         },
-                        "src": "7314:425:7",
+                        "src": "7397:55:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11642,21 +10541,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2839,
+                      "id": 2663,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7293:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7389:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2915,
+                    "id": 2675,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11664,15 +10563,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7293:447:7",
+                    "src": "7389:64:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2916,
+                  "id": 2676,
                   "nodeType": "ExpressionStatement",
-                  "src": "7293:447:7"
+                  "src": "7389:64:6"
                 },
                 {
                   "expression": {
@@ -11681,75 +10580,149 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         },
-                        "id": 2922,
+                        "id": 2686,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2680,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7480:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2681,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7480:13:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2682,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7495:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2683,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7495:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
                           "expression": {
-                            "argumentTypes": null,
-                            "id": 2918,
-                            "name": "ask",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7758:3:7",
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2678,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7471:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
+                            },
+                            "id": 2679,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7471:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2919,
+                          "id": 2684,
                           "isConstant": false,
-                          "isLValue": true,
+                          "isLValue": false,
                           "isPure": false,
+                          "kind": "functionCall",
                           "lValueRequested": false,
-                          "memberName": "price",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "7758:9:7",
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7471:35:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": "<=",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "expression": {
-                            "argumentTypes": null,
-                            "id": 2920,
-                            "name": "bid",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7771:3:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
-                            }
-                          },
-                          "id": 2921,
+                          "hexValue": "66616c7365",
+                          "id": 2685,
                           "isConstant": false,
-                          "isLValue": true,
-                          "isPure": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "memberName": "price",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "7771:9:7",
+                          "nodeType": "Literal",
+                          "src": "7510:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
                         },
-                        "src": "7758:22:7",
+                        "src": "7471:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11763,21 +10736,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2917,
+                      "id": 2677,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7750:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7463:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2923,
+                    "id": 2687,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11785,15 +10758,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7750:31:7",
+                    "src": "7463:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2924,
+                  "id": 2688,
                   "nodeType": "ExpressionStatement",
-                  "src": "7750:31:7"
+                  "src": "7463:53:6"
                 },
                 {
                   "expression": {
@@ -11802,75 +10775,185 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         },
-                        "id": 2930,
+                        "id": 2700,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2692,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7543:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2693,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7543:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 2695,
+                                    "name": "ask",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2592,
+                                    "src": "7565:3:6",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
+                                    }
+                                  },
+                                  "id": 2696,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "author",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7565:10:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 2694,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7555:9:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
+                                }
+                              },
+                              "id": 2697,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "7555:21:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
                           "expression": {
-                            "argumentTypes": null,
-                            "id": 2926,
-                            "name": "ask",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7799:3:7",
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2690,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7534:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
+                            },
+                            "id": 2691,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7534:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2927,
+                          "id": 2698,
                           "isConstant": false,
-                          "isLValue": true,
+                          "isLValue": false,
                           "isPure": false,
+                          "kind": "functionCall",
                           "lValueRequested": false,
-                          "memberName": "duration",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "7799:12:7",
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7534:43:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": ">=",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "expression": {
-                            "argumentTypes": null,
-                            "id": 2928,
-                            "name": "bid",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7815:3:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
-                            }
-                          },
-                          "id": 2929,
+                          "hexValue": "66616c7365",
+                          "id": 2699,
                           "isConstant": false,
-                          "isLValue": true,
-                          "isPure": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "memberName": "duration",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "7815:12:7",
+                          "nodeType": "Literal",
+                          "src": "7581:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
                         },
-                        "src": "7799:28:7",
+                        "src": "7534:52:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -11884,21 +10967,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2925,
+                      "id": 2689,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7791:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7526:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2931,
+                    "id": 2701,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11906,15 +10989,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7791:37:7",
+                    "src": "7526:61:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2932,
+                  "id": 2702,
                   "nodeType": "ExpressionStatement",
-                  "src": "7791:37:7"
+                  "src": "7526:61:6"
                 },
                 {
                   "expression": {
@@ -11923,10 +11006,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                          "typeString": "enum ProfileRegistry.IdentityLevel"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         },
-                        "id": 2941,
+                        "id": 2712,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -11938,26 +11021,55 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2936,
+                                "id": 2706,
                                 "name": "bid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2774,
-                                "src": "7896:3:7",
+                                "referencedDeclaration": 2598,
+                                "src": "7614:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2707,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7614:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2708,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7626:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2937,
+                              "id": 2709,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2218,
-                              "src": "7896:10:7",
+                              "referencedDeclaration": 2042,
+                              "src": "7626:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11966,6 +11078,10 @@
                           ],
                           "expression": {
                             "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
                               {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11973,32 +11089,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2934,
-                              "name": "pr",
+                              "id": 2704,
+                              "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "7877:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "7605:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
-                                "typeString": "contract ProfileRegistry"
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2935,
+                            "id": 2705,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
-                            "memberName": "GetProfileLevel",
+                            "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "7877:18:7",
+                            "referencedDeclaration": 853,
+                            "src": "7605:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
-                              "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2938,
+                          "id": 2710,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12006,44 +11122,33 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7877:30:7",
+                          "src": "7605:32:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": ">=",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "expression": {
-                            "argumentTypes": null,
-                            "id": 2939,
-                            "name": "ask",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7911:3:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
-                            }
-                          },
-                          "id": 2940,
+                          "hexValue": "66616c7365",
+                          "id": 2711,
                           "isConstant": false,
-                          "isLValue": true,
-                          "isPure": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "memberName": "identityLevel",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "7911:17:7",
+                          "nodeType": "Literal",
+                          "src": "7641:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                            "typeString": "enum ProfileRegistry.IdentityLevel"
-                          }
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
                         },
-                        "src": "7877:51:7",
+                        "src": "7605:41:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12057,21 +11162,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2933,
+                      "id": 2703,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7869:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7597:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2942,
+                    "id": 2713,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12079,15 +11184,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7869:60:7",
+                    "src": "7597:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2943,
+                  "id": 2714,
                   "nodeType": "ExpressionStatement",
-                  "src": "7869:60:7"
+                  "src": "7597:50:6"
                 },
                 {
                   "expression": {
@@ -12096,10 +11201,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                          "typeString": "enum ProfileRegistry.IdentityLevel"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         },
-                        "id": 2952,
+                        "id": 2724,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12111,26 +11216,55 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2947,
+                                "id": 2718,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2768,
-                                "src": "7966:3:7",
+                                "referencedDeclaration": 2592,
+                                "src": "7674:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2719,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7674:13:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2720,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7689:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2948,
+                              "id": 2721,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2218,
-                              "src": "7966:10:7",
+                              "referencedDeclaration": 2042,
+                              "src": "7689:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12139,6 +11273,10 @@
                           ],
                           "expression": {
                             "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
                               {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -12146,32 +11284,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2945,
-                              "name": "pr",
+                              "id": 2716,
+                              "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "7947:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "7665:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
-                                "typeString": "contract ProfileRegistry"
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2946,
+                            "id": 2717,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
-                            "memberName": "GetProfileLevel",
+                            "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "7947:18:7",
+                            "referencedDeclaration": 853,
+                            "src": "7665:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
-                              "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2949,
+                          "id": 2722,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12179,44 +11317,33 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7947:30:7",
+                          "src": "7665:35:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": ">=",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "expression": {
-                            "argumentTypes": null,
-                            "id": 2950,
-                            "name": "bid",
-                            "nodeType": "Identifier",
-                            "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7981:3:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                              "typeString": "struct Market.Order memory"
-                            }
-                          },
-                          "id": 2951,
+                          "hexValue": "66616c7365",
+                          "id": 2723,
                           "isConstant": false,
-                          "isLValue": true,
-                          "isPure": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "memberName": "identityLevel",
-                          "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "7981:17:7",
+                          "nodeType": "Literal",
+                          "src": "7704:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
-                            "typeString": "enum ProfileRegistry.IdentityLevel"
-                          }
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
                         },
-                        "src": "7947:51:7",
+                        "src": "7665:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12230,21 +11357,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2944,
+                      "id": 2715,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7939:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7657:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2953,
+                    "id": 2725,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12252,914 +11379,1152 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7939:60:7",
+                    "src": "7657:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2954,
+                  "id": 2726,
                   "nodeType": "ExpressionStatement",
-                  "src": "7939:60:7"
+                  "src": "7657:53:6"
                 },
                 {
-                  "condition": {
+                  "expression": {
                     "argumentTypes": null,
-                    "commonType": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "id": 2959,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftExpression": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "expression": {
-                          "argumentTypes": null,
-                          "id": 2955,
-                          "name": "ask",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8014:3:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                            "typeString": "struct Market.Order memory"
-                          }
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         },
-                        "id": 2956,
+                        "id": 2738,
                         "isConstant": false,
-                        "isLValue": true,
+                        "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberName": "netflags",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8014:12:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                          "typeString": "bool[] memory"
-                        }
-                      },
-                      "id": 2957,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "memberName": "length",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": null,
-                      "src": "8014:19:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "nodeType": "BinaryOperation",
-                    "operator": "<",
-                    "rightExpression": {
-                      "argumentTypes": null,
-                      "id": 2958,
-                      "name": "netflagsQuantity",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "8036:16:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "src": "8014:38:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
-                    }
-                  },
-                  "falseBody": null,
-                  "id": 2970,
-                  "nodeType": "IfStatement",
-                  "src": "8010:112:7",
-                  "trueBody": {
-                    "id": 2969,
-                    "nodeType": "Block",
-                    "src": "8054:68:7",
-                    "statements": [
-                      {
-                        "expression": {
+                        "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2967,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "leftHandSide": {
-                            "argumentTypes": null,
-                            "expression": {
+                          "arguments": [
+                            {
                               "argumentTypes": null,
-                              "id": 2960,
-                              "name": "ask",
-                              "nodeType": "Identifier",
-                              "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "8068:3:7",
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 2731,
+                                    "name": "ask",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2592,
+                                    "src": "7747:3:6",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
+                                    }
+                                  },
+                                  "id": 2732,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "author",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7747:10:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 2730,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7737:9:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
+                                }
+                              },
+                              "id": 2733,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "7737:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                "typeString": "struct Market.Order memory"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             },
-                            "id": 2962,
-                            "isConstant": false,
-                            "isLValue": true,
-                            "isPure": false,
-                            "lValueRequested": true,
-                            "memberName": "netflags",
-                            "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2227,
-                            "src": "8068:12:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                              "typeString": "bool[] memory"
-                            }
-                          },
-                          "nodeType": "Assignment",
-                          "operator": "=",
-                          "rightHandSide": {
-                            "argumentTypes": null,
-                            "arguments": [
-                              {
+                            {
+                              "argumentTypes": null,
+                              "expression": {
                                 "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2964,
-                                  "name": "ask",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8098:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2965,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "netflags",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2227,
-                                "src": "8098:12:7",
+                                "id": 2734,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7760:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                  "typeString": "bool[] memory"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
                                 }
+                              },
+                              "id": 2735,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7760:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             ],
                             "expression": {
-                              "argumentTypes": [
-                                {
-                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                  "typeString": "bool[] memory"
-                                }
-                              ],
-                              "id": 2963,
-                              "name": "ResizeNetflags",
+                              "argumentTypes": null,
+                              "id": 2728,
+                              "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5090,
-                              "src": "8083:14:7",
+                              "referencedDeclaration": 2141,
+                              "src": "7728:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
-                                "typeString": "function (bool[] memory) view returns (bool[] memory)"
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2966,
+                            "id": 2729,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
-                            "kind": "functionCall",
                             "lValueRequested": false,
-                            "names": [],
-                            "nodeType": "FunctionCall",
-                            "src": "8083:28:7",
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7728:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
-                              "typeString": "bool[] memory"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "src": "8068:43:7",
+                          "id": 2736,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7728:43:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                            "typeString": "bool[] memory"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
-                        "id": 2968,
-                        "nodeType": "ExpressionStatement",
-                        "src": "8068:43:7"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "condition": {
-                    "argumentTypes": null,
-                    "commonType": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "id": 2975,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftExpression": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "expression": {
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2971,
-                          "name": "bid",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2774,
-                          "src": "8136:3:7",
+                          "hexValue": "66616c7365",
+                          "id": 2737,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7775:5:6",
+                          "subdenomination": null,
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                            "typeString": "struct Market.Order memory"
-                          }
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
                         },
-                        "id": 2972,
-                        "isConstant": false,
-                        "isLValue": true,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberName": "netflags",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8136:12:7",
+                        "src": "7728:52:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                          "typeString": "bool[] memory"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         }
-                      },
-                      "id": 2973,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "memberName": "length",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": null,
-                      "src": "8136:19:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
                       }
-                    },
-                    "nodeType": "BinaryOperation",
-                    "operator": "<",
-                    "rightExpression": {
-                      "argumentTypes": null,
-                      "id": 2974,
-                      "name": "netflagsQuantity",
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2727,
+                      "name": "require",
                       "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "8158:16:7",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7720:7:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
                       }
                     },
-                    "src": "8136:38:7",
+                    "id": 2739,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7720:61:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
                     }
                   },
-                  "falseBody": null,
-                  "id": 2986,
-                  "nodeType": "IfStatement",
-                  "src": "8132:112:7",
-                  "trueBody": {
-                    "id": 2985,
-                    "nodeType": "Block",
-                    "src": "8176:68:7",
-                    "statements": [
+                  "id": 2740,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7720:61:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
                       {
-                        "expression": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2750,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2983,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "leftHandSide": {
-                            "argumentTypes": null,
-                            "expression": {
+                          "arguments": [
+                            {
                               "argumentTypes": null,
-                              "id": 2976,
-                              "name": "bid",
-                              "nodeType": "Identifier",
-                              "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "8190:3:7",
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2744,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7808:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2745,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7808:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                "typeString": "struct Market.Order memory"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             },
-                            "id": 2978,
-                            "isConstant": false,
-                            "isLValue": true,
-                            "isPure": false,
-                            "lValueRequested": true,
-                            "memberName": "netflags",
-                            "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2227,
-                            "src": "8190:12:7",
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                              "typeString": "bool[] memory"
-                            }
-                          },
-                          "nodeType": "Assignment",
-                          "operator": "=",
-                          "rightHandSide": {
-                            "argumentTypes": null,
-                            "arguments": [
-                              {
+                            {
+                              "argumentTypes": null,
+                              "expression": {
                                 "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2980,
-                                  "name": "ask",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8220:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2981,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "netflags",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2227,
-                                "src": "8220:12:7",
+                                "id": 2746,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7820:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                  "typeString": "bool[] memory"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
                                 }
+                              },
+                              "id": 2747,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7820:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             ],
                             "expression": {
-                              "argumentTypes": [
-                                {
-                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                  "typeString": "bool[] memory"
-                                }
-                              ],
-                              "id": 2979,
-                              "name": "ResizeNetflags",
+                              "argumentTypes": null,
+                              "id": 2742,
+                              "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5090,
-                              "src": "8205:14:7",
+                              "referencedDeclaration": 2141,
+                              "src": "7799:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
-                                "typeString": "function (bool[] memory) view returns (bool[] memory)"
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2982,
+                            "id": 2743,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
-                            "kind": "functionCall",
                             "lValueRequested": false,
-                            "names": [],
-                            "nodeType": "FunctionCall",
-                            "src": "8205:28:7",
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7799:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
-                              "typeString": "bool[] memory"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "src": "8190:43:7",
+                          "id": 2748,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7799:32:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                            "typeString": "bool[] memory"
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
                           }
                         },
-                        "id": 2984,
-                        "nodeType": "ExpressionStatement",
-                        "src": "8190:43:7"
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2749,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7835:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7799:41:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
                       }
-                    ]
-                  }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2741,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7791:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2751,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7791:50:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2752,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7791:50:6"
                 },
                 {
-                  "body": {
-                    "id": 3012,
-                    "nodeType": "Block",
-                    "src": "8301:207:7",
-                    "statements": [
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
                       {
-                        "expression": {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        },
+                        "id": 2758,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
                           "argumentTypes": null,
-                          "arguments": [
-                            {
-                              "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 3009,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "id": 3004,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "nodeType": "UnaryOperation",
-                                "operator": "!",
-                                "prefix": true,
-                                "src": "8461:16:7",
-                                "subExpression": {
-                                  "argumentTypes": null,
-                                  "baseExpression": {
-                                    "argumentTypes": null,
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 3000,
-                                      "name": "bid",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2774,
-                                      "src": "8462:3:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                        "typeString": "struct Market.Order memory"
-                                      }
-                                    },
-                                    "id": 3001,
-                                    "isConstant": false,
-                                    "isLValue": true,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "netflags",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2227,
-                                    "src": "8462:12:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                      "typeString": "bool[] memory"
-                                    }
-                                  },
-                                  "id": 3003,
-                                  "indexExpression": {
-                                    "argumentTypes": null,
-                                    "id": 3002,
-                                    "name": "i",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2988,
-                                    "src": "8475:1:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_uint256",
-                                      "typeString": "uint256"
-                                    }
-                                  },
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "nodeType": "IndexAccess",
-                                  "src": "8462:15:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "||",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "baseExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 3005,
-                                    "name": "ask",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "8481:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 3006,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "netflags",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2227,
-                                  "src": "8481:12:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                                    "typeString": "bool[] memory"
-                                  }
-                                },
-                                "id": 3008,
-                                "indexExpression": {
-                                  "argumentTypes": null,
-                                  "id": 3007,
-                                  "name": "i",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8494:1:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                  }
-                                },
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "nodeType": "IndexAccess",
-                                "src": "8481:15:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "src": "8461:35:7",
-                              "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              }
-                            }
-                          ],
                           "expression": {
-                            "argumentTypes": [
-                              {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              }
-                            ],
-                            "id": 2999,
-                            "name": "require",
+                            "argumentTypes": null,
+                            "id": 2754,
+                            "name": "ask",
                             "nodeType": "Identifier",
-                            "overloadedDeclarations": [
-                              11318,
-                              11319
-                            ],
-                            "referencedDeclaration": 11318,
-                            "src": "8453:7:7",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2592,
+                            "src": "7859:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
-                              "typeString": "function (bool) pure"
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3010,
+                          "id": 2755,
                           "isConstant": false,
-                          "isLValue": false,
+                          "isLValue": true,
                           "isPure": false,
-                          "kind": "functionCall",
                           "lValueRequested": false,
-                          "names": [],
-                          "nodeType": "FunctionCall",
-                          "src": "8453:44:7",
+                          "memberName": "price",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2048,
+                          "src": "7859:9:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_tuple$__$",
-                            "typeString": "tuple()"
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
                           }
                         },
-                        "id": 3011,
-                        "nodeType": "ExpressionStatement",
-                        "src": "8453:44:7"
-                      }
-                    ]
-                  },
-                  "condition": {
-                    "argumentTypes": null,
-                    "commonType": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "id": 2995,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftExpression": {
-                      "argumentTypes": null,
-                      "id": 2991,
-                      "name": "i",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2988,
-                      "src": "8271:1:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "nodeType": "BinaryOperation",
-                    "operator": "<",
-                    "rightExpression": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "expression": {
+                        "nodeType": "BinaryOperation",
+                        "operator": "<=",
+                        "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2992,
-                          "name": "ask",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8275:3:7",
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 2756,
+                            "name": "bid",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2598,
+                            "src": "7872:3:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
+                            }
+                          },
+                          "id": 2757,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "price",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2048,
+                          "src": "7872:9:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                            "typeString": "struct Market.Order memory"
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
                           }
                         },
-                        "id": 2993,
-                        "isConstant": false,
-                        "isLValue": true,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberName": "netflags",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8275:12:7",
+                        "src": "7859:22:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
-                          "typeString": "bool[] memory"
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         }
-                      },
-                      "id": 2994,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "memberName": "length",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": null,
-                      "src": "8275:19:7",
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2753,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7851:7:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
                       }
                     },
-                    "src": "8271:23:7",
+                    "id": 2759,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7851:31:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
                     }
                   },
-                  "id": 3013,
-                  "initializationExpression": {
-                    "assignments": [
-                      2988
-                    ],
-                    "declarations": [
+                  "id": 2760,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7851:31:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
                       {
-                        "constant": false,
-                        "id": 2988,
-                        "name": "i",
-                        "nodeType": "VariableDeclaration",
-                        "scope": 3185,
-                        "src": "8259:6:7",
-                        "stateVariable": false,
-                        "storageLocation": "default",
-                        "typeDescriptions": {
+                        "argumentTypes": null,
+                        "commonType": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "typeName": {
-                          "id": 2987,
-                          "name": "uint",
-                          "nodeType": "ElementaryTypeName",
-                          "src": "8259:4:7",
+                        "id": 2766,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 2762,
+                            "name": "ask",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2592,
+                            "src": "7900:3:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
+                            }
+                          },
+                          "id": 2763,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "duration",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2046,
+                          "src": "7900:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "value": null,
-                        "visibility": "internal"
+                        "nodeType": "BinaryOperation",
+                        "operator": ">=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 2764,
+                            "name": "bid",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2598,
+                            "src": "7916:3:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
+                            }
+                          },
+                          "id": 2765,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "duration",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2046,
+                          "src": "7916:12:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "src": "7900:28:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
                       }
                     ],
-                    "id": 2990,
-                    "initialValue": {
-                      "argumentTypes": null,
-                      "hexValue": "30",
-                      "id": 2989,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": true,
-                      "kind": "number",
-                      "lValueRequested": false,
-                      "nodeType": "Literal",
-                      "src": "8268:1:7",
-                      "subdenomination": null,
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_rational_0_by_1",
-                        "typeString": "int_const 0"
-                      },
-                      "value": "0"
-                    },
-                    "nodeType": "VariableDeclarationStatement",
-                    "src": "8259:10:7"
-                  },
-                  "loopExpression": {
                     "expression": {
-                      "argumentTypes": null,
-                      "id": 2997,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "nodeType": "UnaryOperation",
-                      "operator": "++",
-                      "prefix": false,
-                      "src": "8296:3:7",
-                      "subExpression": {
-                        "argumentTypes": null,
-                        "id": 2996,
-                        "name": "i",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8296:1:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
                         }
-                      },
+                      ],
+                      "id": 2761,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7892:7:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2998,
-                    "nodeType": "ExpressionStatement",
-                    "src": "8296:3:7"
-                  },
-                  "nodeType": "ForStatement",
-                  "src": "8254:254:7"
-                },
-                {
-                  "condition": {
-                    "argumentTypes": null,
-                    "commonType": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    },
-                    "id": 3018,
+                    "id": 2767,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
+                    "kind": "functionCall",
                     "lValueRequested": false,
-                    "leftExpression": {
-                      "argumentTypes": null,
-                      "expression": {
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7892:37:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2768,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7892:37:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
                         "argumentTypes": null,
-                        "expression": {
-                          "argumentTypes": null,
-                          "id": 3014,
-                          "name": "ask",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8522:3:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                            "typeString": "struct Market.Order memory"
-                          }
+                        "commonType": {
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                          "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 3015,
+                        "id": 2777,
                         "isConstant": false,
-                        "isLValue": true,
+                        "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberName": "benchmarks",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8522:14:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                          "typeString": "uint64[] memory"
-                        }
-                      },
-                      "id": 3016,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "memberName": "length",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": null,
-                      "src": "8522:21:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "nodeType": "BinaryOperation",
-                    "operator": "<",
-                    "rightExpression": {
-                      "argumentTypes": null,
-                      "id": 3017,
-                      "name": "benchmarksQuantity",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "8546:18:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "src": "8522:42:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_bool",
-                      "typeString": "bool"
-                    }
-                  },
-                  "falseBody": null,
-                  "id": 3029,
-                  "nodeType": "IfStatement",
-                  "src": "8518:122:7",
-                  "trueBody": {
-                    "id": 3028,
-                    "nodeType": "Block",
-                    "src": "8566:74:7",
-                    "statements": [
-                      {
-                        "expression": {
+                        "leftExpression": {
                           "argumentTypes": null,
-                          "id": 3026,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "leftHandSide": {
-                            "argumentTypes": null,
-                            "expression": {
+                          "arguments": [
+                            {
                               "argumentTypes": null,
-                              "id": 3019,
-                              "name": "ask",
-                              "nodeType": "Identifier",
-                              "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "8580:3:7",
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2772,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7997:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2773,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7997:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                "typeString": "struct Market.Order memory"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
-                            },
-                            "id": 3021,
-                            "isConstant": false,
-                            "isLValue": true,
-                            "isPure": false,
-                            "lValueRequested": true,
-                            "memberName": "benchmarks",
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2770,
+                              "name": "pr",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2145,
+                              "src": "7978:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
+                                "typeString": "contract ProfileRegistry"
+                              }
+                            },
+                            "id": 2771,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2236,
-                            "src": "8580:14:7",
+                            "referencedDeclaration": 10834,
+                            "src": "7978:18:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                              "typeString": "uint64[] memory"
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
+                              "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
+                            }
+                          },
+                          "id": 2774,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7978:30:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 2775,
+                            "name": "ask",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2592,
+                            "src": "8012:3:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
+                            }
+                          },
+                          "id": 2776,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "identityLevel",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2053,
+                          "src": "8012:17:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                          }
+                        },
+                        "src": "7978:51:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2769,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7970:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2778,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7970:60:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2779,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7970:60:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                          "typeString": "enum ProfileRegistry.IdentityLevel"
+                        },
+                        "id": 2788,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2783,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "8067:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2784,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "8067:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2781,
+                              "name": "pr",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2145,
+                              "src": "8048:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
+                                "typeString": "contract ProfileRegistry"
+                              }
+                            },
+                            "id": 2782,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "GetProfileLevel",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 10834,
+                            "src": "8048:18:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
+                              "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
+                            }
+                          },
+                          "id": 2785,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "8048:30:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": ">=",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "expression": {
+                            "argumentTypes": null,
+                            "id": 2786,
+                            "name": "bid",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [],
+                            "referencedDeclaration": 2598,
+                            "src": "8082:3:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                              "typeString": "struct Market.Order memory"
+                            }
+                          },
+                          "id": 2787,
+                          "isConstant": false,
+                          "isLValue": true,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "memberName": "identityLevel",
+                          "nodeType": "MemberAccess",
+                          "referencedDeclaration": 2053,
+                          "src": "8082:17:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
+                            "typeString": "enum ProfileRegistry.IdentityLevel"
+                          }
+                        },
+                        "src": "8048:51:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2780,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "8040:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2789,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "8040:60:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2790,
+                  "nodeType": "ExpressionStatement",
+                  "src": "8040:60:6"
+                },
+                {
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 2795,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2791,
+                          "name": "ask",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2592,
+                          "src": "8115:3:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                            "typeString": "struct Market.Order memory"
+                          }
+                        },
+                        "id": 2792,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "netflags",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 2051,
+                        "src": "8115:12:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                          "typeString": "bool[] memory"
+                        }
+                      },
+                      "id": 2793,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "8115:19:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "id": 2794,
+                      "name": "netflagsQuantity",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2158,
+                      "src": "8137:16:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "src": "8115:38:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
+                    }
+                  },
+                  "falseBody": null,
+                  "id": 2806,
+                  "nodeType": "IfStatement",
+                  "src": "8111:112:6",
+                  "trueBody": {
+                    "id": 2805,
+                    "nodeType": "Block",
+                    "src": "8155:68:6",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2803,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2796,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "8169:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2798,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "netflags",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2051,
+                            "src": "8169:12:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                              "typeString": "bool[] memory"
                             }
                           },
                           "nodeType": "Assignment",
@@ -13171,51 +12536,51 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3023,
+                                  "id": 2800,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8614:3:7",
+                                  "referencedDeclaration": 2592,
+                                  "src": "8199:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3024,
+                                "id": 2801,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
-                                "memberName": "benchmarks",
+                                "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2236,
-                                "src": "8614:14:7",
+                                "referencedDeclaration": 2051,
+                                "src": "8199:12:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                  "typeString": "uint64[] memory"
+                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                  "typeString": "bool[] memory"
                                 }
                               }
                             ],
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                  "typeString": "uint64[] memory"
+                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                  "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 3022,
-                              "name": "ResizeBenchmarks",
+                              "id": 2799,
+                              "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5047,
-                              "src": "8597:16:7",
+                              "referencedDeclaration": 4926,
+                              "src": "8184:14:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
-                                "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
+                                "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
+                                "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 3025,
+                            "id": 2802,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -13223,21 +12588,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8597:32:7",
+                            "src": "8184:28:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
-                              "typeString": "uint64[] memory"
+                              "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
+                              "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8580:49:7",
+                          "src": "8169:43:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                            "typeString": "uint64[] memory"
+                            "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                            "typeString": "bool[] memory"
                           }
                         },
-                        "id": 3027,
+                        "id": 2804,
                         "nodeType": "ExpressionStatement",
-                        "src": "8580:49:7"
+                        "src": "8169:43:6"
                       }
                     ]
                   }
@@ -13249,7 +12614,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3034,
+                    "id": 2811,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13260,32 +12625,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3030,
+                          "id": 2807,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2774,
-                          "src": "8654:3:7",
+                          "referencedDeclaration": 2598,
+                          "src": "8237:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3031,
+                        "id": 2808,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberName": "benchmarks",
+                        "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8654:14:7",
+                        "referencedDeclaration": 2051,
+                        "src": "8237:12:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                          "typeString": "uint64[] memory"
+                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                          "typeString": "bool[] memory"
                         }
                       },
-                      "id": 3032,
+                      "id": 2809,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13293,7 +12658,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8654:21:7",
+                      "src": "8237:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13303,36 +12668,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 3033,
-                      "name": "benchmarksQuantity",
+                      "id": 2810,
+                      "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "8678:18:7",
+                      "referencedDeclaration": 2158,
+                      "src": "8259:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8654:42:7",
+                    "src": "8237:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3045,
+                  "id": 2822,
                   "nodeType": "IfStatement",
-                  "src": "8650:122:7",
+                  "src": "8233:112:6",
                   "trueBody": {
-                    "id": 3044,
+                    "id": 2821,
                     "nodeType": "Block",
-                    "src": "8698:74:7",
+                    "src": "8277:68:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3042,
+                          "id": 2819,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13341,29 +12706,29 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3035,
+                              "id": 2812,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "8712:3:7",
+                              "referencedDeclaration": 2598,
+                              "src": "8291:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 3037,
+                            "id": 2814,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
-                            "memberName": "benchmarks",
+                            "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2236,
-                            "src": "8712:14:7",
+                            "referencedDeclaration": 2051,
+                            "src": "8291:12:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                              "typeString": "uint64[] memory"
+                              "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                              "typeString": "bool[] memory"
                             }
                           },
                           "nodeType": "Assignment",
@@ -13375,51 +12740,51 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3039,
-                                  "name": "bid",
+                                  "id": 2816,
+                                  "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "8746:3:7",
+                                  "referencedDeclaration": 2592,
+                                  "src": "8321:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3040,
+                                "id": 2817,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
-                                "memberName": "benchmarks",
+                                "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2236,
-                                "src": "8746:14:7",
+                                "referencedDeclaration": 2051,
+                                "src": "8321:12:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                  "typeString": "uint64[] memory"
+                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                  "typeString": "bool[] memory"
                                 }
                               }
                             ],
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                  "typeString": "uint64[] memory"
+                                  "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                  "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 3038,
-                              "name": "ResizeBenchmarks",
+                              "id": 2815,
+                              "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5047,
-                              "src": "8729:16:7",
+                              "referencedDeclaration": 4926,
+                              "src": "8306:14:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
-                                "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
+                                "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
+                                "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 3041,
+                            "id": 2818,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -13427,30 +12792,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8729:32:7",
+                            "src": "8306:28:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
-                              "typeString": "uint64[] memory"
+                              "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
+                              "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8712:49:7",
+                          "src": "8291:43:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                            "typeString": "uint64[] memory"
+                            "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                            "typeString": "bool[] memory"
                           }
                         },
-                        "id": 3043,
+                        "id": 2820,
                         "nodeType": "ExpressionStatement",
-                        "src": "8712:49:7"
+                        "src": "8291:43:6"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 3070,
+                    "id": 2848,
                     "nodeType": "Block",
-                    "src": "8826:72:7",
+                    "src": "8402:207:6",
                     "statements": [
                       {
                         "expression": {
@@ -13459,112 +12824,128 @@
                             {
                               "argumentTypes": null,
                               "commonType": {
-                                "typeIdentifier": "t_uint64",
-                                "typeString": "uint64"
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
                               },
-                              "id": 3067,
+                              "id": 2845,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "baseExpression": {
+                                "id": 2840,
+                                "isConstant": false,
+                                "isLValue": false,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "UnaryOperation",
+                                "operator": "!",
+                                "prefix": true,
+                                "src": "8562:16:6",
+                                "subExpression": {
                                   "argumentTypes": null,
-                                  "expression": {
+                                  "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3059,
-                                    "name": "ask",
+                                    "expression": {
+                                      "argumentTypes": null,
+                                      "id": 2836,
+                                      "name": "bid",
+                                      "nodeType": "Identifier",
+                                      "overloadedDeclarations": [],
+                                      "referencedDeclaration": 2598,
+                                      "src": "8563:3:6",
+                                      "typeDescriptions": {
+                                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                        "typeString": "struct Market.Order memory"
+                                      }
+                                    },
+                                    "id": 2837,
+                                    "isConstant": false,
+                                    "isLValue": true,
+                                    "isPure": false,
+                                    "lValueRequested": false,
+                                    "memberName": "netflags",
+                                    "nodeType": "MemberAccess",
+                                    "referencedDeclaration": 2051,
+                                    "src": "8563:12:6",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                      "typeString": "bool[] memory"
+                                    }
+                                  },
+                                  "id": 2839,
+                                  "indexExpression": {
+                                    "argumentTypes": null,
+                                    "id": 2838,
+                                    "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "8848:3:7",
+                                    "referencedDeclaration": 2824,
+                                    "src": "8576:1:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
+                                      "typeIdentifier": "t_uint256",
+                                      "typeString": "uint256"
                                     }
                                   },
-                                  "id": 3060,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
-                                  "memberName": "benchmarks",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2236,
-                                  "src": "8848:14:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                    "typeString": "uint64[] memory"
-                                  }
-                                },
-                                "id": 3062,
-                                "indexExpression": {
-                                  "argumentTypes": null,
-                                  "id": 3061,
-                                  "name": "i",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8863:1:7",
+                                  "nodeType": "IndexAccess",
+                                  "src": "8563:15:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
+                                    "typeIdentifier": "t_bool",
+                                    "typeString": "bool"
                                   }
                                 },
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "nodeType": "IndexAccess",
-                                "src": "8848:17:7",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_uint64",
-                                  "typeString": "uint64"
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
                                 }
                               },
                               "nodeType": "BinaryOperation",
-                              "operator": ">=",
+                              "operator": "||",
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3063,
-                                    "name": "bid",
+                                    "id": 2841,
+                                    "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "8869:3:7",
+                                    "referencedDeclaration": 2592,
+                                    "src": "8582:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 3064,
+                                  "id": 2842,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
-                                  "memberName": "benchmarks",
+                                  "memberName": "netflags",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2236,
-                                  "src": "8869:14:7",
+                                  "referencedDeclaration": 2051,
+                                  "src": "8582:12:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                                    "typeString": "uint64[] memory"
+                                    "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                                    "typeString": "bool[] memory"
                                   }
                                 },
-                                "id": 3066,
+                                "id": 2844,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3065,
+                                  "id": 2843,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8884:1:7",
+                                  "referencedDeclaration": 2824,
+                                  "src": "8595:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -13575,13 +12956,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8869:17:7",
+                                "src": "8582:15:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_uint64",
-                                  "typeString": "uint64"
+                                  "typeIdentifier": "t_bool",
+                                  "typeString": "bool"
                                 }
                               },
-                              "src": "8848:38:7",
+                              "src": "8562:35:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -13595,21 +12976,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3058,
+                            "id": 2835,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "8840:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "8554:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3068,
+                          "id": 2846,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -13617,15 +12998,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8840:47:7",
+                          "src": "8554:44:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3069,
+                        "id": 2847,
                         "nodeType": "ExpressionStatement",
-                        "src": "8840:47:7"
+                        "src": "8554:44:6"
                       }
                     ]
                   },
@@ -13635,19 +13016,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3054,
+                    "id": 2831,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3050,
+                      "id": 2827,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2988,
-                      "src": "8794:1:7",
+                      "referencedDeclaration": 2824,
+                      "src": "8372:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -13661,32 +13042,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3051,
+                          "id": 2828,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8798:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8376:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3052,
+                        "id": 2829,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberName": "benchmarks",
+                        "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8798:14:7",
+                        "referencedDeclaration": 2051,
+                        "src": "8376:12:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
-                          "typeString": "uint64[] memory"
+                          "typeIdentifier": "t_array$_t_bool_$dyn_memory",
+                          "typeString": "bool[] memory"
                         }
                       },
-                      "id": 3053,
+                      "id": 2830,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13694,74 +13075,77 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8798:21:7",
+                      "src": "8376:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8794:25:7",
+                    "src": "8372:23:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3071,
+                  "id": 2849,
                   "initializationExpression": {
-                    "expression": {
-                      "argumentTypes": null,
-                      "id": 3048,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": false,
-                      "lValueRequested": false,
-                      "leftHandSide": {
-                        "argumentTypes": null,
-                        "id": 3046,
+                    "assignments": [
+                      2824
+                    ],
+                    "declarations": [
+                      {
+                        "constant": false,
+                        "id": 2824,
                         "name": "i",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8787:1:7",
+                        "nodeType": "VariableDeclaration",
+                        "scope": 3021,
+                        "src": "8360:6:6",
+                        "stateVariable": false,
+                        "storageLocation": "default",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
-                        }
-                      },
-                      "nodeType": "Assignment",
-                      "operator": "=",
-                      "rightHandSide": {
-                        "argumentTypes": null,
-                        "hexValue": "30",
-                        "id": 3047,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "kind": "number",
-                        "lValueRequested": false,
-                        "nodeType": "Literal",
-                        "src": "8791:1:7",
-                        "subdenomination": null,
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_rational_0_by_1",
-                          "typeString": "int_const 0"
                         },
-                        "value": "0"
-                      },
-                      "src": "8787:5:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
+                        "typeName": {
+                          "id": 2823,
+                          "name": "uint",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "8360:4:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "value": null,
+                        "visibility": "internal"
                       }
+                    ],
+                    "id": 2826,
+                    "initialValue": {
+                      "argumentTypes": null,
+                      "hexValue": "30",
+                      "id": 2825,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "8369:1:6",
+                      "subdenomination": null,
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
                     },
-                    "id": 3049,
-                    "nodeType": "ExpressionStatement",
-                    "src": "8787:5:7"
+                    "nodeType": "VariableDeclarationStatement",
+                    "src": "8360:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3056,
+                      "id": 2833,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -13769,15 +13153,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8821:3:7",
+                      "src": "8397:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3055,
+                        "id": 2832,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8821:1:7",
+                        "referencedDeclaration": 2824,
+                        "src": "8397:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -13788,762 +13172,1519 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3057,
+                    "id": 2834,
                     "nodeType": "ExpressionStatement",
-                    "src": "8821:3:7"
+                    "src": "8397:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8782:116:7"
+                  "src": "8355:254:6"
                 },
                 {
-                  "expression": {
+                  "condition": {
                     "argumentTypes": null,
-                    "id": 3077,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 2854,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
-                    "leftHandSide": {
-                      "argumentTypes": null,
-                      "id": 3072,
-                      "name": "dealAmount",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "8908:10:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "nodeType": "Assignment",
-                    "operator": "=",
-                    "rightHandSide": {
+                    "leftExpression": {
                       "argumentTypes": null,
-                      "arguments": [
-                        {
-                          "argumentTypes": null,
-                          "hexValue": "31",
-                          "id": 3075,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": true,
-                          "kind": "number",
-                          "lValueRequested": false,
-                          "nodeType": "Literal",
-                          "src": "8936:1:7",
-                          "subdenomination": null,
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_rational_1_by_1",
-                            "typeString": "int_const 1"
-                          },
-                          "value": "1"
-                        }
-                      ],
                       "expression": {
-                        "argumentTypes": [
-                          {
-                            "typeIdentifier": "t_rational_1_by_1",
-                            "typeString": "int_const 1"
-                          }
-                        ],
+                        "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3073,
-                          "name": "dealAmount",
+                          "id": 2850,
+                          "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2327,
-                          "src": "8921:10:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8623:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                            "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3074,
+                        "id": 2851,
                         "isConstant": false,
-                        "isLValue": false,
+                        "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
-                        "memberName": "add",
+                        "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "8921:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "8623:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
-                          "typeString": "function (uint256,uint256) pure returns (uint256)"
+                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                          "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3076,
+                      "id": 2852,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
-                      "kind": "functionCall",
                       "lValueRequested": false,
-                      "names": [],
-                      "nodeType": "FunctionCall",
-                      "src": "8921:17:7",
+                      "memberName": "length",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "8623:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8908:30:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
-                    }
-                  },
-                  "id": 3078,
-                  "nodeType": "ExpressionStatement",
-                  "src": "8908:30:7"
-                },
-                {
-                  "assignments": [
-                    3080
-                  ],
-                  "declarations": [
-                    {
-                      "constant": false,
-                      "id": 3080,
-                      "name": "master",
-                      "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "8948:14:7",
-                      "stateVariable": false,
-                      "storageLocation": "default",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_address",
-                        "typeString": "address"
-                      },
-                      "typeName": {
-                        "id": 3079,
-                        "name": "address",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "8948:7:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_address",
-                          "typeString": "address"
-                        }
-                      },
-                      "value": null,
-                      "visibility": "internal"
-                    }
-                  ],
-                  "id": 3085,
-                  "initialValue": {
-                    "argumentTypes": null,
-                    "arguments": [
-                      {
-                        "argumentTypes": null,
-                        "expression": {
-                          "argumentTypes": null,
-                          "id": 3082,
-                          "name": "ask",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8975:3:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                            "typeString": "struct Market.Order memory"
-                          }
-                        },
-                        "id": 3083,
-                        "isConstant": false,
-                        "isLValue": true,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "memberName": "author",
-                        "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2218,
-                        "src": "8975:10:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_address",
-                          "typeString": "address"
-                        }
-                      }
-                    ],
-                    "expression": {
-                      "argumentTypes": [
-                        {
-                          "typeIdentifier": "t_address",
-                          "typeString": "address"
-                        }
-                      ],
-                      "id": 3081,
-                      "name": "GetMaster",
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "id": 2853,
+                      "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4298,
-                      "src": "8965:9:7",
+                      "referencedDeclaration": 2156,
+                      "src": "8647:18:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                        "typeString": "function (address) view returns (address)"
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       }
                     },
-                    "id": 3084,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "kind": "functionCall",
-                    "lValueRequested": false,
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "8965:21:7",
+                    "src": "8623:42:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_address",
-                      "typeString": "address"
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
                     }
                   },
-                  "nodeType": "VariableDeclarationStatement",
-                  "src": "8948:38:7"
-                },
-                {
-                  "expression": {
-                    "argumentTypes": null,
-                    "id": 3092,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftHandSide": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "baseExpression": {
-                          "argumentTypes": null,
-                          "id": 3086,
-                          "name": "orders",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "8996:6:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
-                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
-                          }
-                        },
-                        "id": 3088,
-                        "indexExpression": {
+                  "falseBody": null,
+                  "id": 2865,
+                  "nodeType": "IfStatement",
+                  "src": "8619:122:6",
+                  "trueBody": {
+                    "id": 2864,
+                    "nodeType": "Block",
+                    "src": "8667:74:6",
+                    "statements": [
+                      {
+                        "expression": {
                           "argumentTypes": null,
-                          "id": 3087,
-                          "name": "_askID",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9003:6:7",
+                          "id": 2862,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2855,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "8681:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2857,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "benchmarks",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2060,
+                            "src": "8681:14:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                              "typeString": "uint64[] memory"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 2859,
+                                  "name": "ask",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2592,
+                                  "src": "8715:3:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
+                                  }
+                                },
+                                "id": 2860,
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "benchmarks",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2060,
+                                "src": "8715:14:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                  "typeString": "uint64[] memory"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                  "typeString": "uint64[] memory"
+                                }
+                              ],
+                              "id": 2858,
+                              "name": "ResizeBenchmarks",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4883,
+                              "src": "8698:16:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
+                                "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
+                              }
+                            },
+                            "id": 2861,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "8698:32:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
+                              "typeString": "uint64[] memory"
+                            }
+                          },
+                          "src": "8681:49:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                            "typeString": "uint64[] memory"
                           }
                         },
-                        "isConstant": false,
-                        "isLValue": true,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "nodeType": "IndexAccess",
-                        "src": "8996:14:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
-                          "typeString": "struct Market.Order storage ref"
-                        }
-                      },
-                      "id": 3089,
-                      "isConstant": false,
-                      "isLValue": true,
-                      "isPure": false,
-                      "lValueRequested": true,
-                      "memberName": "orderStatus",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "8996:26:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                        "typeString": "enum Market.OrderStatus"
-                      }
-                    },
-                    "nodeType": "Assignment",
-                    "operator": "=",
-                    "rightHandSide": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "id": 3090,
-                        "name": "OrderStatus",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "9025:11:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
-                          "typeString": "type(enum Market.OrderStatus)"
-                        }
-                      },
-                      "id": 3091,
-                      "isConstant": false,
-                      "isLValue": false,
-                      "isPure": true,
-                      "lValueRequested": false,
-                      "memberName": "ORDER_INACTIVE",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": null,
-                      "src": "9025:26:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                        "typeString": "enum Market.OrderStatus"
+                        "id": 2863,
+                        "nodeType": "ExpressionStatement",
+                        "src": "8681:49:6"
                       }
-                    },
-                    "src": "8996:55:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                      "typeString": "enum Market.OrderStatus"
-                    }
-                  },
-                  "id": 3093,
-                  "nodeType": "ExpressionStatement",
-                  "src": "8996:55:7"
+                    ]
+                  }
                 },
                 {
-                  "expression": {
+                  "condition": {
                     "argumentTypes": null,
-                    "id": 3100,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 2870,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
-                    "leftHandSide": {
+                    "leftExpression": {
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "baseExpression": {
-                          "argumentTypes": null,
-                          "id": 3094,
-                          "name": "orders",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9061:6:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
-                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
-                          }
-                        },
-                        "id": 3096,
-                        "indexExpression": {
+                        "expression": {
                           "argumentTypes": null,
-                          "id": 3095,
-                          "name": "_bidID",
+                          "id": 2866,
+                          "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9068:6:7",
+                          "referencedDeclaration": 2598,
+                          "src": "8755:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                            "typeString": "struct Market.Order memory"
                           }
                         },
+                        "id": 2867,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
-                        "nodeType": "IndexAccess",
-                        "src": "9061:14:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
-                          "typeString": "struct Market.Order storage ref"
-                        }
-                      },
-                      "id": 3097,
-                      "isConstant": false,
-                      "isLValue": true,
-                      "isPure": false,
-                      "lValueRequested": true,
-                      "memberName": "orderStatus",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "9061:26:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                        "typeString": "enum Market.OrderStatus"
-                      }
-                    },
-                    "nodeType": "Assignment",
-                    "operator": "=",
-                    "rightHandSide": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "id": 3098,
-                        "name": "OrderStatus",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "9090:11:7",
+                        "memberName": "benchmarks",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 2060,
+                        "src": "8755:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
-                          "typeString": "type(enum Market.OrderStatus)"
+                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                          "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3099,
+                      "id": 2868,
                       "isConstant": false,
                       "isLValue": false,
-                      "isPure": true,
+                      "isPure": false,
                       "lValueRequested": false,
-                      "memberName": "ORDER_INACTIVE",
+                      "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9090:26:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                        "typeString": "enum Market.OrderStatus"
-                      }
-                    },
-                    "src": "9061:55:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
-                      "typeString": "enum Market.OrderStatus"
-                    }
-                  },
-                  "id": 3101,
-                  "nodeType": "ExpressionStatement",
-                  "src": "9061:55:7"
-                },
-                {
-                  "expression": {
-                    "argumentTypes": null,
-                    "id": 3107,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftHandSide": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "baseExpression": {
-                          "argumentTypes": null,
-                          "id": 3102,
-                          "name": "orders",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9126:6:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
-                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
-                          }
-                        },
-                        "id": 3104,
-                        "indexExpression": {
-                          "argumentTypes": null,
-                          "id": 3103,
-                          "name": "_askID",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9133:6:7",
-                          "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
-                          }
-                        },
-                        "isConstant": false,
-                        "isLValue": true,
-                        "isPure": false,
-                        "lValueRequested": false,
-                        "nodeType": "IndexAccess",
-                        "src": "9126:14:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
-                          "typeString": "struct Market.Order storage ref"
-                        }
-                      },
-                      "id": 3105,
-                      "isConstant": false,
-                      "isLValue": true,
-                      "isPure": false,
-                      "lValueRequested": true,
-                      "memberName": "dealID",
-                      "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2240,
-                      "src": "9126:21:7",
+                      "src": "8755:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "nodeType": "Assignment",
-                    "operator": "=",
-                    "rightHandSide": {
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
                       "argumentTypes": null,
-                      "id": 3106,
-                      "name": "dealAmount",
+                      "id": 2869,
+                      "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "9150:10:7",
+                      "referencedDeclaration": 2156,
+                      "src": "8779:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9126:34:7",
+                    "src": "8755:42:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
                     }
                   },
-                  "id": 3108,
-                  "nodeType": "ExpressionStatement",
-                  "src": "9126:34:7"
-                },
-                {
-                  "expression": {
-                    "argumentTypes": null,
-                    "id": 3114,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "lValueRequested": false,
-                    "leftHandSide": {
-                      "argumentTypes": null,
-                      "expression": {
-                        "argumentTypes": null,
-                        "baseExpression": {
-                          "argumentTypes": null,
-                          "id": 3109,
-                          "name": "orders",
-                          "nodeType": "Identifier",
-                          "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9170:6:7",
+                  "falseBody": null,
+                  "id": 2881,
+                  "nodeType": "IfStatement",
+                  "src": "8751:122:6",
+                  "trueBody": {
+                    "id": 2880,
+                    "nodeType": "Block",
+                    "src": "8799:74:6",
+                    "statements": [
+                      {
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2878,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftHandSide": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2871,
+                              "name": "bid",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2598,
+                              "src": "8813:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2873,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": true,
+                            "memberName": "benchmarks",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2060,
+                            "src": "8813:14:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                              "typeString": "uint64[] memory"
+                            }
+                          },
+                          "nodeType": "Assignment",
+                          "operator": "=",
+                          "rightHandSide": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "expression": {
+                                  "argumentTypes": null,
+                                  "id": 2875,
+                                  "name": "bid",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2598,
+                                  "src": "8847:3:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
+                                  }
+                                },
+                                "id": 2876,
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "benchmarks",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2060,
+                                "src": "8847:14:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                  "typeString": "uint64[] memory"
+                                }
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                  "typeString": "uint64[] memory"
+                                }
+                              ],
+                              "id": 2874,
+                              "name": "ResizeBenchmarks",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4883,
+                              "src": "8830:16:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
+                                "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
+                              }
+                            },
+                            "id": 2877,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "8830:32:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
+                              "typeString": "uint64[] memory"
+                            }
+                          },
+                          "src": "8813:49:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
-                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
+                            "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                            "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 3111,
-                        "indexExpression": {
+                        "id": 2879,
+                        "nodeType": "ExpressionStatement",
+                        "src": "8813:49:6"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "body": {
+                    "id": 2906,
+                    "nodeType": "Block",
+                    "src": "8927:72:6",
+                    "statements": [
+                      {
+                        "expression": {
                           "argumentTypes": null,
-                          "id": 3110,
-                          "name": "_bidID",
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "commonType": {
+                                "typeIdentifier": "t_uint64",
+                                "typeString": "uint64"
+                              },
+                              "id": 2903,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "leftExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 2895,
+                                    "name": "ask",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2592,
+                                    "src": "8949:3:6",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
+                                    }
+                                  },
+                                  "id": 2896,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "benchmarks",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 2060,
+                                  "src": "8949:14:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                    "typeString": "uint64[] memory"
+                                  }
+                                },
+                                "id": 2898,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "id": 2897,
+                                  "name": "i",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2824,
+                                  "src": "8964:1:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint256",
+                                    "typeString": "uint256"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "8949:17:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint64",
+                                  "typeString": "uint64"
+                                }
+                              },
+                              "nodeType": "BinaryOperation",
+                              "operator": ">=",
+                              "rightExpression": {
+                                "argumentTypes": null,
+                                "baseExpression": {
+                                  "argumentTypes": null,
+                                  "expression": {
+                                    "argumentTypes": null,
+                                    "id": 2899,
+                                    "name": "bid",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2598,
+                                    "src": "8970:3:6",
+                                    "typeDescriptions": {
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
+                                    }
+                                  },
+                                  "id": 2900,
+                                  "isConstant": false,
+                                  "isLValue": true,
+                                  "isPure": false,
+                                  "lValueRequested": false,
+                                  "memberName": "benchmarks",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 2060,
+                                  "src": "8970:14:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                                    "typeString": "uint64[] memory"
+                                  }
+                                },
+                                "id": 2902,
+                                "indexExpression": {
+                                  "argumentTypes": null,
+                                  "id": 2901,
+                                  "name": "i",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2824,
+                                  "src": "8985:1:6",
+                                  "typeDescriptions": {
+                                    "typeIdentifier": "t_uint256",
+                                    "typeString": "uint256"
+                                  }
+                                },
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "nodeType": "IndexAccess",
+                                "src": "8970:17:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_uint64",
+                                  "typeString": "uint64"
+                                }
+                              },
+                              "src": "8949:38:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_bool",
+                                "typeString": "bool"
+                              }
+                            ],
+                            "id": 2894,
+                            "name": "require",
+                            "nodeType": "Identifier",
+                            "overloadedDeclarations": [
+                              11602,
+                              11603
+                            ],
+                            "referencedDeclaration": 11602,
+                            "src": "8941:7:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                              "typeString": "function (bool) pure"
+                            }
+                          },
+                          "id": 2904,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "8941:47:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_tuple$__$",
+                            "typeString": "tuple()"
+                          }
+                        },
+                        "id": 2905,
+                        "nodeType": "ExpressionStatement",
+                        "src": "8941:47:6"
+                      }
+                    ]
+                  },
+                  "condition": {
+                    "argumentTypes": null,
+                    "commonType": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    },
+                    "id": 2890,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftExpression": {
+                      "argumentTypes": null,
+                      "id": 2886,
+                      "name": "i",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2824,
+                      "src": "8895:1:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "BinaryOperation",
+                    "operator": "<",
+                    "rightExpression": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2887,
+                          "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9177:6:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8899:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_uint256",
-                            "typeString": "uint256"
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                            "typeString": "struct Market.Order memory"
                           }
                         },
+                        "id": 2888,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
-                        "nodeType": "IndexAccess",
-                        "src": "9170:14:7",
+                        "memberName": "benchmarks",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 2060,
+                        "src": "8899:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
-                          "typeString": "struct Market.Order storage ref"
+                          "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
+                          "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3112,
+                      "id": 2889,
                       "isConstant": false,
-                      "isLValue": true,
+                      "isLValue": false,
                       "isPure": false,
-                      "lValueRequested": true,
-                      "memberName": "dealID",
+                      "lValueRequested": false,
+                      "memberName": "length",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2240,
-                      "src": "9170:21:7",
-                      "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
-                      }
-                    },
-                    "nodeType": "Assignment",
-                    "operator": "=",
-                    "rightHandSide": {
-                      "argumentTypes": null,
-                      "id": 3113,
-                      "name": "dealAmount",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "9194:10:7",
+                      "referencedDeclaration": null,
+                      "src": "8899:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9170:34:7",
+                    "src": "8895:25:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_uint256",
-                      "typeString": "uint256"
+                      "typeIdentifier": "t_bool",
+                      "typeString": "bool"
                     }
                   },
-                  "id": 3115,
-                  "nodeType": "ExpressionStatement",
-                  "src": "9170:34:7"
-                },
-                {
-                  "eventCall": {
-                    "argumentTypes": null,
-                    "arguments": [
-                      {
+                  "id": 2907,
+                  "initializationExpression": {
+                    "expression": {
+                      "argumentTypes": null,
+                      "id": 2884,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 3117,
-                        "name": "_askID",
+                        "id": 2882,
+                        "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2760,
-                        "src": "9233:6:7",
+                        "referencedDeclaration": 2824,
+                        "src": "8888:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
+                      },
+                      "nodeType": "Assignment",
+                      "operator": "=",
+                      "rightHandSide": {
+                        "argumentTypes": null,
+                        "hexValue": "30",
+                        "id": 2883,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "kind": "number",
+                        "lValueRequested": false,
+                        "nodeType": "Literal",
+                        "src": "8892:1:6",
+                        "subdenomination": null,
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_rational_0_by_1",
+                          "typeString": "int_const 0"
+                        },
+                        "value": "0"
+                      },
+                      "src": "8888:5:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       }
-                    ],
+                    },
+                    "id": 2885,
+                    "nodeType": "ExpressionStatement",
+                    "src": "8888:5:6"
+                  },
+                  "loopExpression": {
                     "expression": {
-                      "argumentTypes": [
-                        {
+                      "argumentTypes": null,
+                      "id": 2892,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "UnaryOperation",
+                      "operator": "++",
+                      "prefix": false,
+                      "src": "8922:3:6",
+                      "subExpression": {
+                        "argumentTypes": null,
+                        "id": 2891,
+                        "name": "i",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 2824,
+                        "src": "8922:1:6",
+                        "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
-                      ],
-                      "id": 3116,
-                      "name": "OrderUpdated",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "9220:12:7",
+                      },
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
-                        "typeString": "function (uint256)"
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       }
                     },
-                    "id": 3118,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "kind": "functionCall",
-                    "lValueRequested": false,
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "9220:20:7",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$__$",
-                      "typeString": "tuple()"
-                    }
+                    "id": 2893,
+                    "nodeType": "ExpressionStatement",
+                    "src": "8922:3:6"
                   },
-                  "id": 3119,
-                  "nodeType": "EmitStatement",
-                  "src": "9215:25:7"
+                  "nodeType": "ForStatement",
+                  "src": "8883:116:6"
                 },
                 {
-                  "eventCall": {
+                  "expression": {
                     "argumentTypes": null,
-                    "arguments": [
-                      {
-                        "argumentTypes": null,
-                        "id": 3121,
-                        "name": "_bidID",
-                        "nodeType": "Identifier",
-                        "overloadedDeclarations": [],
-                        "referencedDeclaration": 2762,
-                        "src": "9268:6:7",
-                        "typeDescriptions": {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
-                        }
+                    "id": 2913,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "id": 2908,
+                      "name": "dealAmount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2151,
+                      "src": "9009:10:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       }
-                    ],
-                    "expression": {
-                      "argumentTypes": [
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "arguments": [
                         {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
+                          "argumentTypes": null,
+                          "hexValue": "31",
+                          "id": 2911,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "number",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "9037:1:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_rational_1_by_1",
+                            "typeString": "int_const 1"
+                          },
+                          "value": "1"
                         }
                       ],
-                      "id": 3120,
-                      "name": "OrderUpdated",
-                      "nodeType": "Identifier",
-                      "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "9255:12:7",
+                      "expression": {
+                        "argumentTypes": [
+                          {
+                            "typeIdentifier": "t_rational_1_by_1",
+                            "typeString": "int_const 1"
+                          }
+                        ],
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2909,
+                          "name": "dealAmount",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2151,
+                          "src": "9022:10:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "id": 2910,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "add",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 11079,
+                        "src": "9022:14:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
+                          "typeString": "function (uint256,uint256) pure returns (uint256)"
+                        }
+                      },
+                      "id": 2912,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "kind": "functionCall",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "9022:17:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
-                        "typeString": "function (uint256)"
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
                       }
                     },
-                    "id": 3122,
-                    "isConstant": false,
-                    "isLValue": false,
-                    "isPure": false,
-                    "kind": "functionCall",
-                    "lValueRequested": false,
-                    "names": [],
-                    "nodeType": "FunctionCall",
-                    "src": "9255:20:7",
+                    "src": "9009:30:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$__$",
-                      "typeString": "tuple()"
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
                     }
                   },
-                  "id": 3123,
-                  "nodeType": "EmitStatement",
-                  "src": "9250:25:7"
+                  "id": 2914,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9009:30:6"
                 },
                 {
                   "assignments": [
-                    3125
+                    2916
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3125,
-                      "name": "startTime",
+                      "id": 2916,
+                      "name": "master",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9286:14:7",
+                      "scope": 3021,
+                      "src": "9049:14:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_uint256",
-                        "typeString": "uint256"
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
                       },
                       "typeName": {
-                        "id": 3124,
-                        "name": "uint",
+                        "id": 2915,
+                        "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9286:4:7",
+                        "src": "9049:7:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_uint256",
-                          "typeString": "uint256"
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
                         }
                       },
                       "value": null,
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3128,
+                  "id": 2921,
                   "initialValue": {
                     "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "expression": {
+                          "argumentTypes": null,
+                          "id": 2918,
+                          "name": "ask",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2592,
+                          "src": "9076:3:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                            "typeString": "struct Market.Order memory"
+                          }
+                        },
+                        "id": 2919,
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberName": "author",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 2042,
+                        "src": "9076:10:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      }
+                    ],
                     "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_address",
+                          "typeString": "address"
+                        }
+                      ],
+                      "id": 2917,
+                      "name": "GetMaster",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 4134,
+                      "src": "9066:9:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                        "typeString": "function (address) view returns (address)"
+                      }
+                    },
+                    "id": 2920,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "9066:21:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_address",
+                      "typeString": "address"
+                    }
+                  },
+                  "nodeType": "VariableDeclarationStatement",
+                  "src": "9049:38:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 2928,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3126,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 2922,
+                          "name": "orders",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2162,
+                          "src": "9097:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
+                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
+                          }
+                        },
+                        "id": 2924,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 2923,
+                          "name": "_askID",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2584,
+                          "src": "9104:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "9097:14:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
+                          "typeString": "struct Market.Order storage ref"
+                        }
+                      },
+                      "id": 2925,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "orderStatus",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 2040,
+                      "src": "9097:26:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                        "typeString": "enum Market.OrderStatus"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 2926,
+                        "name": "OrderStatus",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1996,
+                        "src": "9126:11:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
+                          "typeString": "type(enum Market.OrderStatus)"
+                        }
+                      },
+                      "id": 2927,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "memberName": "ORDER_INACTIVE",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9126:26:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                        "typeString": "enum Market.OrderStatus"
+                      }
+                    },
+                    "src": "9097:55:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                      "typeString": "enum Market.OrderStatus"
+                    }
+                  },
+                  "id": 2929,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9097:55:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 2936,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 2930,
+                          "name": "orders",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2162,
+                          "src": "9162:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
+                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
+                          }
+                        },
+                        "id": 2932,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 2931,
+                          "name": "_bidID",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2586,
+                          "src": "9169:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "9162:14:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
+                          "typeString": "struct Market.Order storage ref"
+                        }
+                      },
+                      "id": 2933,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "orderStatus",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 2040,
+                      "src": "9162:26:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                        "typeString": "enum Market.OrderStatus"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "id": 2934,
+                        "name": "OrderStatus",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 1996,
+                        "src": "9191:11:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
+                          "typeString": "type(enum Market.OrderStatus)"
+                        }
+                      },
+                      "id": 2935,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "lValueRequested": false,
+                      "memberName": "ORDER_INACTIVE",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": null,
+                      "src": "9191:26:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                        "typeString": "enum Market.OrderStatus"
+                      }
+                    },
+                    "src": "9162:55:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
+                      "typeString": "enum Market.OrderStatus"
+                    }
+                  },
+                  "id": 2937,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9162:55:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 2943,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 2938,
+                          "name": "orders",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2162,
+                          "src": "9227:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
+                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
+                          }
+                        },
+                        "id": 2940,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 2939,
+                          "name": "_askID",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2584,
+                          "src": "9234:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "9227:14:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
+                          "typeString": "struct Market.Order storage ref"
+                        }
+                      },
+                      "id": 2941,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "dealID",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 2064,
+                      "src": "9227:21:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 2942,
+                      "name": "dealAmount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2151,
+                      "src": "9251:10:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "src": "9227:34:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "id": 2944,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9227:34:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "id": 2950,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "leftHandSide": {
+                      "argumentTypes": null,
+                      "expression": {
+                        "argumentTypes": null,
+                        "baseExpression": {
+                          "argumentTypes": null,
+                          "id": 2945,
+                          "name": "orders",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2162,
+                          "src": "9271:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
+                            "typeString": "mapping(uint256 => struct Market.Order storage ref)"
+                          }
+                        },
+                        "id": 2947,
+                        "indexExpression": {
+                          "argumentTypes": null,
+                          "id": 2946,
+                          "name": "_bidID",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 2586,
+                          "src": "9278:6:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_uint256",
+                            "typeString": "uint256"
+                          }
+                        },
+                        "isConstant": false,
+                        "isLValue": true,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "nodeType": "IndexAccess",
+                        "src": "9271:14:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
+                          "typeString": "struct Market.Order storage ref"
+                        }
+                      },
+                      "id": 2948,
+                      "isConstant": false,
+                      "isLValue": true,
+                      "isPure": false,
+                      "lValueRequested": true,
+                      "memberName": "dealID",
+                      "nodeType": "MemberAccess",
+                      "referencedDeclaration": 2064,
+                      "src": "9271:21:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "nodeType": "Assignment",
+                    "operator": "=",
+                    "rightHandSide": {
+                      "argumentTypes": null,
+                      "id": 2949,
+                      "name": "dealAmount",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2151,
+                      "src": "9295:10:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      }
+                    },
+                    "src": "9271:34:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_uint256",
+                      "typeString": "uint256"
+                    }
+                  },
+                  "id": 2951,
+                  "nodeType": "ExpressionStatement",
+                  "src": "9271:34:6"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 2953,
+                        "name": "_askID",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 2584,
+                        "src": "9334:6:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 2952,
+                      "name": "OrderUpdated",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2084,
+                      "src": "9321:12:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
+                        "typeString": "function (uint256)"
+                      }
+                    },
+                    "id": 2954,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "9321:20:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2955,
+                  "nodeType": "EmitStatement",
+                  "src": "9316:25:6"
+                },
+                {
+                  "eventCall": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "id": 2957,
+                        "name": "_bidID",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 2586,
+                        "src": "9369:6:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      ],
+                      "id": 2956,
+                      "name": "OrderUpdated",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 2084,
+                      "src": "9356:12:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
+                        "typeString": "function (uint256)"
+                      }
+                    },
+                    "id": 2958,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "9356:20:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2959,
+                  "nodeType": "EmitStatement",
+                  "src": "9351:25:6"
+                },
+                {
+                  "assignments": [
+                    2961
+                  ],
+                  "declarations": [
+                    {
+                      "constant": false,
+                      "id": 2961,
+                      "name": "startTime",
+                      "nodeType": "VariableDeclaration",
+                      "scope": 3021,
+                      "src": "9387:14:6",
+                      "stateVariable": false,
+                      "storageLocation": "default",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_uint256",
+                        "typeString": "uint256"
+                      },
+                      "typeName": {
+                        "id": 2960,
+                        "name": "uint",
+                        "nodeType": "ElementaryTypeName",
+                        "src": "9387:4:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_uint256",
+                          "typeString": "uint256"
+                        }
+                      },
+                      "value": null,
+                      "visibility": "internal"
+                    }
+                  ],
+                  "id": 2964,
+                  "initialValue": {
+                    "argumentTypes": null,
+                    "expression": {
+                      "argumentTypes": null,
+                      "id": 2962,
                       "name": "block",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11305,
-                      "src": "9303:5:7",
+                      "referencedDeclaration": 11589,
+                      "src": "9404:5:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_block",
                         "typeString": "block"
                       }
                     },
-                    "id": 3127,
+                    "id": 2963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14551,27 +14692,27 @@
                     "memberName": "timestamp",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "9303:15:7",
+                    "src": "9404:15:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9286:32:7"
+                  "src": "9387:32:6"
                 },
                 {
                   "assignments": [
-                    3130
+                    2966
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3130,
+                      "id": 2966,
                       "name": "endTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9328:12:7",
+                      "scope": 3021,
+                      "src": "9429:12:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -14579,10 +14720,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3129,
+                        "id": 2965,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9328:4:7",
+                        "src": "9429:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14592,18 +14733,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3132,
+                  "id": 2968,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 3131,
+                    "id": 2967,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "9343:1:7",
+                    "src": "9444:1:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -14612,7 +14753,7 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9328:16:7"
+                  "src": "9429:16:6"
                 },
                 {
                   "condition": {
@@ -14621,7 +14762,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3136,
+                    "id": 2972,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14630,26 +14771,26 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3133,
+                        "id": 2969,
                         "name": "ask",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2768,
-                        "src": "9419:3:7",
+                        "referencedDeclaration": 2592,
+                        "src": "9520:3:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                           "typeString": "struct Market.Order memory"
                         }
                       },
-                      "id": 3134,
+                      "id": 2970,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2222,
-                      "src": "9419:12:7",
+                      "referencedDeclaration": 2046,
+                      "src": "9520:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -14660,14 +14801,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3135,
+                      "id": 2971,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9435:1:7",
+                      "src": "9536:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -14675,37 +14816,37 @@
                       },
                       "value": "0"
                     },
-                    "src": "9419:17:7",
+                    "src": "9520:17:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3146,
+                  "id": 2982,
                   "nodeType": "IfStatement",
-                  "src": "9415:85:7",
+                  "src": "9516:85:6",
                   "trueBody": {
-                    "id": 3145,
+                    "id": 2981,
                     "nodeType": "Block",
-                    "src": "9438:62:7",
+                    "src": "9539:62:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3143,
+                          "id": 2979,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3137,
+                            "id": 2973,
                             "name": "endTime",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3130,
-                            "src": "9452:7:7",
+                            "referencedDeclaration": 2966,
+                            "src": "9553:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14720,26 +14861,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3140,
+                                  "id": 2976,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "9476:3:7",
+                                  "referencedDeclaration": 2598,
+                                  "src": "9577:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3141,
+                                "id": 2977,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "duration",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2222,
-                                "src": "9476:12:7",
+                                "referencedDeclaration": 2046,
+                                "src": "9577:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -14755,32 +14896,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3138,
+                                "id": 2974,
                                 "name": "startTime",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3125,
-                                "src": "9462:9:7",
+                                "referencedDeclaration": 2961,
+                                "src": "9563:9:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3139,
+                              "id": 2975,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10795,
-                              "src": "9462:13:7",
+                              "referencedDeclaration": 11079,
+                              "src": "9563:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3142,
+                            "id": 2978,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14788,37 +14929,37 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "9462:27:7",
+                            "src": "9563:27:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "9452:37:7",
+                          "src": "9553:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3144,
+                        "id": 2980,
                         "nodeType": "ExpressionStatement",
-                        "src": "9452:37:7"
+                        "src": "9553:37:6"
                       }
                     ]
                   }
                 },
                 {
                   "assignments": [
-                    3148
+                    2984
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3148,
+                      "id": 2984,
                       "name": "blockedBalance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9509:19:7",
+                      "scope": 3021,
+                      "src": "9610:19:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -14826,10 +14967,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3147,
+                        "id": 2983,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9509:4:7",
+                        "src": "9610:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14839,43 +14980,43 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3151,
+                  "id": 2987,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3149,
+                      "id": 2985,
                       "name": "bid",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2774,
-                      "src": "9531:3:7",
+                      "referencedDeclaration": 2598,
+                      "src": "9632:3:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "id": 3150,
+                    "id": 2986,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
                     "lValueRequested": false,
                     "memberName": "frozenSum",
                     "nodeType": "MemberAccess",
-                    "referencedDeclaration": 2238,
-                    "src": "9531:13:7",
+                    "referencedDeclaration": 2062,
+                    "src": "9632:13:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9509:35:7"
+                  "src": "9610:35:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3178,
+                    "id": 3014,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14884,26 +15025,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 3152,
+                        "id": 2988,
                         "name": "deals",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2342,
-                        "src": "9554:5:7",
+                        "referencedDeclaration": 2166,
+                        "src": "9655:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                         }
                       },
-                      "id": 3154,
+                      "id": 2990,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 3153,
+                        "id": 2989,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2327,
-                        "src": "9560:10:7",
+                        "referencedDeclaration": 2151,
+                        "src": "9661:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -14914,9 +15055,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9554:17:7",
+                      "src": "9655:17:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                         "typeString": "struct Market.Deal storage ref"
                       }
                     },
@@ -14929,26 +15070,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3156,
+                            "id": 2992,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9579:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9693:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3157,
+                          "id": 2993,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "benchmarks",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2236,
-                          "src": "9579:14:7",
+                          "referencedDeclaration": 2060,
+                          "src": "9693:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
@@ -14958,26 +15099,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3158,
+                            "id": 2994,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9595:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9721:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3159,
+                          "id": 2995,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "9595:10:7",
+                          "referencedDeclaration": 2042,
+                          "src": "9721:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14987,26 +15128,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3160,
+                            "id": 2996,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "9607:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "9745:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3161,
+                          "id": 2997,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "9607:10:7",
+                          "referencedDeclaration": 2042,
+                          "src": "9745:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15014,12 +15155,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3162,
+                          "id": 2998,
                           "name": "master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3080,
-                          "src": "9619:6:7",
+                          "referencedDeclaration": 2916,
+                          "src": "9769:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15027,12 +15168,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3163,
+                          "id": 2999,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9627:6:7",
+                          "referencedDeclaration": 2584,
+                          "src": "9789:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15040,12 +15181,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3164,
+                          "id": 3000,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9635:6:7",
+                          "referencedDeclaration": 2586,
+                          "src": "9809:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15055,26 +15196,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3165,
+                            "id": 3001,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "9643:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "9829:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3166,
+                          "id": 3002,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "9643:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "9829:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15084,26 +15225,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3167,
+                            "id": 3003,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9657:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9855:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3168,
+                          "id": 3004,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "9657:9:7",
+                          "referencedDeclaration": 2048,
+                          "src": "9855:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15111,12 +15252,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3169,
+                          "id": 3005,
                           "name": "startTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3125,
-                          "src": "9668:9:7",
+                          "referencedDeclaration": 2961,
+                          "src": "9878:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15124,12 +15265,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3170,
+                          "id": 3006,
                           "name": "endTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3130,
-                          "src": "9679:7:7",
+                          "referencedDeclaration": 2966,
+                          "src": "9901:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15139,18 +15280,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3171,
+                            "id": 3007,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "9688:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "9922:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 3172,
+                          "id": 3008,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -15158,20 +15299,20 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9688:26:7",
+                          "src": "9922:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3173,
+                          "id": 3009,
                           "name": "blockedBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3148,
-                          "src": "9716:14:7",
+                          "referencedDeclaration": 2984,
+                          "src": "9962:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15180,14 +15321,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3174,
+                          "id": 3010,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9732:1:7",
+                          "src": "9990:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -15199,18 +15340,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3175,
+                            "id": 3011,
                             "name": "block",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11305,
-                            "src": "9735:5:7",
+                            "referencedDeclaration": 11589,
+                            "src": "10005:5:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_block",
                               "typeString": "block"
                             }
                           },
-                          "id": 3176,
+                          "id": 3012,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15218,7 +15359,7 @@
                           "memberName": "timestamp",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9735:15:7",
+                          "src": "10005:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15268,7 +15409,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           },
                           {
@@ -15284,18 +15425,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 3155,
+                        "id": 2991,
                         "name": "Deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2212,
-                        "src": "9574:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "9675:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Deal_$2212_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Deal_$2036_storage_ptr_$",
                           "typeString": "type(struct Market.Deal storage pointer)"
                         }
                       },
-                      "id": 3177,
+                      "id": 3013,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -15303,21 +15444,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "9574:177:7",
+                      "src": "9675:355:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory",
                         "typeString": "struct Market.Deal memory"
                       }
                     },
-                    "src": "9554:197:7",
+                    "src": "9655:375:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
-                  "id": 3179,
+                  "id": 3015,
                   "nodeType": "ExpressionStatement",
-                  "src": "9554:197:7"
+                  "src": "9655:375:6"
                 },
                 {
                   "eventCall": {
@@ -15325,12 +15466,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3181,
+                        "id": 3017,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2327,
-                        "src": "9777:10:7",
+                        "referencedDeclaration": 2151,
+                        "src": "10056:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -15344,18 +15485,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3180,
+                      "id": 3016,
                       "name": "DealOpened",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2264,
-                      "src": "9766:10:7",
+                      "referencedDeclaration": 2088,
+                      "src": "10045:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3182,
+                    "id": 3018,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15363,57 +15504,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9766:22:7",
+                    "src": "10045:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3183,
+                  "id": 3019,
                   "nodeType": "EmitStatement",
-                  "src": "9761:27:7"
+                  "src": "10040:27:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3185,
+            "id": 3021,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2765,
+                "id": 2589,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2764,
+                  "id": 2588,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "6793:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "6885:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6793:13:7"
+                "src": "6885:13:6"
               }
             ],
             "name": "OpenDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2763,
+              "id": 2587,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2760,
+                  "id": 2584,
                   "name": "_askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3185,
-                  "src": "6767:11:7",
+                  "scope": 3021,
+                  "src": "6852:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15421,10 +15562,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2759,
+                    "id": 2583,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6767:4:7",
+                    "src": "6852:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15435,11 +15576,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2762,
+                  "id": 2586,
                   "name": "_bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3185,
-                  "src": "6780:11:7",
+                  "scope": 3021,
+                  "src": "6865:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15447,10 +15588,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2761,
+                    "id": 2585,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6780:4:7",
+                    "src": "6865:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15460,26 +15601,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6766:26:7"
+              "src": "6851:26:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2766,
+              "id": 2590,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6814:0:7"
+              "src": "6899:0:6"
             },
-            "scope": 5229,
-            "src": "6749:3046:7",
+            "scope": 5065,
+            "src": "6834:3240:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3275,
+              "id": 3111,
               "nodeType": "Block",
-              "src": "9883:573:7",
+              "src": "10162:573:6",
               "statements": [
                 {
                   "expression": {
@@ -15491,10 +15632,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 3201,
+                            "id": 3037,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15505,26 +15646,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3195,
+                                  "id": 3031,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "9902:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10181:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3197,
+                                "id": 3033,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3196,
+                                  "id": 3032,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "9908:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10187:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15535,23 +15676,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9902:13:7",
+                                "src": "10181:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3198,
+                              "id": 3034,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2205,
-                              "src": "9902:20:7",
+                              "referencedDeclaration": 2029,
+                              "src": "10181:20:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -15561,18 +15702,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3199,
+                                "id": 3035,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2164,
-                                "src": "9926:10:7",
+                                "referencedDeclaration": 1988,
+                                "src": "10205:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 3200,
+                              "id": 3036,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -15580,27 +15721,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9926:26:7",
+                              "src": "10205:26:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "9902:50:7",
+                            "src": "10181:50:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 3202,
+                        "id": 3038,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "9901:52:7",
+                        "src": "10180:52:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15614,21 +15755,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3194,
+                      "id": 3030,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "9893:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "10172:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3203,
+                    "id": 3039,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15636,15 +15777,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9893:61:7",
+                    "src": "10172:61:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3204,
+                  "id": 3040,
                   "nodeType": "ExpressionStatement",
-                  "src": "9893:61:7"
+                  "src": "10172:61:6"
                 },
                 {
                   "expression": {
@@ -15656,7 +15797,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3228,
+                        "id": 3064,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15667,7 +15808,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3220,
+                          "id": 3056,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15678,7 +15819,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3212,
+                            "id": 3048,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15687,18 +15828,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3206,
+                                "id": 3042,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "9972:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "10251:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3207,
+                              "id": 3043,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -15706,7 +15847,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9972:10:7",
+                              "src": "10251:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -15720,26 +15861,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3208,
+                                  "id": 3044,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "9986:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10265:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3210,
+                                "id": 3046,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3209,
+                                  "id": 3045,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "9992:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10271:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15750,27 +15891,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9986:13:7",
+                                "src": "10265:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3211,
+                              "id": 3047,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "9986:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "10265:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "9972:38:7",
+                            "src": "10251:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -15784,7 +15925,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3219,
+                            "id": 3055,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15793,18 +15934,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3213,
+                                "id": 3049,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10014:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "10293:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3214,
+                              "id": 3050,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -15812,7 +15953,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10014:10:7",
+                              "src": "10293:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -15826,26 +15967,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3215,
+                                  "id": 3051,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10028:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10307:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3217,
+                                "id": 3053,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3216,
+                                  "id": 3052,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "10034:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10313:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -15856,33 +15997,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10028:13:7",
+                                "src": "10307:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3218,
+                              "id": 3054,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "10028:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "10307:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10014:38:7",
+                            "src": "10293:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "9972:80:7",
+                          "src": "10251:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -15896,7 +16037,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3227,
+                          "id": 3063,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15905,18 +16046,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3221,
+                              "id": 3057,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "10056:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "10335:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3222,
+                            "id": 3058,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15924,7 +16065,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10056:10:7",
+                            "src": "10335:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -15938,26 +16079,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3223,
+                                "id": 3059,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "10070:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "10349:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3225,
+                              "id": 3061,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3224,
+                                "id": 3060,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3187,
-                                "src": "10076:6:7",
+                                "referencedDeclaration": 3023,
+                                "src": "10355:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -15968,33 +16109,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10070:13:7",
+                              "src": "10349:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3226,
+                            "id": 3062,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "10070:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "10349:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10056:36:7",
+                          "src": "10335:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "9972:120:7",
+                        "src": "10251:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -16008,21 +16149,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3205,
+                      "id": 3041,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "9964:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "10243:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3229,
+                    "id": 3065,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16030,15 +16171,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9964:129:7",
+                    "src": "10243:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3230,
+                  "id": 3066,
                   "nodeType": "ExpressionStatement",
-                  "src": "9964:129:7"
+                  "src": "10243:129:6"
                 },
                 {
                   "condition": {
@@ -16047,7 +16188,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3243,
+                    "id": 3079,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16056,18 +16197,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3231,
+                        "id": 3067,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "10108:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "10387:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3232,
+                      "id": 3068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16075,7 +16216,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "10108:15:7",
+                      "src": "10387:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -16092,26 +16233,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3238,
+                              "id": 3074,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10155:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "10434:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3240,
+                            "id": 3076,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3239,
+                              "id": 3075,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3187,
-                              "src": "10161:6:7",
+                              "referencedDeclaration": 3023,
+                              "src": "10440:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -16122,21 +16263,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10155:13:7",
+                            "src": "10434:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3241,
+                          "id": 3077,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2197,
-                          "src": "10155:22:7",
+                          "referencedDeclaration": 2021,
+                          "src": "10434:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -16156,26 +16297,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3233,
+                              "id": 3069,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10127:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "10406:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3235,
+                            "id": 3071,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3234,
+                              "id": 3070,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3187,
-                              "src": "10133:6:7",
+                              "referencedDeclaration": 3023,
+                              "src": "10412:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -16186,41 +16327,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10127:13:7",
+                            "src": "10406:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3236,
+                          "id": 3072,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2201,
-                          "src": "10127:23:7",
+                          "referencedDeclaration": 2025,
+                          "src": "10406:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3237,
+                        "id": 3073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "10127:27:7",
+                        "referencedDeclaration": 11079,
+                        "src": "10406:27:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3242,
+                      "id": 3078,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16228,26 +16369,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "10127:51:7",
+                      "src": "10406:51:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10108:70:7",
+                    "src": "10387:70:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3255,
+                  "id": 3091,
                   "nodeType": "IfStatement",
-                  "src": "10104:177:7",
+                  "src": "10383:177:6",
                   "trueBody": {
-                    "id": 3254,
+                    "id": 3090,
                     "nodeType": "Block",
-                    "src": "10180:101:7",
+                    "src": "10459:101:6",
                     "statements": [
                       {
                         "expression": {
@@ -16259,7 +16400,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 3251,
+                              "id": 3087,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -16270,26 +16411,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3245,
+                                    "id": 3081,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "10231:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "10510:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3247,
+                                  "id": 3083,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3246,
+                                    "id": 3082,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3187,
-                                    "src": "10237:6:7",
+                                    "referencedDeclaration": 3023,
+                                    "src": "10516:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -16300,21 +16441,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "10231:13:7",
+                                  "src": "10510:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3248,
+                                "id": 3084,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "10231:24:7",
+                                "referencedDeclaration": 2013,
+                                "src": "10510:24:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -16326,18 +16467,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3249,
+                                  "id": 3085,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "10259:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "10538:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 3250,
+                                "id": 3086,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -16345,13 +16486,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "10259:10:7",
+                                "src": "10538:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "10231:38:7",
+                              "src": "10510:38:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -16365,21 +16506,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3244,
+                            "id": 3080,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "10223:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "10502:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3252,
+                          "id": 3088,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -16387,15 +16528,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10223:47:7",
+                          "src": "10502:47:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3253,
+                        "id": 3089,
                         "nodeType": "ExpressionStatement",
-                        "src": "10223:47:7"
+                        "src": "10502:47:6"
                       }
                     ]
                   }
@@ -16406,12 +16547,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3257,
+                        "id": 3093,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10305:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10584:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16419,14 +16560,14 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3258,
+                        "id": 3094,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3189,
-                        "src": "10313:11:7",
+                        "referencedDeclaration": 3025,
+                        "src": "10592:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       }
@@ -16438,22 +16579,22 @@
                           "typeString": "uint256"
                         },
                         {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       ],
-                      "id": 3256,
+                      "id": 3092,
                       "name": "AddToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4931,
-                      "src": "10290:14:7",
+                      "referencedDeclaration": 4767,
+                      "src": "10569:14:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2182_$returns$__$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2006_$returns$__$",
                         "typeString": "function (uint256,enum Market.BlacklistPerson)"
                       }
                     },
-                    "id": 3259,
+                    "id": 3095,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16461,15 +16602,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10290:35:7",
+                    "src": "10569:35:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3260,
+                  "id": 3096,
                   "nodeType": "ExpressionStatement",
-                  "src": "10290:35:7"
+                  "src": "10569:35:6"
                 },
                 {
                   "expression": {
@@ -16477,12 +16618,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3262,
+                        "id": 3098,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10348:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10627:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16496,18 +16637,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3261,
+                      "id": 3097,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4642,
-                      "src": "10335:12:7",
+                      "referencedDeclaration": 4478,
+                      "src": "10614:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3263,
+                    "id": 3099,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16515,15 +16656,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10335:20:7",
+                    "src": "10614:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3264,
+                  "id": 3100,
                   "nodeType": "ExpressionStatement",
-                  "src": "10335:20:7"
+                  "src": "10614:20:6"
                 },
                 {
                   "expression": {
@@ -16531,12 +16672,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3266,
+                        "id": 3102,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10383:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10662:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16550,18 +16691,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3265,
+                      "id": 3101,
                       "name": "InternalCloseDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5004,
-                      "src": "10365:17:7",
+                      "referencedDeclaration": 4840,
+                      "src": "10644:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3267,
+                    "id": 3103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16569,15 +16710,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10365:25:7",
+                    "src": "10644:25:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3268,
+                  "id": 3104,
                   "nodeType": "ExpressionStatement",
-                  "src": "10365:25:7"
+                  "src": "10644:25:6"
                 },
                 {
                   "expression": {
@@ -16585,12 +16726,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3270,
+                        "id": 3106,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10421:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10700:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16604,18 +16745,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3269,
+                      "id": 3105,
                       "name": "RefundRemainingFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4828,
-                      "src": "10400:20:7",
+                      "referencedDeclaration": 4664,
+                      "src": "10679:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3271,
+                    "id": 3107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16623,28 +16764,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10400:28:7",
+                    "src": "10679:28:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3272,
+                  "id": 3108,
                   "nodeType": "ExpressionStatement",
-                  "src": "10400:28:7"
+                  "src": "10679:28:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3273,
+                    "id": 3109,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10445:4:7",
+                    "src": "10724:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -16652,15 +16793,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3193,
-                  "id": 3274,
+                  "functionReturnParameters": 3029,
+                  "id": 3110,
                   "nodeType": "Return",
-                  "src": "10438:11:7"
+                  "src": "10717:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3276,
+            "id": 3112,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -16668,16 +16809,16 @@
             "name": "CloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3190,
+              "id": 3026,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3187,
+                  "id": 3023,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9820:11:7",
+                  "scope": 3112,
+                  "src": "10099:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16685,10 +16826,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3186,
+                    "id": 3022,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9820:4:7",
+                    "src": "10099:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16699,26 +16840,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 3189,
+                  "id": 3025,
                   "name": "blacklisted",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9833:27:7",
+                  "scope": 3112,
+                  "src": "10112:27:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 3188,
+                    "id": 3024,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2182,
-                    "src": "9833:15:7",
+                    "referencedDeclaration": 2006,
+                    "src": "10112:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -16726,20 +16867,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9819:42:7"
+              "src": "10098:42:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3193,
+              "id": 3029,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3192,
+                  "id": 3028,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9878:4:7",
+                  "scope": 3112,
+                  "src": "10157:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16747,10 +16888,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3191,
+                    "id": 3027,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9878:4:7",
+                    "src": "10157:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -16760,19 +16901,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9877:6:7"
+              "src": "10156:6:6"
             },
-            "scope": 5229,
-            "src": "9801:655:7",
+            "scope": 5065,
+            "src": "10080:655:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3293,
+              "id": 3129,
               "nodeType": "Block",
-              "src": "10510:98:7",
+              "src": "10789:98:6",
               "statements": [
                 {
                   "expression": {
@@ -16780,12 +16921,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3284,
+                        "id": 3120,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3278,
-                        "src": "10533:6:7",
+                        "referencedDeclaration": 3114,
+                        "src": "10812:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16799,18 +16940,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3283,
+                      "id": 3119,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4642,
-                      "src": "10520:12:7",
+                      "referencedDeclaration": 4478,
+                      "src": "10799:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3285,
+                    "id": 3121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16818,15 +16959,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10520:20:7",
+                    "src": "10799:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3286,
+                  "id": 3122,
                   "nodeType": "ExpressionStatement",
-                  "src": "10520:20:7"
+                  "src": "10799:20:6"
                 },
                 {
                   "expression": {
@@ -16834,12 +16975,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3288,
+                        "id": 3124,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3278,
-                        "src": "10573:6:7",
+                        "referencedDeclaration": 3114,
+                        "src": "10852:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16853,18 +16994,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3287,
+                      "id": 3123,
                       "name": "ReserveNextPeriodFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4790,
-                      "src": "10550:22:7",
+                      "referencedDeclaration": 4626,
+                      "src": "10829:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3289,
+                    "id": 3125,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16872,28 +17013,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10550:30:7",
+                    "src": "10829:30:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3290,
+                  "id": 3126,
                   "nodeType": "ExpressionStatement",
-                  "src": "10550:30:7"
+                  "src": "10829:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3291,
+                    "id": 3127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10597:4:7",
+                    "src": "10876:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -16901,15 +17042,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3282,
-                  "id": 3292,
+                  "functionReturnParameters": 3118,
+                  "id": 3128,
                   "nodeType": "Return",
-                  "src": "10590:11:7"
+                  "src": "10869:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3294,
+            "id": 3130,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -16917,16 +17058,16 @@
             "name": "Bill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3279,
+              "id": 3115,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3278,
+                  "id": 3114,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3294,
-                  "src": "10476:11:7",
+                  "scope": 3130,
+                  "src": "10755:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16934,10 +17075,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3277,
+                    "id": 3113,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10476:4:7",
+                    "src": "10755:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16947,20 +17088,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10475:13:7"
+              "src": "10754:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3282,
+              "id": 3118,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3281,
+                  "id": 3117,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3294,
-                  "src": "10505:4:7",
+                  "scope": 3130,
+                  "src": "10784:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16968,10 +17109,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3280,
+                    "id": 3116,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10505:4:7",
+                    "src": "10784:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -16981,19 +17122,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10504:6:7"
+              "src": "10783:6:6"
             },
-            "scope": 5229,
-            "src": "10462:146:7",
+            "scope": 5065,
+            "src": "10741:146:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3787,
+              "id": 3623,
               "nodeType": "Block",
-              "src": "10727:3974:7",
+              "src": "11006:3974:6",
               "statements": [
                 {
                   "expression": {
@@ -17005,7 +17146,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3328,
+                        "id": 3164,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -17016,7 +17157,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3320,
+                          "id": 3156,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17027,7 +17168,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3312,
+                            "id": 3148,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17036,18 +17177,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3306,
+                                "id": 3142,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10745:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "11024:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3307,
+                              "id": 3143,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -17055,7 +17196,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10745:10:7",
+                              "src": "11024:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -17069,26 +17210,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3308,
+                                  "id": 3144,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10759:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "11038:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3310,
+                                "id": 3146,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3309,
+                                  "id": 3145,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "10765:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11044:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -17099,27 +17240,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10759:13:7",
+                                "src": "11038:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3311,
+                              "id": 3147,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "10759:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "11038:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10745:38:7",
+                            "src": "11024:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -17133,7 +17274,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3319,
+                            "id": 3155,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17142,18 +17283,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3313,
+                                "id": 3149,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10787:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "11066:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3314,
+                              "id": 3150,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -17161,7 +17302,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10787:10:7",
+                              "src": "11066:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -17175,26 +17316,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3315,
+                                  "id": 3151,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10801:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "11080:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3317,
+                                "id": 3153,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3316,
+                                  "id": 3152,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "10807:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11086:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -17205,33 +17346,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10801:13:7",
+                                "src": "11080:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3318,
+                              "id": 3154,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2191,
-                              "src": "10801:22:7",
+                              "referencedDeclaration": 2015,
+                              "src": "11080:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10787:36:7",
+                            "src": "11066:36:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "10745:78:7",
+                          "src": "11024:78:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -17245,7 +17386,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3327,
+                          "id": 3163,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17254,18 +17395,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3321,
+                              "id": 3157,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "10827:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "11106:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3322,
+                            "id": 3158,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17273,7 +17414,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10827:10:7",
+                            "src": "11106:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -17287,26 +17428,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3323,
+                                "id": 3159,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "10841:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "11120:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3325,
+                              "id": 3161,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3324,
+                                "id": 3160,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "10847:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "11126:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17317,33 +17458,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10841:13:7",
+                              "src": "11120:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3326,
+                            "id": 3162,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "supplierID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2187,
-                            "src": "10841:24:7",
+                            "referencedDeclaration": 2011,
+                            "src": "11120:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10827:38:7",
+                          "src": "11106:38:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10745:120:7",
+                        "src": "11024:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -17357,21 +17498,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3305,
+                      "id": 3141,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "10737:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "11016:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3329,
+                    "id": 3165,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17379,15 +17520,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10737:129:7",
+                    "src": "11016:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3330,
+                  "id": 3166,
                   "nodeType": "ExpressionStatement",
-                  "src": "10737:129:7"
+                  "src": "11016:129:6"
                 },
                 {
                   "expression": {
@@ -17396,10 +17537,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 3338,
+                        "id": 3174,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -17410,26 +17551,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3332,
+                              "id": 3168,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10884:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "11163:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3334,
+                            "id": 3170,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3333,
+                              "id": 3169,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "10890:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "11169:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -17440,23 +17581,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10884:13:7",
+                            "src": "11163:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3335,
+                          "id": 3171,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2205,
-                          "src": "10884:20:7",
+                          "referencedDeclaration": 2029,
+                          "src": "11163:20:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -17466,18 +17607,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3336,
+                            "id": 3172,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "10908:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "11187:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 3337,
+                          "id": 3173,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -17485,13 +17626,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "10908:26:7",
+                          "src": "11187:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "10884:50:7",
+                        "src": "11163:50:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -17505,21 +17646,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3331,
+                      "id": 3167,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "10876:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "11155:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3339,
+                    "id": 3175,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17527,15 +17668,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10876:59:7",
+                    "src": "11155:59:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3340,
+                  "id": 3176,
                   "nodeType": "ExpressionStatement",
-                  "src": "10876:59:7"
+                  "src": "11155:59:6"
                 },
                 {
                   "condition": {
@@ -17543,12 +17684,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3342,
+                        "id": 3178,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3296,
-                        "src": "10957:6:7",
+                        "referencedDeclaration": 3132,
+                        "src": "11236:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -17562,18 +17703,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3341,
+                      "id": 3177,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4843,
-                      "src": "10950:6:7",
+                      "referencedDeclaration": 4679,
+                      "src": "11229:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 3343,
+                    "id": 3179,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17581,20 +17722,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10950:14:7",
+                    "src": "11229:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3351,
+                  "id": 3187,
                   "nodeType": "IfStatement",
-                  "src": "10946:70:7",
+                  "src": "11225:70:6",
                   "trueBody": {
-                    "id": 3350,
+                    "id": 3186,
                     "nodeType": "Block",
-                    "src": "10966:50:7",
+                    "src": "11245:50:6",
                     "statements": [
                       {
                         "expression": {
@@ -17606,19 +17747,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3347,
+                              "id": 3183,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 3345,
+                                "id": 3181,
                                 "name": "newDuration",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3300,
-                                "src": "10988:11:7",
+                                "referencedDeclaration": 3136,
+                                "src": "11267:11:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17629,14 +17770,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 3346,
+                                "id": 3182,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11003:1:7",
+                                "src": "11282:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -17644,7 +17785,7 @@
                                 },
                                 "value": "0"
                               },
-                              "src": "10988:16:7",
+                              "src": "11267:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -17658,21 +17799,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3344,
+                            "id": 3180,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "10980:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "11259:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3348,
+                          "id": 3184,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -17680,15 +17821,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10980:25:7",
+                          "src": "11259:25:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3349,
+                        "id": 3185,
                         "nodeType": "ExpressionStatement",
-                        "src": "10980:25:7"
+                        "src": "11259:25:6"
                       }
                     ]
                   }
@@ -17696,19 +17837,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3357,
+                    "id": 3193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3352,
+                      "id": 3188,
                       "name": "requestsAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2330,
-                      "src": "11026:14:7",
+                      "referencedDeclaration": 2154,
+                      "src": "11305:14:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -17722,14 +17863,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 3355,
+                          "id": 3191,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "11062:1:7",
+                          "src": "11341:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -17747,32 +17888,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3353,
+                          "id": 3189,
                           "name": "requestsAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2330,
-                          "src": "11043:14:7",
+                          "referencedDeclaration": 2154,
+                          "src": "11322:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3354,
+                        "id": 3190,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "11043:18:7",
+                        "referencedDeclaration": 11079,
+                        "src": "11322:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3356,
+                      "id": 3192,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17780,47 +17921,47 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11043:21:7",
+                      "src": "11322:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11026:38:7",
+                    "src": "11305:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3358,
+                  "id": 3194,
                   "nodeType": "ExpressionStatement",
-                  "src": "11026:38:7"
+                  "src": "11305:38:6"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3360,
+                      "id": 3196,
                       "name": "requestType",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3788,
-                      "src": "11075:21:7",
+                      "scope": 3624,
+                      "src": "11354:21:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3359,
+                        "id": 3195,
                         "name": "OrderType",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2168,
-                        "src": "11075:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "11354:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -17828,10 +17969,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3361,
+                  "id": 3197,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11075:21:7"
+                  "src": "11354:21:6"
                 },
                 {
                   "condition": {
@@ -17840,7 +17981,7 @@
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "id": 3368,
+                    "id": 3204,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17849,18 +17990,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3362,
+                        "id": 3198,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "11111:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "11390:3:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 3363,
+                      "id": 3199,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17868,7 +18009,7 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11111:10:7",
+                      "src": "11390:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -17882,26 +18023,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3364,
+                          "id": 3200,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "11125:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "11404:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3366,
+                        "id": 3202,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3365,
+                          "id": 3201,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "11131:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "11410:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -17912,55 +18053,55 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11125:13:7",
+                        "src": "11404:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3367,
+                      "id": 3203,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "consumerID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2189,
-                      "src": "11125:24:7",
+                      "referencedDeclaration": 2013,
+                      "src": "11404:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "11111:38:7",
+                    "src": "11390:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 3380,
+                    "id": 3216,
                     "nodeType": "Block",
-                    "src": "11215:58:7",
+                    "src": "11494:58:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3378,
+                          "id": 3214,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3375,
+                            "id": 3211,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3360,
-                            "src": "11229:11:7",
+                            "referencedDeclaration": 3196,
+                            "src": "11508:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -17970,18 +18111,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3376,
+                              "id": 3212,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2168,
-                              "src": "11243:9:7",
+                              "referencedDeclaration": 1992,
+                              "src": "11522:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 3377,
+                            "id": 3213,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -17989,50 +18130,50 @@
                             "memberName": "ORDER_ASK",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11243:19:7",
+                            "src": "11522:19:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11229:33:7",
+                          "src": "11508:33:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 3379,
+                        "id": 3215,
                         "nodeType": "ExpressionStatement",
-                        "src": "11229:33:7"
+                        "src": "11508:33:6"
                       }
                     ]
                   },
-                  "id": 3381,
+                  "id": 3217,
                   "nodeType": "IfStatement",
-                  "src": "11107:166:7",
+                  "src": "11386:166:6",
                   "trueBody": {
-                    "id": 3374,
+                    "id": 3210,
                     "nodeType": "Block",
-                    "src": "11151:58:7",
+                    "src": "11430:58:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3372,
+                          "id": 3208,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3369,
+                            "id": 3205,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3360,
-                            "src": "11165:11:7",
+                            "referencedDeclaration": 3196,
+                            "src": "11444:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -18042,18 +18183,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3370,
+                              "id": 3206,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2168,
-                              "src": "11179:9:7",
+                              "referencedDeclaration": 1992,
+                              "src": "11458:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 3371,
+                            "id": 3207,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -18061,21 +18202,21 @@
                             "memberName": "ORDER_BID",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11179:19:7",
+                            "src": "11458:19:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11165:33:7",
+                          "src": "11444:33:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 3373,
+                        "id": 3209,
                         "nodeType": "ExpressionStatement",
-                        "src": "11165:33:7"
+                        "src": "11444:33:6"
                       }
                     ]
                   }
@@ -18083,7 +18224,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3393,
+                    "id": 3229,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18092,26 +18233,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 3382,
+                        "id": 3218,
                         "name": "requests",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2351,
-                        "src": "11283:8:7",
+                        "referencedDeclaration": 2175,
+                        "src": "11562:8:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                         }
                       },
-                      "id": 3384,
+                      "id": 3220,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 3383,
+                        "id": 3219,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2330,
-                        "src": "11292:14:7",
+                        "referencedDeclaration": 2154,
+                        "src": "11571:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18122,9 +18263,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "11283:24:7",
+                      "src": "11562:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                         "typeString": "struct Market.ChangeRequest storage ref"
                       }
                     },
@@ -18135,12 +18276,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3386,
+                          "id": 3222,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "11324:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "11603:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18148,25 +18289,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3387,
+                          "id": 3223,
                           "name": "requestType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3360,
-                          "src": "11332:11:7",
+                          "referencedDeclaration": 3196,
+                          "src": "11611:11:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3388,
+                          "id": 3224,
                           "name": "newPrice",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3298,
-                          "src": "11345:8:7",
+                          "referencedDeclaration": 3134,
+                          "src": "11624:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18174,12 +18315,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3389,
+                          "id": 3225,
                           "name": "newDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3300,
-                          "src": "11355:11:7",
+                          "referencedDeclaration": 3136,
+                          "src": "11634:11:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18189,18 +18330,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3390,
+                            "id": 3226,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2178,
-                            "src": "11368:13:7",
+                            "referencedDeclaration": 2002,
+                            "src": "11647:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 3391,
+                          "id": 3227,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -18208,9 +18349,9 @@
                           "memberName": "REQUEST_CREATED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "11368:29:7",
+                          "src": "11647:29:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         }
@@ -18222,7 +18363,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           },
                           {
@@ -18234,22 +18375,22 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         ],
-                        "id": 3385,
+                        "id": 3221,
                         "name": "ChangeRequest",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2252,
-                        "src": "11310:13:7",
+                        "referencedDeclaration": 2076,
+                        "src": "11589:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2252_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2076_storage_ptr_$",
                           "typeString": "type(struct Market.ChangeRequest storage pointer)"
                         }
                       },
-                      "id": 3392,
+                      "id": 3228,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -18257,21 +18398,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11310:88:7",
+                      "src": "11589:88:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory",
                         "typeString": "struct Market.ChangeRequest memory"
                       }
                     },
-                    "src": "11283:115:7",
+                    "src": "11562:115:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
-                  "id": 3394,
+                  "id": 3230,
                   "nodeType": "ExpressionStatement",
-                  "src": "11283:115:7"
+                  "src": "11562:115:6"
                 },
                 {
                   "eventCall": {
@@ -18279,12 +18420,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3396,
+                        "id": 3232,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2330,
-                        "src": "11434:14:7",
+                        "referencedDeclaration": 2154,
+                        "src": "11713:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18298,18 +18439,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3395,
+                      "id": 3231,
                       "name": "DealChangeRequestSet",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2278,
-                      "src": "11413:20:7",
+                      "referencedDeclaration": 2102,
+                      "src": "11692:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3397,
+                    "id": 3233,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18317,38 +18458,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11413:36:7",
+                    "src": "11692:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3398,
+                  "id": 3234,
                   "nodeType": "EmitStatement",
-                  "src": "11408:41:7"
+                  "src": "11687:41:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3402,
+                    "id": 3238,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3399,
+                      "id": 3235,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3360,
-                      "src": "11464:11:7",
+                      "referencedDeclaration": 3196,
+                      "src": "11743:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -18358,18 +18499,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3400,
+                        "id": 3236,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "11479:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "11758:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3401,
+                      "id": 3237,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -18377,26 +18518,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11479:19:7",
+                      "src": "11758:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "11464:34:7",
+                    "src": "11743:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3603,
+                  "id": 3439,
                   "nodeType": "IfStatement",
-                  "src": "11460:1719:7",
+                  "src": "11739:1719:6",
                   "trueBody": {
-                    "id": 3602,
+                    "id": 3438,
                     "nodeType": "Block",
-                    "src": "11500:1679:7",
+                    "src": "11779:1679:6",
                     "statements": [
                       {
                         "eventCall": {
@@ -18408,26 +18549,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3404,
+                                  "id": 3240,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "11544:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "11823:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3406,
+                                "id": 3242,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3405,
+                                  "id": 3241,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11559:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11838:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -18438,24 +18579,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11544:22:7",
+                                "src": "11823:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3408,
+                              "id": 3244,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3407,
+                                "id": 3243,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11567:1:7",
+                                "src": "11846:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -18468,7 +18609,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11544:25:7",
+                              "src": "11823:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -18482,18 +18623,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3403,
+                            "id": 3239,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "11519:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "11798:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3409,
+                          "id": 3245,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18501,20 +18642,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "11519:51:7",
+                          "src": "11798:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3410,
+                        "id": 3246,
                         "nodeType": "EmitStatement",
-                        "src": "11514:56:7"
+                        "src": "11793:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3421,
+                          "id": 3257,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18525,44 +18666,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3411,
+                                "id": 3247,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "11584:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "11863:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3417,
+                              "id": 3253,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3412,
+                                    "id": 3248,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "11593:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "11872:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3414,
+                                  "id": 3250,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3413,
+                                    "id": 3249,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "11608:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "11887:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -18573,24 +18714,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "11593:22:7",
+                                  "src": "11872:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3416,
+                                "id": 3252,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3415,
+                                  "id": 3251,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "11616:1:7",
+                                  "src": "11895:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -18603,7 +18744,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11593:25:7",
+                                "src": "11872:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18614,23 +18755,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11584:35:7",
+                              "src": "11863:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3418,
+                            "id": 3254,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "11584:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "11863:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -18640,18 +18781,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3419,
+                              "id": 3255,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "11629:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "11908:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3420,
+                            "id": 3256,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -18659,26 +18800,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11629:30:7",
+                            "src": "11908:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "11584:75:7",
+                          "src": "11863:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3422,
+                        "id": 3258,
                         "nodeType": "ExpressionStatement",
-                        "src": "11584:75:7"
+                        "src": "11863:75:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3429,
+                          "id": 3265,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18689,26 +18830,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3423,
+                                "id": 3259,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "11673:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "11952:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3426,
+                              "id": 3262,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3424,
+                                "id": 3260,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "11688:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "11967:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18719,24 +18860,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11673:22:7",
+                              "src": "11952:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3427,
+                            "id": 3263,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3425,
+                              "id": 3261,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11696:1:7",
+                              "src": "11975:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -18749,7 +18890,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "11673:25:7",
+                            "src": "11952:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -18759,54 +18900,54 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3428,
+                            "id": 3264,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "11701:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "11980:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "11673:42:7",
+                          "src": "11952:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3430,
+                        "id": 3266,
                         "nodeType": "ExpressionStatement",
-                        "src": "11673:42:7"
+                        "src": "11952:42:6"
                       },
                       {
                         "assignments": [
-                          3432
+                          3268
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 3432,
+                            "id": 3268,
                             "name": "matchingRequest",
                             "nodeType": "VariableDeclaration",
-                            "scope": 3788,
-                            "src": "11729:36:7",
+                            "scope": 3624,
+                            "src": "12008:36:6",
                             "stateVariable": false,
                             "storageLocation": "memory",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 3431,
+                              "id": 3267,
                               "name": "ChangeRequest",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 2252,
-                              "src": "11729:13:7",
+                              "referencedDeclaration": 2076,
+                              "src": "12008:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                                 "typeString": "struct Market.ChangeRequest"
                               }
                             },
@@ -18814,49 +18955,49 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 3440,
+                        "id": 3276,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3433,
+                            "id": 3269,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "11768:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "12047:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 3439,
+                          "id": 3275,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3434,
+                                "id": 3270,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "11777:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "12056:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3436,
+                              "id": 3272,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3435,
+                                "id": 3271,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "11792:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "12071:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18867,24 +19008,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11777:22:7",
+                              "src": "12056:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3438,
+                            "id": 3274,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3437,
+                              "id": 3273,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11800:1:7",
+                              "src": "12079:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -18897,7 +19038,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "11777:25:7",
+                            "src": "12056:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -18908,14 +19049,14 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "11768:35:7",
+                          "src": "12047:35:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "11729:74:7"
+                        "src": "12008:74:6"
                       },
                       {
                         "condition": {
@@ -18924,7 +19065,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3453,
+                          "id": 3289,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -18935,19 +19076,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3446,
+                            "id": 3282,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3441,
+                              "id": 3277,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3300,
-                              "src": "11822:11:7",
+                              "referencedDeclaration": 3136,
+                              "src": "12101:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -18961,26 +19102,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3442,
+                                  "id": 3278,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "11837:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "12116:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3444,
+                                "id": 3280,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3443,
+                                  "id": 3279,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11843:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "12122:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -18991,27 +19132,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11837:13:7",
+                                "src": "12116:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3445,
+                              "id": 3281,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2197,
-                              "src": "11837:22:7",
+                              "referencedDeclaration": 2021,
+                              "src": "12116:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11822:37:7",
+                            "src": "12101:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -19025,19 +19166,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3452,
+                            "id": 3288,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3447,
+                              "id": 3283,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3298,
-                              "src": "11863:8:7",
+                              "referencedDeclaration": 3134,
+                              "src": "12142:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -19051,26 +19192,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3448,
+                                  "id": 3284,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "11874:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "12153:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3450,
+                                "id": 3286,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3449,
+                                  "id": 3285,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11880:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "12159:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -19081,33 +19222,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11874:13:7",
+                                "src": "12153:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3451,
+                              "id": 3287,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2199,
-                              "src": "11874:19:7",
+                              "referencedDeclaration": 2023,
+                              "src": "12153:19:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11863:30:7",
+                            "src": "12142:30:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "11822:71:7",
+                          "src": "12101:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -19120,7 +19261,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 3500,
+                            "id": 3336,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -19131,7 +19272,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 3495,
+                              "id": 3331,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -19139,10 +19280,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 3490,
+                                "id": 3326,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -19151,28 +19292,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3486,
+                                    "id": 3322,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "12190:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "12469:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3487,
+                                  "id": 3323,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "12190:22:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "12469:22:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -19182,18 +19323,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3488,
+                                    "id": 3324,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "12216:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "12495:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3489,
+                                  "id": 3325,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -19201,13 +19342,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "12216:29:7",
+                                  "src": "12495:29:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "12190:55:7",
+                                "src": "12469:55:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -19221,7 +19362,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 3494,
+                                "id": 3330,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -19230,26 +19371,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3491,
+                                    "id": 3327,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "12249:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "12528:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3492,
+                                  "id": 3328,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2249,
-                                  "src": "12249:24:7",
+                                  "referencedDeclaration": 2073,
+                                  "src": "12528:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -19259,24 +19400,24 @@
                                 "operator": ">=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 3493,
+                                  "id": 3329,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3300,
-                                  "src": "12277:11:7",
+                                  "referencedDeclaration": 3136,
+                                  "src": "12556:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12249:39:7",
+                                "src": "12528:39:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "12190:98:7",
+                              "src": "12469:98:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -19290,7 +19431,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3499,
+                              "id": 3335,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -19299,26 +19440,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3496,
+                                  "id": 3332,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3432,
-                                  "src": "12292:15:7",
+                                  "referencedDeclaration": 3268,
+                                  "src": "12571:15:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3497,
+                                "id": 3333,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2247,
-                                "src": "12292:21:7",
+                                "referencedDeclaration": 2071,
+                                "src": "12571:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -19328,67 +19469,67 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 3498,
+                                "id": 3334,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3298,
-                                "src": "12317:8:7",
+                                "referencedDeclaration": 3134,
+                                "src": "12596:8:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "12292:33:7",
+                              "src": "12571:33:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "12190:135:7",
+                            "src": "12469:135:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 3571,
+                            "id": 3407,
                             "nodeType": "Block",
-                            "src": "12899:54:7",
+                            "src": "13178:54:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3569,
+                                  "id": 3405,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2330,
-                                  "src": "12924:14:7",
+                                  "referencedDeclaration": 2154,
+                                  "src": "13203:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 3304,
-                                "id": 3570,
+                                "functionReturnParameters": 3140,
+                                "id": 3406,
                                 "nodeType": "Return",
-                                "src": "12917:21:7"
+                                "src": "13196:21:6"
                               }
                             ]
                           },
-                          "id": 3572,
+                          "id": 3408,
                           "nodeType": "IfStatement",
-                          "src": "12186:767:7",
+                          "src": "12465:767:6",
                           "trueBody": {
-                            "id": 3568,
+                            "id": 3404,
                             "nodeType": "Block",
-                            "src": "12327:566:7",
+                            "src": "12606:566:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3507,
+                                  "id": 3343,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19399,26 +19540,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3501,
+                                        "id": 3337,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "12345:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "12624:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3503,
+                                      "id": 3339,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3502,
+                                        "id": 3338,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2330,
-                                        "src": "12354:14:7",
+                                        "referencedDeclaration": 2154,
+                                        "src": "12633:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19429,23 +19570,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12345:24:7",
+                                      "src": "12624:24:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3504,
+                                    "id": 3340,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "12345:31:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "12624:31:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -19455,18 +19596,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3505,
+                                      "id": 3341,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "12379:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "12658:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3506,
+                                    "id": 3342,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -19474,26 +19615,26 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12379:30:7",
+                                    "src": "12658:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12345:64:7",
+                                  "src": "12624:64:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3508,
+                                "id": 3344,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12345:64:7"
+                                "src": "12624:64:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3519,
+                                  "id": 3355,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19504,44 +19645,44 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3509,
+                                        "id": 3345,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "12427:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "12706:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3515,
+                                      "id": 3351,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
                                           "baseExpression": {
                                             "argumentTypes": null,
-                                            "id": 3510,
+                                            "id": 3346,
                                             "name": "actualRequests",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2357,
-                                            "src": "12436:14:7",
+                                            "referencedDeclaration": 2181,
+                                            "src": "12715:14:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                               "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                             }
                                           },
-                                          "id": 3512,
+                                          "id": 3348,
                                           "indexExpression": {
                                             "argumentTypes": null,
-                                            "id": 3511,
+                                            "id": 3347,
                                             "name": "dealID",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 3296,
-                                            "src": "12451:6:7",
+                                            "referencedDeclaration": 3132,
+                                            "src": "12730:6:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -19552,24 +19693,24 @@
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "nodeType": "IndexAccess",
-                                          "src": "12436:22:7",
+                                          "src": "12715:22:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                             "typeString": "uint256[2] storage ref"
                                           }
                                         },
-                                        "id": 3514,
+                                        "id": 3350,
                                         "indexExpression": {
                                           "argumentTypes": null,
                                           "hexValue": "30",
-                                          "id": 3513,
+                                          "id": 3349,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": true,
                                           "kind": "number",
                                           "lValueRequested": false,
                                           "nodeType": "Literal",
-                                          "src": "12459:1:7",
+                                          "src": "12738:1:6",
                                           "subdenomination": null,
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_rational_0_by_1",
@@ -19582,7 +19723,7 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12436:25:7",
+                                        "src": "12715:25:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19593,23 +19734,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12427:35:7",
+                                      "src": "12706:35:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3516,
+                                    "id": 3352,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "12427:42:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "12706:42:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -19619,18 +19760,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3517,
+                                      "id": 3353,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "12472:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "12751:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3518,
+                                    "id": 3354,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -19638,21 +19779,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12472:30:7",
+                                    "src": "12751:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12427:75:7",
+                                  "src": "12706:75:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3520,
+                                "id": 3356,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12427:75:7"
+                                "src": "12706:75:6"
                               },
                               {
                                 "eventCall": {
@@ -19664,26 +19805,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3522,
+                                          "id": 3358,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2357,
-                                          "src": "12550:14:7",
+                                          "referencedDeclaration": 2181,
+                                          "src": "12829:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 3524,
+                                        "id": 3360,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3523,
+                                          "id": 3359,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3296,
-                                          "src": "12565:6:7",
+                                          "referencedDeclaration": 3132,
+                                          "src": "12844:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -19694,24 +19835,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12550:22:7",
+                                        "src": "12829:22:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 3526,
+                                      "id": 3362,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "30",
-                                        "id": 3525,
+                                        "id": 3361,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "12573:1:7",
+                                        "src": "12852:1:6",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_0_by_1",
@@ -19724,7 +19865,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12550:25:7",
+                                      "src": "12829:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -19738,18 +19879,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3521,
+                                    "id": 3357,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "12525:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "12804:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3527,
+                                  "id": 3363,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19757,20 +19898,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12525:51:7",
+                                  "src": "12804:51:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3528,
+                                "id": 3364,
                                 "nodeType": "EmitStatement",
-                                "src": "12520:56:7"
+                                "src": "12799:56:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3535,
+                                  "id": 3371,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19781,26 +19922,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3529,
+                                        "id": 3365,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "12594:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "12873:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3532,
+                                      "id": 3368,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3530,
+                                        "id": 3366,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12609:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "12888:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19811,24 +19952,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12594:22:7",
+                                      "src": "12873:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3533,
+                                    "id": 3369,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 3531,
+                                      "id": 3367,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12617:1:7",
+                                      "src": "12896:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -19841,7 +19982,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12594:25:7",
+                                    "src": "12873:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -19852,14 +19993,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3534,
+                                    "id": 3370,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12622:1:7",
+                                    "src": "12901:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -19867,20 +20008,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12594:29:7",
+                                  "src": "12873:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3536,
+                                "id": 3372,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12594:29:7"
+                                "src": "12873:29:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3543,
+                                  "id": 3379,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -19891,26 +20032,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3537,
+                                        "id": 3373,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "12641:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "12920:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3540,
+                                      "id": 3376,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3538,
+                                        "id": 3374,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12656:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "12935:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -19921,24 +20062,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12641:22:7",
+                                      "src": "12920:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3541,
+                                    "id": 3377,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 3539,
+                                      "id": 3375,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12664:1:7",
+                                      "src": "12943:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -19951,7 +20092,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12641:25:7",
+                                    "src": "12920:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -19962,14 +20103,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3542,
+                                    "id": 3378,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12669:1:7",
+                                    "src": "12948:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -19977,15 +20118,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12641:29:7",
+                                  "src": "12920:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3544,
+                                "id": 3380,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12641:29:7"
+                                "src": "12920:29:6"
                               },
                               {
                                 "expression": {
@@ -19993,12 +20134,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3546,
+                                      "id": 3382,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12693:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12972:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20012,18 +20153,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3545,
+                                    "id": 3381,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3294,
-                                    "src": "12688:4:7",
+                                    "referencedDeclaration": 3130,
+                                    "src": "12967:4:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 3547,
+                                  "id": 3383,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20031,20 +20172,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12688:12:7",
+                                  "src": "12967:12:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 3548,
+                                "id": 3384,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12688:12:7"
+                                "src": "12967:12:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3555,
+                                  "id": 3391,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20055,26 +20196,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3549,
+                                        "id": 3385,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "12718:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "12997:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3551,
+                                      "id": 3387,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3550,
+                                        "id": 3386,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12724:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "13003:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -20085,21 +20226,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12718:13:7",
+                                      "src": "12997:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3552,
+                                    "id": 3388,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2199,
-                                    "src": "12718:19:7",
+                                    "referencedDeclaration": 2023,
+                                    "src": "12997:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20111,45 +20252,45 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3553,
+                                      "id": 3389,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3432,
-                                      "src": "12740:15:7",
+                                      "referencedDeclaration": 3268,
+                                      "src": "13019:15:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 3554,
+                                    "id": 3390,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2247,
-                                    "src": "12740:21:7",
+                                    "referencedDeclaration": 2071,
+                                    "src": "13019:21:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12718:43:7",
+                                  "src": "12997:43:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3556,
+                                "id": 3392,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12718:43:7"
+                                "src": "12997:43:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3562,
+                                  "id": 3398,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20160,26 +20301,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3557,
+                                        "id": 3393,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "12779:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "13058:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3559,
+                                      "id": 3395,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3558,
+                                        "id": 3394,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12785:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "13064:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -20190,21 +20331,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12779:13:7",
+                                      "src": "13058:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3560,
+                                    "id": 3396,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2197,
-                                    "src": "12779:22:7",
+                                    "referencedDeclaration": 2021,
+                                    "src": "13058:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20214,26 +20355,26 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 3561,
+                                    "id": 3397,
                                     "name": "newDuration",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3300,
-                                    "src": "12804:11:7",
+                                    "referencedDeclaration": 3136,
+                                    "src": "13083:11:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12779:36:7",
+                                  "src": "13058:36:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3563,
+                                "id": 3399,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12779:36:7"
+                                "src": "13058:36:6"
                               },
                               {
                                 "eventCall": {
@@ -20241,12 +20382,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3565,
+                                      "id": 3401,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "12863:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "13142:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20260,18 +20401,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3564,
+                                    "id": 3400,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "12838:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "13117:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3566,
+                                  "id": 3402,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -20279,31 +20420,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12838:40:7",
+                                  "src": "13117:40:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3567,
+                                "id": 3403,
                                 "nodeType": "EmitStatement",
-                                "src": "12833:45:7"
+                                "src": "13112:45:6"
                               }
                             ]
                           }
                         },
-                        "id": 3573,
+                        "id": 3409,
                         "nodeType": "IfStatement",
-                        "src": "11818:1135:7",
+                        "src": "12097:1135:6",
                         "trueBody": {
-                          "id": 3485,
+                          "id": 3321,
                           "nodeType": "Block",
-                          "src": "11895:285:7",
+                          "src": "12174:285:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3460,
+                                "id": 3296,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20314,26 +20455,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3454,
+                                      "id": 3290,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "11913:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "12192:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3456,
+                                    "id": 3292,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3455,
+                                      "id": 3291,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "11922:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "12201:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20344,23 +20485,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "11913:24:7",
+                                    "src": "12192:24:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3457,
+                                  "id": 3293,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "11913:31:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "12192:31:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -20370,18 +20511,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3458,
+                                    "id": 3294,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "11947:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "12226:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3459,
+                                  "id": 3295,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -20389,21 +20530,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "11947:30:7",
+                                  "src": "12226:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "11913:64:7",
+                                "src": "12192:64:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3461,
+                              "id": 3297,
                               "nodeType": "ExpressionStatement",
-                              "src": "11913:64:7"
+                              "src": "12192:64:6"
                             },
                             {
                               "expression": {
@@ -20411,12 +20552,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3463,
+                                    "id": 3299,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "12000:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "12279:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20430,18 +20571,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3462,
+                                  "id": 3298,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3294,
-                                  "src": "11995:4:7",
+                                  "referencedDeclaration": 3130,
+                                  "src": "12274:4:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3464,
+                                "id": 3300,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20449,20 +20590,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "11995:12:7",
+                                "src": "12274:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3465,
+                              "id": 3301,
                               "nodeType": "ExpressionStatement",
-                              "src": "11995:12:7"
+                              "src": "12274:12:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3471,
+                                "id": 3307,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20473,26 +20614,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3466,
+                                      "id": 3302,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "12025:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "12304:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3468,
+                                    "id": 3304,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3467,
+                                      "id": 3303,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12031:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12310:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20503,21 +20644,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12025:13:7",
+                                    "src": "12304:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3469,
+                                  "id": 3305,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "12025:19:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "12304:19:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20527,31 +20668,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3470,
+                                  "id": 3306,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3298,
-                                  "src": "12047:8:7",
+                                  "referencedDeclaration": 3134,
+                                  "src": "12326:8:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12025:30:7",
+                                "src": "12304:30:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3472,
+                              "id": 3308,
                               "nodeType": "ExpressionStatement",
-                              "src": "12025:30:7"
+                              "src": "12304:30:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3479,
+                                "id": 3315,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20562,26 +20703,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3473,
+                                      "id": 3309,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2357,
-                                      "src": "12073:14:7",
+                                      "referencedDeclaration": 2181,
+                                      "src": "12352:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 3476,
+                                    "id": 3312,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3474,
+                                      "id": 3310,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12088:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12367:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -20592,24 +20733,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12073:22:7",
+                                    "src": "12352:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 3477,
+                                  "id": 3313,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "31",
-                                    "id": 3475,
+                                    "id": 3311,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12096:1:7",
+                                    "src": "12375:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_1_by_1",
@@ -20622,7 +20763,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "12073:25:7",
+                                  "src": "12352:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20633,14 +20774,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3478,
+                                  "id": 3314,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12101:1:7",
+                                  "src": "12380:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -20648,15 +20789,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "12073:29:7",
+                                "src": "12352:29:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3480,
+                              "id": 3316,
                               "nodeType": "ExpressionStatement",
-                              "src": "12073:29:7"
+                              "src": "12352:29:6"
                             },
                             {
                               "eventCall": {
@@ -20664,12 +20805,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3482,
+                                    "id": 3318,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2330,
-                                    "src": "12150:14:7",
+                                    "referencedDeclaration": 2154,
+                                    "src": "12429:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20683,18 +20824,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3481,
+                                  "id": 3317,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2282,
-                                  "src": "12125:24:7",
+                                  "referencedDeclaration": 2106,
+                                  "src": "12404:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3483,
+                                "id": 3319,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20702,15 +20843,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "12125:40:7",
+                                "src": "12404:40:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3484,
+                              "id": 3320,
                               "nodeType": "EmitStatement",
-                              "src": "12120:45:7"
+                              "src": "12399:45:6"
                             }
                           ]
                         }
@@ -20718,7 +20859,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3584,
+                          "id": 3420,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20729,44 +20870,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3574,
+                                "id": 3410,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "12967:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "13246:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3580,
+                              "id": 3416,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3575,
+                                    "id": 3411,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "12976:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "13255:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3577,
+                                  "id": 3413,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3576,
+                                    "id": 3412,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "12991:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13270:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20777,24 +20918,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "12976:22:7",
+                                  "src": "13255:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3579,
+                                "id": 3415,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3578,
+                                  "id": 3414,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12999:1:7",
+                                  "src": "13278:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -20807,7 +20948,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "12976:25:7",
+                                "src": "13255:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -20818,23 +20959,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12967:35:7",
+                              "src": "13246:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3581,
+                            "id": 3417,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "12967:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "13246:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -20844,18 +20985,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3582,
+                              "id": 3418,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "13012:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "13291:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3583,
+                            "id": 3419,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -20863,21 +21004,21 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13012:30:7",
+                            "src": "13291:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "12967:75:7",
+                          "src": "13246:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3585,
+                        "id": 3421,
                         "nodeType": "ExpressionStatement",
-                        "src": "12967:75:7"
+                        "src": "13246:75:6"
                       },
                       {
                         "eventCall": {
@@ -20889,26 +21030,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3587,
+                                  "id": 3423,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13086:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13365:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3589,
+                                "id": 3425,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3588,
+                                  "id": 3424,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13101:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13380:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -20919,24 +21060,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13086:22:7",
+                                "src": "13365:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3591,
+                              "id": 3427,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3590,
+                                "id": 3426,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13109:1:7",
+                                "src": "13388:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -20949,7 +21090,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13086:25:7",
+                              "src": "13365:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -20963,18 +21104,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3586,
+                            "id": 3422,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "13061:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "13340:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3592,
+                          "id": 3428,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20982,20 +21123,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13061:51:7",
+                          "src": "13340:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3593,
+                        "id": 3429,
                         "nodeType": "EmitStatement",
-                        "src": "13056:56:7"
+                        "src": "13335:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3600,
+                          "id": 3436,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21006,26 +21147,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3594,
+                                "id": 3430,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "13126:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "13405:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3597,
+                              "id": 3433,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3595,
+                                "id": 3431,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "13141:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "13420:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21036,24 +21177,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13126:22:7",
+                              "src": "13405:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3598,
+                            "id": 3434,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3596,
+                              "id": 3432,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13149:1:7",
+                              "src": "13428:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -21066,7 +21207,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13126:25:7",
+                            "src": "13405:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -21076,26 +21217,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3599,
+                            "id": 3435,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "13154:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "13433:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13126:42:7",
+                          "src": "13405:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3601,
+                        "id": 3437,
                         "nodeType": "ExpressionStatement",
-                        "src": "13126:42:7"
+                        "src": "13405:42:6"
                       }
                     ]
                   }
@@ -21104,24 +21245,24 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3607,
+                    "id": 3443,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3604,
+                      "id": 3440,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3360,
-                      "src": "13193:11:7",
+                      "referencedDeclaration": 3196,
+                      "src": "13472:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -21131,18 +21272,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3605,
+                        "id": 3441,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "13208:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "13487:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3606,
+                      "id": 3442,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -21150,26 +21291,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "13208:19:7",
+                      "src": "13487:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "13193:34:7",
+                    "src": "13472:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3768,
+                  "id": 3604,
                   "nodeType": "IfStatement",
-                  "src": "13189:1389:7",
+                  "src": "13468:1389:6",
                   "trueBody": {
-                    "id": 3767,
+                    "id": 3603,
                     "nodeType": "Block",
-                    "src": "13229:1349:7",
+                    "src": "13508:1349:6",
                     "statements": [
                       {
                         "eventCall": {
@@ -21181,26 +21322,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3609,
+                                  "id": 3445,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13273:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13552:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3611,
+                                "id": 3447,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3610,
+                                  "id": 3446,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13288:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13567:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21211,24 +21352,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13273:22:7",
+                                "src": "13552:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3613,
+                              "id": 3449,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 3612,
+                                "id": 3448,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13296:1:7",
+                                "src": "13575:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -21241,7 +21382,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13273:25:7",
+                              "src": "13552:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21255,18 +21396,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3608,
+                            "id": 3444,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "13248:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "13527:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3614,
+                          "id": 3450,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21274,20 +21415,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13248:51:7",
+                          "src": "13527:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3615,
+                        "id": 3451,
                         "nodeType": "EmitStatement",
-                        "src": "13243:56:7"
+                        "src": "13522:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3626,
+                          "id": 3462,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21298,44 +21439,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3616,
+                                "id": 3452,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "13313:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "13592:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3622,
+                              "id": 3458,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3617,
+                                    "id": 3453,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "13322:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "13601:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3619,
+                                  "id": 3455,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3618,
+                                    "id": 3454,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "13337:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13616:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -21346,24 +21487,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "13322:22:7",
+                                  "src": "13601:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3621,
+                                "id": 3457,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3620,
+                                  "id": 3456,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13345:1:7",
+                                  "src": "13624:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -21376,7 +21517,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13322:25:7",
+                                "src": "13601:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21387,23 +21528,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13313:35:7",
+                              "src": "13592:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3623,
+                            "id": 3459,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "13313:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "13592:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -21413,18 +21554,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3624,
+                              "id": 3460,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "13358:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "13637:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3625,
+                            "id": 3461,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -21432,26 +21573,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13358:30:7",
+                            "src": "13637:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "13313:75:7",
+                          "src": "13592:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3627,
+                        "id": 3463,
                         "nodeType": "ExpressionStatement",
-                        "src": "13313:75:7"
+                        "src": "13592:75:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3634,
+                          "id": 3470,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21462,26 +21603,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3628,
+                                "id": 3464,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "13402:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "13681:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3631,
+                              "id": 3467,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3629,
+                                "id": 3465,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "13417:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "13696:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -21492,24 +21633,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13402:22:7",
+                              "src": "13681:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3632,
+                            "id": 3468,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3630,
+                              "id": 3466,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13425:1:7",
+                              "src": "13704:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -21522,7 +21663,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13402:25:7",
+                            "src": "13681:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -21532,45 +21673,45 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3633,
+                            "id": 3469,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "13430:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "13709:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13402:42:7",
+                          "src": "13681:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3635,
+                        "id": 3471,
                         "nodeType": "ExpressionStatement",
-                        "src": "13402:42:7"
+                        "src": "13681:42:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3644,
+                          "id": 3480,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3636,
+                            "id": 3472,
                             "name": "matchingRequest",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3432,
-                            "src": "13458:15:7",
+                            "referencedDeclaration": 3268,
+                            "src": "13737:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
@@ -21580,44 +21721,44 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3637,
+                              "id": 3473,
                               "name": "requests",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2351,
-                              "src": "13476:8:7",
+                              "referencedDeclaration": 2175,
+                              "src": "13755:8:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                               }
                             },
-                            "id": 3643,
+                            "id": 3479,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3638,
+                                  "id": 3474,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13485:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13764:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3640,
+                                "id": 3476,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3639,
+                                  "id": 3475,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13500:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13779:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21628,24 +21769,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13485:22:7",
+                                "src": "13764:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3642,
+                              "id": 3478,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3641,
+                                "id": 3477,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13508:1:7",
+                                "src": "13787:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -21658,7 +21799,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13485:25:7",
+                              "src": "13764:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21669,21 +21810,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "13476:35:7",
+                            "src": "13755:35:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                               "typeString": "struct Market.ChangeRequest storage ref"
                             }
                           },
-                          "src": "13458:53:7",
+                          "src": "13737:53:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                             "typeString": "struct Market.ChangeRequest memory"
                           }
                         },
-                        "id": 3645,
+                        "id": 3481,
                         "nodeType": "ExpressionStatement",
-                        "src": "13458:53:7"
+                        "src": "13737:53:6"
                       },
                       {
                         "condition": {
@@ -21692,7 +21833,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3658,
+                          "id": 3494,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -21703,19 +21844,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3651,
+                            "id": 3487,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3646,
+                              "id": 3482,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3300,
-                              "src": "13530:11:7",
+                              "referencedDeclaration": 3136,
+                              "src": "13809:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21729,26 +21870,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3647,
+                                  "id": 3483,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "13545:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "13824:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3649,
+                                "id": 3485,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3648,
+                                  "id": 3484,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13551:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13830:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21759,27 +21900,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13545:13:7",
+                                "src": "13824:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3650,
+                              "id": 3486,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2197,
-                              "src": "13545:22:7",
+                              "referencedDeclaration": 2021,
+                              "src": "13824:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13530:37:7",
+                            "src": "13809:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -21793,19 +21934,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3657,
+                            "id": 3493,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3652,
+                              "id": 3488,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3298,
-                              "src": "13571:8:7",
+                              "referencedDeclaration": 3134,
+                              "src": "13850:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21819,26 +21960,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3653,
+                                  "id": 3489,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "13582:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "13861:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3655,
+                                "id": 3491,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3654,
+                                  "id": 3490,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13588:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13867:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -21849,33 +21990,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13582:13:7",
+                                "src": "13861:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3656,
+                              "id": 3492,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2199,
-                              "src": "13582:19:7",
+                              "referencedDeclaration": 2023,
+                              "src": "13861:19:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13571:30:7",
+                            "src": "13850:30:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "13530:71:7",
+                          "src": "13809:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -21888,7 +22029,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 3705,
+                            "id": 3541,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -21899,7 +22040,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 3700,
+                              "id": 3536,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -21907,10 +22048,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 3695,
+                                "id": 3531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -21919,28 +22060,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3691,
+                                    "id": 3527,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "13898:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "14177:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3692,
+                                  "id": 3528,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "13898:22:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "14177:22:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -21950,18 +22091,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3693,
+                                    "id": 3529,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "13924:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "14203:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3694,
+                                  "id": 3530,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -21969,13 +22110,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13924:29:7",
+                                  "src": "14203:29:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13898:55:7",
+                                "src": "14177:55:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -21989,7 +22130,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 3699,
+                                "id": 3535,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -21998,26 +22139,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3696,
+                                    "id": 3532,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "13957:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "14236:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3697,
+                                  "id": 3533,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2249,
-                                  "src": "13957:24:7",
+                                  "referencedDeclaration": 2073,
+                                  "src": "14236:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -22027,24 +22168,24 @@
                                 "operator": "<=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 3698,
+                                  "id": 3534,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3300,
-                                  "src": "13985:11:7",
+                                  "referencedDeclaration": 3136,
+                                  "src": "14264:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13957:39:7",
+                                "src": "14236:39:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "13898:98:7",
+                              "src": "14177:98:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -22058,7 +22199,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3704,
+                              "id": 3540,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -22067,26 +22208,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3701,
+                                  "id": 3537,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3432,
-                                  "src": "14000:15:7",
+                                  "referencedDeclaration": 3268,
+                                  "src": "14279:15:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3702,
+                                "id": 3538,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2247,
-                                "src": "14000:21:7",
+                                "referencedDeclaration": 2071,
+                                "src": "14279:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -22096,67 +22237,67 @@
                               "operator": ">=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 3703,
+                                "id": 3539,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3298,
-                                "src": "14025:8:7",
+                                "referencedDeclaration": 3134,
+                                "src": "14304:8:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "14000:33:7",
+                              "src": "14279:33:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "13898:135:7",
+                            "src": "14177:135:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 3764,
+                            "id": 3600,
                             "nodeType": "Block",
-                            "src": "14514:54:7",
+                            "src": "14793:54:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3762,
+                                  "id": 3598,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2330,
-                                  "src": "14539:14:7",
+                                  "referencedDeclaration": 2154,
+                                  "src": "14818:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 3304,
-                                "id": 3763,
+                                "functionReturnParameters": 3140,
+                                "id": 3599,
                                 "nodeType": "Return",
-                                "src": "14532:21:7"
+                                "src": "14811:21:6"
                               }
                             ]
                           },
-                          "id": 3765,
+                          "id": 3601,
                           "nodeType": "IfStatement",
-                          "src": "13894:674:7",
+                          "src": "14173:674:6",
                           "trueBody": {
-                            "id": 3761,
+                            "id": 3597,
                             "nodeType": "Block",
-                            "src": "14035:473:7",
+                            "src": "14314:473:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3712,
+                                  "id": 3548,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22167,26 +22308,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3706,
+                                        "id": 3542,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "14053:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "14332:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3708,
+                                      "id": 3544,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3707,
+                                        "id": 3543,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2330,
-                                        "src": "14062:14:7",
+                                        "referencedDeclaration": 2154,
+                                        "src": "14341:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22197,23 +22338,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14053:24:7",
+                                      "src": "14332:24:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3709,
+                                    "id": 3545,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "14053:31:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "14332:31:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -22223,18 +22364,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3710,
+                                      "id": 3546,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "14087:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "14366:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3711,
+                                    "id": 3547,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -22242,21 +22383,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "14087:30:7",
+                                    "src": "14366:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "14053:64:7",
+                                  "src": "14332:64:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3713,
+                                "id": 3549,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14053:64:7"
+                                "src": "14332:64:6"
                               },
                               {
                                 "eventCall": {
@@ -22268,26 +22409,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3715,
+                                          "id": 3551,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2357,
-                                          "src": "14165:14:7",
+                                          "referencedDeclaration": 2181,
+                                          "src": "14444:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 3717,
+                                        "id": 3553,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3716,
+                                          "id": 3552,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3296,
-                                          "src": "14180:6:7",
+                                          "referencedDeclaration": 3132,
+                                          "src": "14459:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -22298,24 +22439,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "14165:22:7",
+                                        "src": "14444:22:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 3719,
+                                      "id": 3555,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 3718,
+                                        "id": 3554,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "14188:1:7",
+                                        "src": "14467:1:6",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_1_by_1",
@@ -22328,7 +22469,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14165:25:7",
+                                      "src": "14444:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22342,18 +22483,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3714,
+                                    "id": 3550,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "14140:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "14419:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3720,
+                                  "id": 3556,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22361,20 +22502,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14140:51:7",
+                                  "src": "14419:51:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3721,
+                                "id": 3557,
                                 "nodeType": "EmitStatement",
-                                "src": "14135:56:7"
+                                "src": "14414:56:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3728,
+                                  "id": 3564,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22385,26 +22526,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3722,
+                                        "id": 3558,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "14209:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "14488:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3725,
+                                      "id": 3561,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3723,
+                                        "id": 3559,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14224:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14503:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22415,24 +22556,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14209:22:7",
+                                      "src": "14488:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3726,
+                                    "id": 3562,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 3724,
+                                      "id": 3560,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14232:1:7",
+                                      "src": "14511:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -22445,7 +22586,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14209:25:7",
+                                    "src": "14488:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22456,14 +22597,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3727,
+                                    "id": 3563,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14237:1:7",
+                                    "src": "14516:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -22471,20 +22612,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14209:29:7",
+                                  "src": "14488:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3729,
+                                "id": 3565,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14209:29:7"
+                                "src": "14488:29:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3736,
+                                  "id": 3572,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22495,26 +22636,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3730,
+                                        "id": 3566,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "14256:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "14535:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3733,
+                                      "id": 3569,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3731,
+                                        "id": 3567,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14271:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14550:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22525,24 +22666,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14256:22:7",
+                                      "src": "14535:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3734,
+                                    "id": 3570,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 3732,
+                                      "id": 3568,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14279:1:7",
+                                      "src": "14558:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -22555,7 +22696,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14256:25:7",
+                                    "src": "14535:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22566,14 +22707,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3735,
+                                    "id": 3571,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14284:1:7",
+                                    "src": "14563:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -22581,15 +22722,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14256:29:7",
+                                  "src": "14535:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3737,
+                                "id": 3573,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14256:29:7"
+                                "src": "14535:29:6"
                               },
                               {
                                 "expression": {
@@ -22597,12 +22738,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3739,
+                                      "id": 3575,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "14308:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14587:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22616,18 +22757,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3738,
+                                    "id": 3574,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3294,
-                                    "src": "14303:4:7",
+                                    "referencedDeclaration": 3130,
+                                    "src": "14582:4:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 3740,
+                                  "id": 3576,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22635,20 +22776,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14303:12:7",
+                                  "src": "14582:12:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 3741,
+                                "id": 3577,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14303:12:7"
+                                "src": "14582:12:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3747,
+                                  "id": 3583,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22659,26 +22800,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3742,
+                                        "id": 3578,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "14333:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "14612:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3744,
+                                      "id": 3580,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3743,
+                                        "id": 3579,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14339:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14618:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22689,21 +22830,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14333:13:7",
+                                      "src": "14612:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3745,
+                                    "id": 3581,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2199,
-                                    "src": "14333:19:7",
+                                    "referencedDeclaration": 2023,
+                                    "src": "14612:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22713,31 +22854,31 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 3746,
+                                    "id": 3582,
                                     "name": "newPrice",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3298,
-                                    "src": "14355:8:7",
+                                    "referencedDeclaration": 3134,
+                                    "src": "14634:8:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14333:30:7",
+                                  "src": "14612:30:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3748,
+                                "id": 3584,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14333:30:7"
+                                "src": "14612:30:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3755,
+                                  "id": 3591,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22748,26 +22889,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3749,
+                                        "id": 3585,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "14381:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "14660:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3751,
+                                      "id": 3587,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3750,
+                                        "id": 3586,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14387:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14666:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -22778,21 +22919,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14381:13:7",
+                                      "src": "14660:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3752,
+                                    "id": 3588,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2197,
-                                    "src": "14381:22:7",
+                                    "referencedDeclaration": 2021,
+                                    "src": "14660:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -22804,40 +22945,40 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3753,
+                                      "id": 3589,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3432,
-                                      "src": "14406:15:7",
+                                      "referencedDeclaration": 3268,
+                                      "src": "14685:15:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 3754,
+                                    "id": 3590,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2249,
-                                    "src": "14406:24:7",
+                                    "referencedDeclaration": 2073,
+                                    "src": "14685:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14381:49:7",
+                                  "src": "14660:49:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3756,
+                                "id": 3592,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14381:49:7"
+                                "src": "14660:49:6"
                               },
                               {
                                 "eventCall": {
@@ -22845,12 +22986,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3758,
+                                      "id": 3594,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "14478:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "14757:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22864,18 +23005,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3757,
+                                    "id": 3593,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "14453:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "14732:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3759,
+                                  "id": 3595,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -22883,31 +23024,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14453:40:7",
+                                  "src": "14732:40:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3760,
+                                "id": 3596,
                                 "nodeType": "EmitStatement",
-                                "src": "14448:45:7"
+                                "src": "14727:45:6"
                               }
                             ]
                           }
                         },
-                        "id": 3766,
+                        "id": 3602,
                         "nodeType": "IfStatement",
-                        "src": "13526:1042:7",
+                        "src": "13805:1042:6",
                         "trueBody": {
-                          "id": 3690,
+                          "id": 3526,
                           "nodeType": "Block",
-                          "src": "13603:285:7",
+                          "src": "13882:285:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3665,
+                                "id": 3501,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -22918,26 +23059,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3659,
+                                      "id": 3495,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "13621:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "13900:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3661,
+                                    "id": 3497,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3660,
+                                      "id": 3496,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "13630:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "13909:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -22948,23 +23089,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13621:24:7",
+                                    "src": "13900:24:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3662,
+                                  "id": 3498,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "13621:31:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "13900:31:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -22974,18 +23115,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3663,
+                                    "id": 3499,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "13655:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "13934:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3664,
+                                  "id": 3500,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -22993,21 +23134,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13655:30:7",
+                                  "src": "13934:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13621:64:7",
+                                "src": "13900:64:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3666,
+                              "id": 3502,
                               "nodeType": "ExpressionStatement",
-                              "src": "13621:64:7"
+                              "src": "13900:64:6"
                             },
                             {
                               "expression": {
@@ -23015,12 +23156,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3668,
+                                    "id": 3504,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "13708:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13987:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -23034,18 +23175,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3667,
+                                  "id": 3503,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3294,
-                                  "src": "13703:4:7",
+                                  "referencedDeclaration": 3130,
+                                  "src": "13982:4:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3669,
+                                "id": 3505,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23053,20 +23194,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13703:12:7",
+                                "src": "13982:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3670,
+                              "id": 3506,
                               "nodeType": "ExpressionStatement",
-                              "src": "13703:12:7"
+                              "src": "13982:12:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3676,
+                                "id": 3512,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23077,26 +23218,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3671,
+                                      "id": 3507,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "13733:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "14012:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3673,
+                                    "id": 3509,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3672,
+                                      "id": 3508,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "13739:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14018:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -23107,21 +23248,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13733:13:7",
+                                    "src": "14012:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3674,
+                                  "id": 3510,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "13733:19:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "14012:19:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23131,31 +23272,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3675,
+                                  "id": 3511,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3298,
-                                  "src": "13755:8:7",
+                                  "referencedDeclaration": 3134,
+                                  "src": "14034:8:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13733:30:7",
+                                "src": "14012:30:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3677,
+                              "id": 3513,
                               "nodeType": "ExpressionStatement",
-                              "src": "13733:30:7"
+                              "src": "14012:30:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3684,
+                                "id": 3520,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23166,26 +23307,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3678,
+                                      "id": 3514,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2357,
-                                      "src": "13781:14:7",
+                                      "referencedDeclaration": 2181,
+                                      "src": "14060:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 3681,
+                                    "id": 3517,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3679,
+                                      "id": 3515,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "13796:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14075:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -23196,24 +23337,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13781:22:7",
+                                    "src": "14060:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 3682,
+                                  "id": 3518,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3680,
+                                    "id": 3516,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "13804:1:7",
+                                    "src": "14083:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -23226,7 +23367,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "13781:25:7",
+                                  "src": "14060:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23237,14 +23378,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3683,
+                                  "id": 3519,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13809:1:7",
+                                  "src": "14088:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -23252,15 +23393,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "13781:29:7",
+                                "src": "14060:29:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3685,
+                              "id": 3521,
                               "nodeType": "ExpressionStatement",
-                              "src": "13781:29:7"
+                              "src": "14060:29:6"
                             },
                             {
                               "eventCall": {
@@ -23268,12 +23409,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3687,
+                                    "id": 3523,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2330,
-                                    "src": "13858:14:7",
+                                    "referencedDeclaration": 2154,
+                                    "src": "14137:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -23287,18 +23428,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3686,
+                                  "id": 3522,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2282,
-                                  "src": "13833:24:7",
+                                  "referencedDeclaration": 2106,
+                                  "src": "14112:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3688,
+                                "id": 3524,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -23306,15 +23447,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13833:40:7",
+                                "src": "14112:40:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3689,
+                              "id": 3525,
                               "nodeType": "EmitStatement",
-                              "src": "13828:45:7"
+                              "src": "14107:45:6"
                             }
                           ]
                         }
@@ -23325,7 +23466,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3783,
+                    "id": 3619,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -23336,26 +23477,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3769,
+                          "id": 3605,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "14588:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "14867:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3771,
+                        "id": 3607,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3770,
+                          "id": 3606,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "14594:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "14873:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23366,21 +23507,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "14588:13:7",
+                        "src": "14867:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3772,
+                      "id": 3608,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2203,
-                      "src": "14588:21:7",
+                      "referencedDeclaration": 2027,
+                      "src": "14867:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -23397,26 +23538,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3778,
+                              "id": 3614,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "14640:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "14919:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3780,
+                            "id": 3616,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3779,
+                              "id": 3615,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "14646:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "14925:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -23427,21 +23568,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14640:13:7",
+                            "src": "14919:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3781,
+                          "id": 3617,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2197,
-                          "src": "14640:22:7",
+                          "referencedDeclaration": 2021,
+                          "src": "14919:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23461,26 +23602,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3773,
+                              "id": 3609,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "14612:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "14891:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3775,
+                            "id": 3611,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3774,
+                              "id": 3610,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "14618:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "14897:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -23491,41 +23632,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14612:13:7",
+                            "src": "14891:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3776,
+                          "id": 3612,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2201,
-                          "src": "14612:23:7",
+                          "referencedDeclaration": 2025,
+                          "src": "14891:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3777,
+                        "id": 3613,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "14612:27:7",
+                        "referencedDeclaration": 11079,
+                        "src": "14891:27:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3782,
+                      "id": 3618,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -23533,45 +23674,45 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "14612:51:7",
+                      "src": "14891:51:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "14588:75:7",
+                    "src": "14867:75:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3784,
+                  "id": 3620,
                   "nodeType": "ExpressionStatement",
-                  "src": "14588:75:7"
+                  "src": "14867:75:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3785,
+                    "id": 3621,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2330,
-                    "src": "14680:14:7",
+                    "referencedDeclaration": 2154,
+                    "src": "14959:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 3304,
-                  "id": 3786,
+                  "functionReturnParameters": 3140,
+                  "id": 3622,
                   "nodeType": "Return",
-                  "src": "14673:21:7"
+                  "src": "14952:21:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3788,
+            "id": 3624,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -23579,16 +23720,16 @@
             "name": "CreateChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3301,
+              "id": 3137,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3296,
+                  "id": 3132,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10643:11:7",
+                  "scope": 3624,
+                  "src": "10922:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23596,10 +23737,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3295,
+                    "id": 3131,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10643:4:7",
+                    "src": "10922:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23610,11 +23751,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3298,
+                  "id": 3134,
                   "name": "newPrice",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10656:13:7",
+                  "scope": 3624,
+                  "src": "10935:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23622,10 +23763,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3297,
+                    "id": 3133,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10656:4:7",
+                    "src": "10935:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23636,11 +23777,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3300,
+                  "id": 3136,
                   "name": "newDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10671:16:7",
+                  "scope": 3624,
+                  "src": "10950:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23648,10 +23789,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3299,
+                    "id": 3135,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10671:4:7",
+                    "src": "10950:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23661,20 +23802,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10642:46:7"
+              "src": "10921:46:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3304,
+              "id": 3140,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3303,
+                  "id": 3139,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10705:20:7",
+                  "scope": 3624,
+                  "src": "10984:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23682,10 +23823,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3302,
+                    "id": 3138,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10705:4:7",
+                    "src": "10984:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23695,47 +23836,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10704:22:7"
+              "src": "10983:22:6"
             },
-            "scope": 5229,
-            "src": "10614:4087:7",
+            "scope": 5065,
+            "src": "10893:4087:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3934,
+              "id": 3770,
               "nodeType": "Block",
-              "src": "14780:1218:7",
+              "src": "15059:1265:6",
               "statements": [
                 {
                   "assignments": [
-                    3796
+                    3632
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3796,
+                      "id": 3632,
                       "name": "request",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3935,
-                      "src": "14790:28:7",
+                      "scope": 3771,
+                      "src": "15069:28:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                         "typeString": "struct Market.ChangeRequest"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3795,
+                        "id": 3631,
                         "name": "ChangeRequest",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2252,
-                        "src": "14790:13:7",
+                        "referencedDeclaration": 2076,
+                        "src": "15069:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                           "typeString": "struct Market.ChangeRequest"
                         }
                       },
@@ -23743,31 +23884,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3800,
+                  "id": 3636,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 3797,
+                      "id": 3633,
                       "name": "requests",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2351,
-                      "src": "14821:8:7",
+                      "referencedDeclaration": 2175,
+                      "src": "15100:8:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                       }
                     },
-                    "id": 3799,
+                    "id": 3635,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 3798,
+                      "id": 3634,
                       "name": "changeRequestID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3790,
-                      "src": "14830:15:7",
+                      "referencedDeclaration": 3626,
+                      "src": "15109:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -23778,14 +23919,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "14821:25:7",
+                    "src": "15100:25:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "14790:56:7"
+                  "src": "15069:56:6"
                 },
                 {
                   "expression": {
@@ -23797,7 +23938,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3827,
+                        "id": 3663,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -23808,7 +23949,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3818,
+                          "id": 3654,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -23819,7 +23960,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3809,
+                            "id": 3645,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -23828,18 +23969,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3802,
+                                "id": 3638,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "14864:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "15157:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3803,
+                              "id": 3639,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -23847,7 +23988,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14864:10:7",
+                              "src": "15157:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -23861,42 +24002,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3804,
+                                  "id": 3640,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "14878:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "15171:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3807,
+                                "id": 3643,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3805,
+                                    "id": 3641,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3796,
-                                    "src": "14884:7:7",
+                                    "referencedDeclaration": 3632,
+                                    "src": "15177:7:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3806,
+                                  "id": 3642,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2243,
-                                  "src": "14884:14:7",
+                                  "referencedDeclaration": 2067,
+                                  "src": "15177:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -23907,27 +24048,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14878:21:7",
+                                "src": "15171:21:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3808,
+                              "id": 3644,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "14878:32:7",
+                              "referencedDeclaration": 2011,
+                              "src": "15171:32:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14864:46:7",
+                            "src": "15157:46:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -23941,7 +24082,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3817,
+                            "id": 3653,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -23950,18 +24091,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3810,
+                                "id": 3646,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "14914:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "15219:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3811,
+                              "id": 3647,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -23969,7 +24110,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14914:10:7",
+                              "src": "15219:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -23983,42 +24124,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3812,
+                                  "id": 3648,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "14928:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "15233:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3815,
+                                "id": 3651,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3813,
+                                    "id": 3649,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3796,
-                                    "src": "14934:7:7",
+                                    "referencedDeclaration": 3632,
+                                    "src": "15239:7:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3814,
+                                  "id": 3650,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2243,
-                                  "src": "14934:14:7",
+                                  "referencedDeclaration": 2067,
+                                  "src": "15239:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -24029,33 +24170,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14928:21:7",
+                                "src": "15233:21:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3816,
+                              "id": 3652,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2191,
-                              "src": "14928:30:7",
+                              "referencedDeclaration": 2015,
+                              "src": "15233:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14914:44:7",
+                            "src": "15219:44:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "14864:94:7",
+                          "src": "15157:106:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -24069,7 +24210,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3826,
+                          "id": 3662,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24078,18 +24219,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3819,
+                              "id": 3655,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "14962:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15279:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3820,
+                            "id": 3656,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -24097,7 +24238,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "14962:10:7",
+                            "src": "15279:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -24111,42 +24252,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3821,
+                                "id": 3657,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "14976:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15293:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3824,
+                              "id": 3660,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3822,
+                                  "id": 3658,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "14982:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15299:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3823,
+                                "id": 3659,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "14982:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15299:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24157,33 +24298,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "14976:21:7",
+                              "src": "15293:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3825,
+                            "id": 3661,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "14976:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15293:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "14962:46:7",
+                          "src": "15279:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "14864:144:7",
+                        "src": "15157:168:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -24197,21 +24338,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3801,
+                      "id": 3637,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "14856:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "15136:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3828,
+                    "id": 3664,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24219,15 +24360,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "14856:153:7",
+                    "src": "15136:199:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3829,
+                  "id": 3665,
                   "nodeType": "ExpressionStatement",
-                  "src": "14856:153:7"
+                  "src": "15136:199:6"
                 },
                 {
                   "expression": {
@@ -24236,10 +24377,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2002",
                           "typeString": "enum Market.RequestStatus"
                         },
-                        "id": 3835,
+                        "id": 3671,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -24248,28 +24389,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3831,
+                            "id": 3667,
                             "name": "request",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3796,
-                            "src": "15027:7:7",
+                            "referencedDeclaration": 3632,
+                            "src": "15353:7:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
-                          "id": 3832,
+                          "id": 3668,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2251,
-                          "src": "15027:14:7",
+                          "referencedDeclaration": 2075,
+                          "src": "15353:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
@@ -24279,18 +24420,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3833,
+                            "id": 3669,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2178,
-                            "src": "15045:13:7",
+                            "referencedDeclaration": 2002,
+                            "src": "15371:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 3834,
+                          "id": 3670,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -24298,13 +24439,13 @@
                           "memberName": "REQUEST_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "15045:30:7",
+                          "src": "15371:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "src": "15027:48:7",
+                        "src": "15353:48:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -24318,21 +24459,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3830,
+                      "id": 3666,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "15019:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "15345:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3836,
+                    "id": 3672,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24340,24 +24481,24 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "15019:57:7",
+                    "src": "15345:57:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3837,
+                  "id": 3673,
                   "nodeType": "ExpressionStatement",
-                  "src": "15019:57:7"
+                  "src": "15345:57:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3842,
+                    "id": 3678,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24366,28 +24507,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3838,
+                        "id": 3674,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3796,
-                        "src": "15091:7:7",
+                        "referencedDeclaration": 3632,
+                        "src": "15417:7:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 3839,
+                      "id": 3675,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2245,
-                      "src": "15091:19:7",
+                      "referencedDeclaration": 2069,
+                      "src": "15417:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -24397,18 +24538,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3840,
+                        "id": 3676,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "15114:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "15440:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3841,
+                      "id": 3677,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -24416,26 +24557,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15114:19:7",
+                      "src": "15440:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15091:42:7",
+                    "src": "15417:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3884,
+                  "id": 3720,
                   "nodeType": "IfStatement",
-                  "src": "15087:437:7",
+                  "src": "15413:437:6",
                   "trueBody": {
-                    "id": 3883,
+                    "id": 3719,
                     "nodeType": "Block",
-                    "src": "15135:389:7",
+                    "src": "15461:389:6",
                     "statements": [
                       {
                         "condition": {
@@ -24444,7 +24585,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3850,
+                          "id": 3686,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24453,18 +24594,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3843,
+                              "id": 3679,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "15153:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15479:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3844,
+                            "id": 3680,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -24472,7 +24613,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15153:10:7",
+                            "src": "15479:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -24486,42 +24627,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3845,
+                                "id": 3681,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "15167:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15493:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3848,
+                              "id": 3684,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3846,
+                                  "id": 3682,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15173:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15499:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3847,
+                                "id": 3683,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15173:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15499:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24532,41 +24673,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15167:21:7",
+                              "src": "15493:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3849,
+                            "id": 3685,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "15167:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15493:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15153:46:7",
+                          "src": "15479:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3868,
+                          "id": 3704,
                           "nodeType": "Block",
-                          "src": "15305:98:7",
+                          "src": "15631:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3866,
+                                "id": 3702,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -24577,26 +24718,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3860,
+                                      "id": 3696,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15323:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15649:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3862,
+                                    "id": 3698,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3861,
+                                      "id": 3697,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15332:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "15658:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -24607,23 +24748,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15323:25:7",
+                                    "src": "15649:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3863,
+                                  "id": 3699,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15323:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15649:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -24633,18 +24774,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3864,
+                                    "id": 3700,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15358:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "15684:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3865,
+                                  "id": 3701,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -24652,36 +24793,36 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15358:30:7",
+                                  "src": "15684:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15323:65:7",
+                                "src": "15649:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3867,
+                              "id": 3703,
                               "nodeType": "ExpressionStatement",
-                              "src": "15323:65:7"
+                              "src": "15649:65:6"
                             }
                           ]
                         },
-                        "id": 3869,
+                        "id": 3705,
                         "nodeType": "IfStatement",
-                        "src": "15149:254:7",
+                        "src": "15475:254:6",
                         "trueBody": {
-                          "id": 3859,
+                          "id": 3695,
                           "nodeType": "Block",
-                          "src": "15201:98:7",
+                          "src": "15527:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3857,
+                                "id": 3693,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -24692,26 +24833,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3851,
+                                      "id": 3687,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15219:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15545:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3853,
+                                    "id": 3689,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3852,
+                                      "id": 3688,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15228:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "15554:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -24722,23 +24863,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15219:25:7",
+                                    "src": "15545:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3854,
+                                  "id": 3690,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15219:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15545:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -24748,18 +24889,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3855,
+                                    "id": 3691,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15254:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "15580:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3856,
+                                  "id": 3692,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -24767,21 +24908,21 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15254:30:7",
+                                  "src": "15580:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15219:65:7",
+                                "src": "15545:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3858,
+                              "id": 3694,
                               "nodeType": "ExpressionStatement",
-                              "src": "15219:65:7"
+                              "src": "15545:65:6"
                             }
                           ]
                         }
@@ -24789,7 +24930,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3877,
+                          "id": 3713,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24800,42 +24941,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3870,
+                                "id": 3706,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "15416:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "15742:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3874,
+                              "id": 3710,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3871,
+                                  "id": 3707,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15431:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15757:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3872,
+                                "id": 3708,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15431:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15757:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24846,24 +24987,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15416:30:7",
+                              "src": "15742:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3875,
+                            "id": 3711,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3873,
+                              "id": 3709,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15447:1:7",
+                              "src": "15773:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -24876,7 +25017,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15416:33:7",
+                            "src": "15742:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -24887,14 +25028,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3876,
+                            "id": 3712,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15452:1:7",
+                            "src": "15778:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -24902,15 +25043,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15416:37:7",
+                          "src": "15742:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3878,
+                        "id": 3714,
                         "nodeType": "ExpressionStatement",
-                        "src": "15416:37:7"
+                        "src": "15742:37:6"
                       },
                       {
                         "eventCall": {
@@ -24918,12 +25059,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3880,
+                              "id": 3716,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3790,
-                              "src": "15497:15:7",
+                              "referencedDeclaration": 3626,
+                              "src": "15823:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -24937,18 +25078,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3879,
+                            "id": 3715,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "15472:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "15798:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3881,
+                          "id": 3717,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24956,15 +25097,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15472:41:7",
+                          "src": "15798:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3882,
+                        "id": 3718,
                         "nodeType": "EmitStatement",
-                        "src": "15467:46:7"
+                        "src": "15793:46:6"
                       }
                     ]
                   }
@@ -24973,10 +25114,10 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3889,
+                    "id": 3725,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24985,28 +25126,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3885,
+                        "id": 3721,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3796,
-                        "src": "15538:7:7",
+                        "referencedDeclaration": 3632,
+                        "src": "15864:7:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 3886,
+                      "id": 3722,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2245,
-                      "src": "15538:19:7",
+                      "referencedDeclaration": 2069,
+                      "src": "15864:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -25016,18 +25157,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3887,
+                        "id": 3723,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "15561:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "15887:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3888,
+                      "id": 3724,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -25035,26 +25176,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15561:19:7",
+                      "src": "15887:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15538:42:7",
+                    "src": "15864:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3931,
+                  "id": 3767,
                   "nodeType": "IfStatement",
-                  "src": "15534:437:7",
+                  "src": "15860:437:6",
                   "trueBody": {
-                    "id": 3930,
+                    "id": 3766,
                     "nodeType": "Block",
-                    "src": "15582:389:7",
+                    "src": "15908:389:6",
                     "statements": [
                       {
                         "condition": {
@@ -25063,7 +25204,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3897,
+                          "id": 3733,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25072,18 +25213,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3890,
+                              "id": 3726,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "15600:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15926:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3891,
+                            "id": 3727,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -25091,7 +25232,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15600:10:7",
+                            "src": "15926:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -25105,42 +25246,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3892,
+                                "id": 3728,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "15614:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15940:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3895,
+                              "id": 3731,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3893,
+                                  "id": 3729,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15620:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15946:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3894,
+                                "id": 3730,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15620:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15946:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -25151,41 +25292,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15614:21:7",
+                              "src": "15940:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3896,
+                            "id": 3732,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "15614:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15940:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15600:46:7",
+                          "src": "15926:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3915,
+                          "id": 3751,
                           "nodeType": "Block",
-                          "src": "15752:98:7",
+                          "src": "16078:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3913,
+                                "id": 3749,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -25196,26 +25337,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3907,
+                                      "id": 3743,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15770:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "16096:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3909,
+                                    "id": 3745,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3908,
+                                      "id": 3744,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15779:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "16105:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -25226,23 +25367,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15770:25:7",
+                                    "src": "16096:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3910,
+                                  "id": 3746,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15770:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "16096:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -25252,18 +25393,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3911,
+                                    "id": 3747,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15805:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "16131:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3912,
+                                  "id": 3748,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -25271,36 +25412,36 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15805:30:7",
+                                  "src": "16131:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15770:65:7",
+                                "src": "16096:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3914,
+                              "id": 3750,
                               "nodeType": "ExpressionStatement",
-                              "src": "15770:65:7"
+                              "src": "16096:65:6"
                             }
                           ]
                         },
-                        "id": 3916,
+                        "id": 3752,
                         "nodeType": "IfStatement",
-                        "src": "15596:254:7",
+                        "src": "15922:254:6",
                         "trueBody": {
-                          "id": 3906,
+                          "id": 3742,
                           "nodeType": "Block",
-                          "src": "15648:98:7",
+                          "src": "15974:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3904,
+                                "id": 3740,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -25311,26 +25452,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3898,
+                                      "id": 3734,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15666:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15992:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3900,
+                                    "id": 3736,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3899,
+                                      "id": 3735,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15675:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "16001:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -25341,23 +25482,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15666:25:7",
+                                    "src": "15992:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3901,
+                                  "id": 3737,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15666:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15992:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -25367,18 +25508,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3902,
+                                    "id": 3738,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15701:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "16027:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3903,
+                                  "id": 3739,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -25386,21 +25527,21 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15701:30:7",
+                                  "src": "16027:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15666:65:7",
+                                "src": "15992:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3905,
+                              "id": 3741,
                               "nodeType": "ExpressionStatement",
-                              "src": "15666:65:7"
+                              "src": "15992:65:6"
                             }
                           ]
                         }
@@ -25408,7 +25549,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3924,
+                          "id": 3760,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25419,42 +25560,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3917,
+                                "id": 3753,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "15863:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "16189:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3921,
+                              "id": 3757,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3918,
+                                  "id": 3754,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15878:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "16204:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3919,
+                                "id": 3755,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15878:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "16204:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -25465,24 +25606,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15863:30:7",
+                              "src": "16189:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3922,
+                            "id": 3758,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3920,
+                              "id": 3756,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15894:1:7",
+                              "src": "16220:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -25495,7 +25636,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15863:33:7",
+                            "src": "16189:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -25506,14 +25647,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3923,
+                            "id": 3759,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15899:1:7",
+                            "src": "16225:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -25521,15 +25662,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15863:37:7",
+                          "src": "16189:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3925,
+                        "id": 3761,
                         "nodeType": "ExpressionStatement",
-                        "src": "15863:37:7"
+                        "src": "16189:37:6"
                       },
                       {
                         "eventCall": {
@@ -25537,12 +25678,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3927,
+                              "id": 3763,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3790,
-                              "src": "15944:15:7",
+                              "referencedDeclaration": 3626,
+                              "src": "16270:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -25556,18 +25697,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3926,
+                            "id": 3762,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "15919:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "16245:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3928,
+                          "id": 3764,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25575,15 +25716,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15919:41:7",
+                          "src": "16245:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3929,
+                        "id": 3765,
                         "nodeType": "EmitStatement",
-                        "src": "15914:46:7"
+                        "src": "16240:46:6"
                       }
                     ]
                   }
@@ -25592,14 +25733,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3932,
+                    "id": 3768,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "15987:4:7",
+                    "src": "16313:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -25607,15 +25748,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3794,
-                  "id": 3933,
+                  "functionReturnParameters": 3630,
+                  "id": 3769,
                   "nodeType": "Return",
-                  "src": "15980:11:7"
+                  "src": "16306:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3935,
+            "id": 3771,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -25623,16 +25764,16 @@
             "name": "CancelChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3791,
+              "id": 3627,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3790,
+                  "id": 3626,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3935,
-                  "src": "14736:20:7",
+                  "scope": 3771,
+                  "src": "15015:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25640,10 +25781,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3789,
+                    "id": 3625,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14736:4:7",
+                    "src": "15015:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -25653,20 +25794,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14735:22:7"
+              "src": "15014:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3794,
+              "id": 3630,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3793,
+                  "id": 3629,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3935,
-                  "src": "14774:4:7",
+                  "scope": 3771,
+                  "src": "15053:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25674,10 +25815,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3792,
+                    "id": 3628,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14774:4:7",
+                    "src": "15053:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -25687,19 +25828,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14773:6:7"
+              "src": "15052:6:6"
             },
-            "scope": 5229,
-            "src": "14707:1291:7",
+            "scope": 5065,
+            "src": "14986:1338:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3988,
+              "id": 3824,
               "nodeType": "Block",
-              "src": "16113:280:7",
+              "src": "16439:280:6",
               "statements": [
                 {
                   "expression": {
@@ -25711,7 +25852,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3951,
+                        "id": 3787,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -25723,18 +25864,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3946,
+                                "id": 3782,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "16141:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "16467:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3947,
+                              "id": 3783,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -25742,7 +25883,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16141:10:7",
+                              "src": "16467:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -25756,18 +25897,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 3945,
+                            "id": 3781,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4298,
-                            "src": "16131:9:7",
+                            "referencedDeclaration": 4134,
+                            "src": "16457:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 3948,
+                          "id": 3784,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25775,7 +25916,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16131:21:7",
+                          "src": "16457:21:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -25787,18 +25928,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3949,
+                            "id": 3785,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "16156:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "16482:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 3950,
+                          "id": 3786,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -25806,13 +25947,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16156:10:7",
+                          "src": "16482:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16131:35:7",
+                        "src": "16457:35:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -25826,21 +25967,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3944,
+                      "id": 3780,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16123:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16449:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3952,
+                    "id": 3788,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -25848,15 +25989,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16123:44:7",
+                    "src": "16449:44:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3953,
+                  "id": 3789,
                   "nodeType": "ExpressionStatement",
-                  "src": "16123:44:7"
+                  "src": "16449:44:6"
                 },
                 {
                   "expression": {
@@ -25868,7 +26009,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3960,
+                        "id": 3796,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -25877,34 +26018,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3955,
+                            "id": 3791,
                             "name": "isMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2365,
-                            "src": "16185:8:7",
+                            "referencedDeclaration": 2189,
+                            "src": "16511:8:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 3958,
+                          "id": 3794,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3956,
+                              "id": 3792,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "16194:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "16520:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3957,
+                            "id": 3793,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -25912,7 +26053,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "16194:10:7",
+                            "src": "16520:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -25923,7 +26064,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16185:20:7",
+                          "src": "16511:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -25934,14 +26075,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 3959,
+                          "id": 3795,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16209:5:7",
+                          "src": "16535:5:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -25949,7 +26090,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "16185:29:7",
+                        "src": "16511:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -25963,21 +26104,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3954,
+                      "id": 3790,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16177:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16503:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3961,
+                    "id": 3797,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -25985,15 +26126,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16177:38:7",
+                    "src": "16503:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3962,
+                  "id": 3798,
                   "nodeType": "ExpressionStatement",
-                  "src": "16177:38:7"
+                  "src": "16503:38:6"
                 },
                 {
                   "expression": {
@@ -26005,7 +26146,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3968,
+                        "id": 3804,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26015,12 +26156,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3965,
+                              "id": 3801,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3937,
-                              "src": "16243:7:7",
+                              "referencedDeclaration": 3773,
+                              "src": "16569:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -26034,18 +26175,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 3964,
+                            "id": 3800,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4298,
-                            "src": "16233:9:7",
+                            "referencedDeclaration": 4134,
+                            "src": "16559:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 3966,
+                          "id": 3802,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -26053,7 +26194,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16233:18:7",
+                          "src": "16559:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26063,18 +26204,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3967,
+                          "id": 3803,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3937,
-                          "src": "16255:7:7",
+                          "referencedDeclaration": 3773,
+                          "src": "16581:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16233:29:7",
+                        "src": "16559:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -26088,21 +26229,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3963,
+                      "id": 3799,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16225:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16551:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3969,
+                    "id": 3805,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26110,20 +26251,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16225:38:7",
+                    "src": "16551:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3970,
+                  "id": 3806,
                   "nodeType": "ExpressionStatement",
-                  "src": "16225:38:7"
+                  "src": "16551:38:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3978,
+                    "id": 3814,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26134,26 +26275,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3971,
+                          "id": 3807,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2371,
-                          "src": "16273:13:7",
+                          "referencedDeclaration": 2195,
+                          "src": "16599:13:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 3975,
+                        "id": 3811,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3972,
+                          "id": 3808,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3937,
-                          "src": "16287:7:7",
+                          "referencedDeclaration": 3773,
+                          "src": "16613:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26164,29 +26305,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16273:22:7",
+                        "src": "16599:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 3976,
+                      "id": 3812,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3973,
+                          "id": 3809,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16296:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16622:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 3974,
+                        "id": 3810,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26194,7 +26335,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16296:10:7",
+                        "src": "16622:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26205,7 +26346,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16273:34:7",
+                      "src": "16599:34:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26216,14 +26357,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 3977,
+                      "id": 3813,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16310:4:7",
+                      "src": "16636:4:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -26231,15 +26372,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "16273:41:7",
+                    "src": "16599:41:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3979,
+                  "id": 3815,
                   "nodeType": "ExpressionStatement",
-                  "src": "16273:41:7"
+                  "src": "16599:41:6"
                 },
                 {
                   "eventCall": {
@@ -26249,18 +26390,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3981,
+                          "id": 3817,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16345:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16671:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 3982,
+                        "id": 3818,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26268,7 +26409,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16345:10:7",
+                        "src": "16671:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26276,12 +26417,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3983,
+                        "id": 3819,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3937,
-                        "src": "16357:7:7",
+                        "referencedDeclaration": 3773,
+                        "src": "16683:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26299,18 +26440,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 3980,
+                      "id": 3816,
                       "name": "WorkerAnnounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2288,
-                      "src": "16329:15:7",
+                      "referencedDeclaration": 2112,
+                      "src": "16655:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 3984,
+                    "id": 3820,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26318,28 +26459,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16329:36:7",
+                    "src": "16655:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3985,
+                  "id": 3821,
                   "nodeType": "EmitStatement",
-                  "src": "16324:41:7"
+                  "src": "16650:41:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3986,
+                    "id": 3822,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16382:4:7",
+                    "src": "16708:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -26347,52 +26488,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3943,
-                  "id": 3987,
+                  "functionReturnParameters": 3779,
+                  "id": 3823,
                   "nodeType": "Return",
-                  "src": "16375:11:7"
+                  "src": "16701:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3989,
+            "id": 3825,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3940,
+                "id": 3776,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3939,
+                  "id": 3775,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16084:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "16410:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16084:13:7"
+                "src": "16410:13:6"
               }
             ],
             "name": "RegisterWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3938,
+              "id": 3774,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3937,
+                  "id": 3773,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3989,
-                  "src": "16060:15:7",
+                  "scope": 3825,
+                  "src": "16386:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -26400,10 +26541,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3936,
+                    "id": 3772,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16060:7:7",
+                    "src": "16386:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -26413,20 +26554,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16059:17:7"
+              "src": "16385:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3943,
+              "id": 3779,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3942,
+                  "id": 3778,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3989,
-                  "src": "16107:4:7",
+                  "scope": 3825,
+                  "src": "16433:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -26434,10 +26575,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3941,
+                    "id": 3777,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16107:4:7",
+                    "src": "16433:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -26447,19 +26588,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16106:6:7"
+              "src": "16432:6:6"
             },
-            "scope": 5229,
-            "src": "16036:357:7",
+            "scope": 5065,
+            "src": "16362:357:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4039,
+              "id": 3875,
               "nodeType": "Block",
-              "src": "16475:268:7",
+              "src": "16801:268:6",
               "statements": [
                 {
                   "expression": {
@@ -26471,7 +26612,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4006,
+                        "id": 3842,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26482,34 +26623,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3999,
+                              "id": 3835,
                               "name": "masterRequest",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2371,
-                              "src": "16493:13:7",
+                              "referencedDeclaration": 2195,
+                              "src": "16819:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 4002,
+                            "id": 3838,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4000,
+                                "id": 3836,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "16507:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "16833:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4001,
+                              "id": 3837,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -26517,7 +26658,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16507:10:7",
+                              "src": "16833:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -26528,21 +26669,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "16493:25:7",
+                            "src": "16819:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4004,
+                          "id": 3840,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4003,
+                            "id": 3839,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3991,
-                            "src": "16519:7:7",
+                            "referencedDeclaration": 3827,
+                            "src": "16845:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -26553,7 +26694,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16493:34:7",
+                          "src": "16819:34:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -26564,14 +26705,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 4005,
+                          "id": 3841,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16531:4:7",
+                          "src": "16857:4:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -26579,7 +26720,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "16493:42:7",
+                        "src": "16819:42:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -26593,21 +26734,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3998,
+                      "id": 3834,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16485:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16811:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4007,
+                    "id": 3843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26615,20 +26756,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16485:51:7",
+                    "src": "16811:51:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4008,
+                  "id": 3844,
                   "nodeType": "ExpressionStatement",
-                  "src": "16485:51:7"
+                  "src": "16811:51:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4014,
+                    "id": 3850,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26637,26 +26778,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4009,
+                        "id": 3845,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2361,
-                        "src": "16546:8:7",
+                        "referencedDeclaration": 2185,
+                        "src": "16872:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 4011,
+                      "id": 3847,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4010,
+                        "id": 3846,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16555:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "16881:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26667,7 +26808,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16546:17:7",
+                      "src": "16872:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -26679,18 +26820,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4012,
+                        "id": 3848,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "16566:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "16892:3:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4013,
+                      "id": 3849,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -26698,26 +26839,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "16566:10:7",
+                      "src": "16892:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "16546:30:7",
+                    "src": "16872:30:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4015,
+                  "id": 3851,
                   "nodeType": "ExpressionStatement",
-                  "src": "16546:30:7"
+                  "src": "16872:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4021,
+                    "id": 3857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26726,34 +26867,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4016,
+                        "id": 3852,
                         "name": "isMaster",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2365,
-                        "src": "16586:8:7",
+                        "referencedDeclaration": 2189,
+                        "src": "16912:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4019,
+                      "id": 3855,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4017,
+                          "id": 3853,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16595:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16921:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4018,
+                        "id": 3854,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26761,7 +26902,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16595:10:7",
+                        "src": "16921:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26772,7 +26913,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16586:20:7",
+                      "src": "16912:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26783,14 +26924,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4020,
+                      "id": 3856,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16609:4:7",
+                      "src": "16935:4:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -26798,20 +26939,20 @@
                       },
                       "value": "true"
                     },
-                    "src": "16586:27:7",
+                    "src": "16912:27:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4022,
+                  "id": 3858,
                   "nodeType": "ExpressionStatement",
-                  "src": "16586:27:7"
+                  "src": "16912:27:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4029,
+                    "id": 3865,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26819,41 +26960,41 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16623:41:7",
+                    "src": "16949:41:6",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4023,
+                          "id": 3859,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2371,
-                          "src": "16630:13:7",
+                          "referencedDeclaration": 2195,
+                          "src": "16956:13:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 4026,
+                        "id": 3862,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4024,
+                            "id": 3860,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "16644:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "16970:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4025,
+                          "id": 3861,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -26861,7 +27002,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16644:10:7",
+                          "src": "16970:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -26872,21 +27013,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16630:25:7",
+                        "src": "16956:25:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4028,
+                      "id": 3864,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4027,
+                        "id": 3863,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16656:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "16982:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26897,7 +27038,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16630:34:7",
+                      "src": "16956:34:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -26908,9 +27049,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4030,
+                  "id": 3866,
                   "nodeType": "ExpressionStatement",
-                  "src": "16623:41:7"
+                  "src": "16949:41:6"
                 },
                 {
                   "eventCall": {
@@ -26918,12 +27059,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4032,
+                        "id": 3868,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16695:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "17021:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26933,18 +27074,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4033,
+                          "id": 3869,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16704:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "17030:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4034,
+                        "id": 3870,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -26952,7 +27093,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16704:10:7",
+                        "src": "17030:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -26970,18 +27111,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4031,
+                      "id": 3867,
                       "name": "WorkerConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2294,
-                      "src": "16679:15:7",
+                      "referencedDeclaration": 2118,
+                      "src": "17005:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 4035,
+                    "id": 3871,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -26989,28 +27130,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16679:36:7",
+                    "src": "17005:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4036,
+                  "id": 3872,
                   "nodeType": "EmitStatement",
-                  "src": "16674:41:7"
+                  "src": "17000:41:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4037,
+                    "id": 3873,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16732:4:7",
+                    "src": "17058:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -27018,52 +27159,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3997,
-                  "id": 4038,
+                  "functionReturnParameters": 3833,
+                  "id": 3874,
                   "nodeType": "Return",
-                  "src": "16725:11:7"
+                  "src": "17051:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4040,
+            "id": 3876,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3994,
+                "id": 3830,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3993,
+                  "id": 3829,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16446:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "16772:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16446:13:7"
+                "src": "16772:13:6"
               }
             ],
             "name": "ConfirmWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3992,
+              "id": 3828,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3991,
+                  "id": 3827,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4040,
-                  "src": "16422:15:7",
+                  "scope": 3876,
+                  "src": "16748:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27071,10 +27212,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3990,
+                    "id": 3826,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16422:7:7",
+                    "src": "16748:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27084,20 +27225,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16421:17:7"
+              "src": "16747:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3997,
+              "id": 3833,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3996,
+                  "id": 3832,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4040,
-                  "src": "16469:4:7",
+                  "scope": 3876,
+                  "src": "16795:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27105,10 +27246,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3995,
+                    "id": 3831,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16469:4:7",
+                    "src": "16795:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -27118,19 +27259,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16468:6:7"
+              "src": "16794:6:6"
             },
-            "scope": 5229,
-            "src": "16399:344:7",
+            "scope": 5065,
+            "src": "16725:344:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4082,
+              "id": 3918,
               "nodeType": "Block",
-              "src": "16841:208:7",
+              "src": "17167:208:6",
               "statements": [
                 {
                   "expression": {
@@ -27142,7 +27283,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4067,
+                        "id": 3903,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -27153,7 +27294,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4056,
+                          "id": 3892,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -27163,12 +27304,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4053,
+                                "id": 3889,
                                 "name": "_worker",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4042,
-                                "src": "16869:7:7",
+                                "referencedDeclaration": 3878,
+                                "src": "17195:7:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -27182,18 +27323,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 4052,
+                              "id": 3888,
                               "name": "GetMaster",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4298,
-                              "src": "16859:9:7",
+                              "referencedDeclaration": 4134,
+                              "src": "17185:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                 "typeString": "function (address) view returns (address)"
                               }
                             },
-                            "id": 4054,
+                            "id": 3890,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -27201,7 +27342,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "16859:18:7",
+                            "src": "17185:18:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -27211,18 +27352,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4055,
+                            "id": 3891,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4044,
-                            "src": "16881:7:7",
+                            "referencedDeclaration": 3880,
+                            "src": "17207:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "16859:29:7",
+                          "src": "17185:29:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -27239,7 +27380,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 4065,
+                              "id": 3901,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -27250,7 +27391,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4060,
+                                "id": 3896,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -27259,18 +27400,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4057,
+                                    "id": 3893,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "16893:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "17219:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 4058,
+                                  "id": 3894,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -27278,7 +27419,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16893:10:7",
+                                  "src": "17219:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -27288,18 +27429,18 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 4059,
+                                  "id": 3895,
                                   "name": "_worker",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4042,
-                                  "src": "16907:7:7",
+                                  "referencedDeclaration": 3878,
+                                  "src": "17233:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16893:21:7",
+                                "src": "17219:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -27313,7 +27454,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4064,
+                                "id": 3900,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -27322,18 +27463,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4061,
+                                    "id": 3897,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "16918:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "17244:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 4062,
+                                  "id": 3898,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -27341,7 +27482,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16918:10:7",
+                                  "src": "17244:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -27351,44 +27492,44 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 4063,
+                                  "id": 3899,
                                   "name": "_master",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4044,
-                                  "src": "16932:7:7",
+                                  "referencedDeclaration": 3880,
+                                  "src": "17258:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16918:21:7",
+                                "src": "17244:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "16893:46:7",
+                              "src": "17219:46:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 4066,
+                          "id": 3902,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "16892:48:7",
+                          "src": "17218:48:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "16859:81:7",
+                        "src": "17185:81:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -27402,21 +27543,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4051,
+                      "id": 3887,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16851:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "17177:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4068,
+                    "id": 3904,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27424,20 +27565,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16851:90:7",
+                    "src": "17177:90:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4069,
+                  "id": 3905,
                   "nodeType": "ExpressionStatement",
-                  "src": "16851:90:7"
+                  "src": "17177:90:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4073,
+                    "id": 3909,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27445,31 +27586,31 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16951:24:7",
+                    "src": "17277:24:6",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4070,
+                        "id": 3906,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2361,
-                        "src": "16958:8:7",
+                        "referencedDeclaration": 2185,
+                        "src": "17284:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 4072,
+                      "id": 3908,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4071,
+                        "id": 3907,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4042,
-                        "src": "16967:7:7",
+                        "referencedDeclaration": 3878,
+                        "src": "17293:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27480,7 +27621,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16958:17:7",
+                      "src": "17284:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -27491,9 +27632,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4074,
+                  "id": 3910,
                   "nodeType": "ExpressionStatement",
-                  "src": "16951:24:7"
+                  "src": "17277:24:6"
                 },
                 {
                   "eventCall": {
@@ -27501,12 +27642,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4076,
+                        "id": 3912,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4042,
-                        "src": "17004:7:7",
+                        "referencedDeclaration": 3878,
+                        "src": "17330:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27514,12 +27655,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4077,
+                        "id": 3913,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4044,
-                        "src": "17013:7:7",
+                        "referencedDeclaration": 3880,
+                        "src": "17339:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27537,18 +27678,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4075,
+                      "id": 3911,
                       "name": "WorkerRemoved",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2300,
-                      "src": "16990:13:7",
+                      "referencedDeclaration": 2124,
+                      "src": "17316:13:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 4078,
+                    "id": 3914,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -27556,28 +27697,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16990:31:7",
+                    "src": "17316:31:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4079,
+                  "id": 3915,
                   "nodeType": "EmitStatement",
-                  "src": "16985:36:7"
+                  "src": "17311:36:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4080,
+                    "id": 3916,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "17038:4:7",
+                    "src": "17364:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -27585,52 +27726,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4050,
-                  "id": 4081,
+                  "functionReturnParameters": 3886,
+                  "id": 3917,
                   "nodeType": "Return",
-                  "src": "17031:11:7"
+                  "src": "17357:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4083,
+            "id": 3919,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4047,
+                "id": 3883,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4046,
+                  "id": 3882,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16812:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "17138:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16812:13:7"
+                "src": "17138:13:6"
               }
             ],
             "name": "RemoveWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4045,
+              "id": 3881,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4042,
+                  "id": 3878,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16771:15:7",
+                  "scope": 3919,
+                  "src": "17097:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27638,10 +27779,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4041,
+                    "id": 3877,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16771:7:7",
+                    "src": "17097:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27652,11 +27793,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4044,
+                  "id": 3880,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16788:15:7",
+                  "scope": 3919,
+                  "src": "17114:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27664,10 +27805,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4043,
+                    "id": 3879,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16788:7:7",
+                    "src": "17114:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -27677,20 +27818,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16770:34:7"
+              "src": "17096:34:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4050,
+              "id": 3886,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4049,
+                  "id": 3885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16835:4:7",
+                  "scope": 3919,
+                  "src": "17161:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -27698,10 +27839,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4048,
+                    "id": 3884,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16835:4:7",
+                    "src": "17161:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -27711,47 +27852,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16834:6:7"
+              "src": "17160:6:6"
             },
-            "scope": 5229,
-            "src": "16749:300:7",
+            "scope": 5065,
+            "src": "17075:300:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4142,
+              "id": 3978,
               "nodeType": "Block",
-              "src": "17442:348:7",
+              "src": "17768:348:6",
               "statements": [
                 {
                   "assignments": [
-                    4113
+                    3949
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4113,
+                      "id": 3949,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4143,
-                      "src": "17452:18:7",
+                      "scope": 3979,
+                      "src": "17778:18:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4112,
+                        "id": 3948,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "17452:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "17778:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -27759,31 +27900,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4117,
+                  "id": 3953,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4114,
+                      "id": 3950,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "17473:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "17799:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 4116,
+                    "id": 3952,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4115,
+                      "id": 3951,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4085,
-                      "src": "17480:7:7",
+                      "referencedDeclaration": 3921,
+                      "src": "17806:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -27794,14 +27935,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17473:15:7",
+                    "src": "17799:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17452:36:7"
+                  "src": "17778:36:6"
                 },
                 {
                   "expression": {
@@ -27811,28 +27952,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4118,
+                          "id": 3954,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17515:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17841:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4119,
+                        "id": 3955,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2214,
-                        "src": "17515:15:7",
+                        "referencedDeclaration": 2038,
+                        "src": "17841:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -27840,26 +27981,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4120,
+                          "id": 3956,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17540:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17866:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4121,
+                        "id": 3957,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2218,
-                        "src": "17540:12:7",
+                        "referencedDeclaration": 2042,
+                        "src": "17866:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27869,26 +28010,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4122,
+                          "id": 3958,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17562:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17888:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4123,
+                        "id": 3959,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "counterparty",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2220,
-                        "src": "17562:18:7",
+                        "referencedDeclaration": 2044,
+                        "src": "17888:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -27898,26 +28039,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4124,
+                          "id": 3960,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17590:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17916:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4125,
+                        "id": 3961,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2222,
-                        "src": "17590:14:7",
+                        "referencedDeclaration": 2046,
+                        "src": "17916:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -27927,26 +28068,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4126,
+                          "id": 3962,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17614:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17940:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4127,
+                        "id": 3963,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2224,
-                        "src": "17614:11:7",
+                        "referencedDeclaration": 2048,
+                        "src": "17940:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -27956,26 +28097,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4128,
+                          "id": 3964,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17635:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17961:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4129,
+                        "id": 3965,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "17635:14:7",
+                        "referencedDeclaration": 2051,
+                        "src": "17961:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -27985,28 +28126,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4130,
+                          "id": 3966,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17659:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17985:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4131,
+                        "id": 3967,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "identityLevel",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2229,
-                        "src": "17659:19:7",
+                        "referencedDeclaration": 2053,
+                        "src": "17985:19:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -28014,26 +28155,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4132,
+                          "id": 3968,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17688:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18014:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4133,
+                        "id": 3969,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blacklist",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2231,
-                        "src": "17688:15:7",
+                        "referencedDeclaration": 2055,
+                        "src": "18014:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28043,26 +28184,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4134,
+                          "id": 3970,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17713:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18039:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4135,
+                        "id": 3971,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "tag",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2233,
-                        "src": "17713:9:7",
+                        "referencedDeclaration": 2057,
+                        "src": "18039:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -28072,26 +28213,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4136,
+                          "id": 3972,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17732:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18058:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4137,
+                        "id": 3973,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "17732:16:7",
+                        "referencedDeclaration": 2060,
+                        "src": "18058:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -28101,54 +28242,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4138,
+                          "id": 3974,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17758:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18084:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4139,
+                        "id": 3975,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "frozenSum",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2238,
-                        "src": "17758:15:7",
+                        "referencedDeclaration": 2062,
+                        "src": "18084:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4140,
+                    "id": 3976,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17505:278:7",
+                    "src": "17831:278:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$2168_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$1992_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$10343_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderType,address,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4111,
-                  "id": 4141,
+                  "functionReturnParameters": 3947,
+                  "id": 3977,
                   "nodeType": "Return",
-                  "src": "17498:285:7"
+                  "src": "17824:285:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4143,
+            "id": 3979,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -28156,16 +28297,16 @@
             "name": "GetOrderInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4086,
+              "id": 3922,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4085,
+                  "id": 3921,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17093:12:7",
+                  "scope": 3979,
+                  "src": "17419:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28173,10 +28314,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4084,
+                    "id": 3920,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17093:4:7",
+                    "src": "17419:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28186,35 +28327,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17092:14:7"
+              "src": "17418:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4111,
+              "id": 3947,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4088,
+                  "id": 3924,
                   "name": "orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17141:19:7",
+                  "scope": 3979,
+                  "src": "17467:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4087,
+                    "id": 3923,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "17141:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "17467:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -28223,11 +28364,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4090,
+                  "id": 3926,
                   "name": "author",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17170:14:7",
+                  "scope": 3979,
+                  "src": "17496:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28235,10 +28376,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4089,
+                    "id": 3925,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17170:7:7",
+                    "src": "17496:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28249,11 +28390,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4092,
+                  "id": 3928,
                   "name": "counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17194:20:7",
+                  "scope": 3979,
+                  "src": "17520:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28261,10 +28402,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4091,
+                    "id": 3927,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17194:7:7",
+                    "src": "17520:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28275,11 +28416,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4094,
+                  "id": 3930,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17224:13:7",
+                  "scope": 3979,
+                  "src": "17550:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28287,10 +28428,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4093,
+                    "id": 3929,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17224:4:7",
+                    "src": "17550:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28301,11 +28442,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4096,
+                  "id": 3932,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17247:10:7",
+                  "scope": 3979,
+                  "src": "17573:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28313,10 +28454,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4095,
+                    "id": 3931,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17247:4:7",
+                    "src": "17573:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28327,11 +28468,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4099,
+                  "id": 3935,
                   "name": "netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17267:15:7",
+                  "scope": 3979,
+                  "src": "17593:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28340,19 +28481,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4097,
+                      "id": 3933,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17267:4:7",
+                      "src": "17593:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 4098,
+                    "id": 3934,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17267:6:7",
+                    "src": "17593:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -28363,26 +28504,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4101,
+                  "id": 3937,
                   "name": "identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17292:43:7",
+                  "scope": 3979,
+                  "src": "17618:43:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4100,
+                    "id": 3936,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
-                    "src": "17292:29:7",
+                    "referencedDeclaration": 10343,
+                    "src": "17618:29:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -28391,11 +28532,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4103,
+                  "id": 3939,
                   "name": "blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17345:17:7",
+                  "scope": 3979,
+                  "src": "17671:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28403,10 +28544,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4102,
+                    "id": 3938,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17345:7:7",
+                    "src": "17671:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -28417,11 +28558,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4105,
+                  "id": 3941,
                   "name": "tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17372:11:7",
+                  "scope": 3979,
+                  "src": "17698:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28429,10 +28570,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 4104,
+                    "id": 3940,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17372:7:7",
+                    "src": "17698:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -28443,11 +28584,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4108,
+                  "id": 3944,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17393:19:7",
+                  "scope": 3979,
+                  "src": "17719:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28456,19 +28597,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4106,
+                      "id": 3942,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17393:6:7",
+                      "src": "17719:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 4107,
+                    "id": 3943,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17393:8:7",
+                    "src": "17719:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -28479,11 +28620,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4110,
+                  "id": 3946,
                   "name": "frozenSum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17422:14:7",
+                  "scope": 3979,
+                  "src": "17748:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28491,10 +28632,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4109,
+                    "id": 3945,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17422:4:7",
+                    "src": "17748:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28504,47 +28645,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17131:311:7"
+              "src": "17457:311:6"
             },
-            "scope": 5229,
-            "src": "17071:719:7",
+            "scope": 5065,
+            "src": "17397:719:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4164,
+              "id": 4000,
               "nodeType": "Block",
-              "src": "17919:129:7",
+              "src": "18245:129:6",
               "statements": [
                 {
                   "assignments": [
-                    4153
+                    3989
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4153,
+                      "id": 3989,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4165,
-                      "src": "17929:18:7",
+                      "scope": 4001,
+                      "src": "18255:18:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4152,
+                        "id": 3988,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "17929:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "18255:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -28552,31 +28693,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4157,
+                  "id": 3993,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4154,
+                      "id": 3990,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "17950:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "18276:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 4156,
+                    "id": 3992,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4155,
+                      "id": 3991,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4145,
-                      "src": "17957:7:7",
+                      "referencedDeclaration": 3981,
+                      "src": "18283:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -28587,14 +28728,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17950:15:7",
+                    "src": "18276:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17929:36:7"
+                  "src": "18255:36:6"
                 },
                 {
                   "expression": {
@@ -28604,28 +28745,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4158,
+                          "id": 3994,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4153,
-                          "src": "17992:5:7",
+                          "referencedDeclaration": 3989,
+                          "src": "18318:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4159,
+                        "id": 3995,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderStatus",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2216,
-                        "src": "17992:17:7",
+                        "referencedDeclaration": 2040,
+                        "src": "18318:17:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         }
                       },
@@ -28633,54 +28774,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4160,
+                          "id": 3996,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4153,
-                          "src": "18019:5:7",
+                          "referencedDeclaration": 3989,
+                          "src": "18345:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4161,
+                        "id": 3997,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2240,
-                        "src": "18019:12:7",
+                        "referencedDeclaration": 2064,
+                        "src": "18345:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4162,
+                    "id": 3998,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17982:59:7",
+                    "src": "18308:59:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$2172_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$1996_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderStatus,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4151,
-                  "id": 4163,
+                  "functionReturnParameters": 3987,
+                  "id": 3999,
                   "nodeType": "Return",
-                  "src": "17975:66:7"
+                  "src": "18301:66:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4165,
+            "id": 4001,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -28688,16 +28829,16 @@
             "name": "GetOrderParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4146,
+              "id": 3982,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4145,
+                  "id": 3981,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17821:12:7",
+                  "scope": 4001,
+                  "src": "18147:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28705,10 +28846,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4144,
+                    "id": 3980,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17821:4:7",
+                    "src": "18147:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28718,35 +28859,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17820:14:7"
+              "src": "18146:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4151,
+              "id": 3987,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4148,
+                  "id": 3984,
                   "name": "orderStatus",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17869:23:7",
+                  "scope": 4001,
+                  "src": "18195:23:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                    "typeIdentifier": "t_enum$_OrderStatus_$1996",
                     "typeString": "enum Market.OrderStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4147,
+                    "id": 3983,
                     "name": "OrderStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2172,
-                    "src": "17869:11:7",
+                    "referencedDeclaration": 1996,
+                    "src": "18195:11:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
@@ -28755,11 +28896,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4150,
+                  "id": 3986,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17902:11:7",
+                  "scope": 4001,
+                  "src": "18228:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -28767,10 +28908,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4149,
+                    "id": 3985,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17902:4:7",
+                    "src": "18228:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -28780,19 +28921,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17859:60:7"
+              "src": "18185:60:6"
             },
-            "scope": 5229,
-            "src": "17797:251:7",
+            "scope": 5065,
+            "src": "18123:251:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4215,
+              "id": 4051,
               "nodeType": "Block",
-              "src": "18293:260:7",
+              "src": "18619:260:6",
               "statements": [
                 {
                   "expression": {
@@ -28804,26 +28945,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4185,
+                            "id": 4021,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18320:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18646:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4187,
+                          "id": 4023,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4186,
+                            "id": 4022,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18326:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18652:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28834,21 +28975,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18320:13:7",
+                          "src": "18646:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4188,
+                        "id": 4024,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2185,
-                        "src": "18320:24:7",
+                        "referencedDeclaration": 2009,
+                        "src": "18646:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage",
                           "typeString": "uint64[] storage ref"
@@ -28860,26 +29001,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4189,
+                            "id": 4025,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18354:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18680:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4191,
+                          "id": 4027,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4190,
+                            "id": 4026,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18360:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18686:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28890,21 +29031,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18354:13:7",
+                          "src": "18680:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4192,
+                        "id": 4028,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "supplierID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2187,
-                        "src": "18354:24:7",
+                        "referencedDeclaration": 2011,
+                        "src": "18680:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28916,26 +29057,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4193,
+                            "id": 4029,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18388:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18714:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4195,
+                          "id": 4031,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4194,
+                            "id": 4030,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18394:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18720:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -28946,21 +29087,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18388:13:7",
+                          "src": "18714:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4196,
+                        "id": 4032,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "consumerID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2189,
-                        "src": "18388:24:7",
+                        "referencedDeclaration": 2013,
+                        "src": "18714:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -28972,26 +29113,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4197,
+                            "id": 4033,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18422:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18748:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4199,
+                          "id": 4035,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4198,
+                            "id": 4034,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18428:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18754:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29002,21 +29143,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18422:13:7",
+                          "src": "18748:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4200,
+                        "id": 4036,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "masterID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2191,
-                        "src": "18422:22:7",
+                        "referencedDeclaration": 2015,
+                        "src": "18748:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -29028,26 +29169,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4201,
+                            "id": 4037,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18454:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18780:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4203,
+                          "id": 4039,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4202,
+                            "id": 4038,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18460:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18786:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29058,21 +29199,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18454:13:7",
+                          "src": "18780:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4204,
+                        "id": 4040,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "askID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2193,
-                        "src": "18454:19:7",
+                        "referencedDeclaration": 2017,
+                        "src": "18780:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29084,26 +29225,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4205,
+                            "id": 4041,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18483:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18809:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4207,
+                          "id": 4043,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4206,
+                            "id": 4042,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18489:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18815:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29114,21 +29255,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18483:13:7",
+                          "src": "18809:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4208,
+                        "id": 4044,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "bidID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2195,
-                        "src": "18483:19:7",
+                        "referencedDeclaration": 2019,
+                        "src": "18809:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29140,26 +29281,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4209,
+                            "id": 4045,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18512:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18838:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4211,
+                          "id": 4047,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4210,
+                            "id": 4046,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18518:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18844:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29170,49 +29311,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18512:13:7",
+                          "src": "18838:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4212,
+                        "id": 4048,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "startTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2201,
-                        "src": "18512:23:7",
+                        "referencedDeclaration": 2025,
+                        "src": "18838:23:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4213,
+                    "id": 4049,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18310:236:7",
+                    "src": "18636:236:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_array$_t_uint64_$dyn_storage_$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint64[] storage ref,address,address,address,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4184,
-                  "id": 4214,
+                  "functionReturnParameters": 4020,
+                  "id": 4050,
                   "nodeType": "Return",
-                  "src": "18303:243:7"
+                  "src": "18629:243:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4216,
+            "id": 4052,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -29220,16 +29361,16 @@
             "name": "GetDealInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4168,
+              "id": 4004,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4167,
+                  "id": 4003,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18075:11:7",
+                  "scope": 4052,
+                  "src": "18401:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29237,10 +29378,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4166,
+                    "id": 4002,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18075:4:7",
+                    "src": "18401:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29250,20 +29391,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18074:13:7"
+              "src": "18400:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4184,
+              "id": 4020,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4171,
+                  "id": 4007,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18122:19:7",
+                  "scope": 4052,
+                  "src": "18448:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29272,19 +29413,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4169,
+                      "id": 4005,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "18122:6:7",
+                      "src": "18448:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 4170,
+                    "id": 4006,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "18122:8:7",
+                    "src": "18448:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -29295,11 +29436,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4173,
+                  "id": 4009,
                   "name": "supplierID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18151:18:7",
+                  "scope": 4052,
+                  "src": "18477:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29307,10 +29448,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4172,
+                    "id": 4008,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18151:7:7",
+                    "src": "18477:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29321,11 +29462,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4175,
+                  "id": 4011,
                   "name": "consumerID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18179:18:7",
+                  "scope": 4052,
+                  "src": "18505:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29333,10 +29474,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4174,
+                    "id": 4010,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18179:7:7",
+                    "src": "18505:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29347,11 +29488,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4177,
+                  "id": 4013,
                   "name": "masterID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18207:16:7",
+                  "scope": 4052,
+                  "src": "18533:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29359,10 +29500,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4176,
+                    "id": 4012,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18207:7:7",
+                    "src": "18533:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -29373,11 +29514,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4179,
+                  "id": 4015,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18233:10:7",
+                  "scope": 4052,
+                  "src": "18559:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29385,10 +29526,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4178,
+                    "id": 4014,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18233:4:7",
+                    "src": "18559:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29399,11 +29540,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4181,
+                  "id": 4017,
                   "name": "bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18253:10:7",
+                  "scope": 4052,
+                  "src": "18579:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29411,10 +29552,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4180,
+                    "id": 4016,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18253:4:7",
+                    "src": "18579:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29425,11 +29566,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4183,
+                  "id": 4019,
                   "name": "startTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18273:14:7",
+                  "scope": 4052,
+                  "src": "18599:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29437,10 +29578,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4182,
+                    "id": 4018,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18273:4:7",
+                    "src": "18599:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29450,19 +29591,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18112:181:7"
+              "src": "18438:181:6"
             },
-            "scope": 5229,
-            "src": "18054:499:7",
+            "scope": 5065,
+            "src": "18380:499:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4265,
+              "id": 4101,
               "nodeType": "Block",
-              "src": "18797:263:7",
+              "src": "19123:263:6",
               "statements": [
                 {
                   "expression": {
@@ -29474,26 +29615,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4235,
+                            "id": 4071,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18824:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19150:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4237,
+                          "id": 4073,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4236,
+                            "id": 4072,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18830:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19156:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29504,21 +29645,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18824:13:7",
+                          "src": "19150:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4238,
+                        "id": 4074,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2197,
-                        "src": "18824:22:7",
+                        "referencedDeclaration": 2021,
+                        "src": "19150:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29530,26 +29671,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4239,
+                            "id": 4075,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18856:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19182:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4241,
+                          "id": 4077,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4240,
+                            "id": 4076,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18862:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19188:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29560,21 +29701,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18856:13:7",
+                          "src": "19182:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4242,
+                        "id": 4078,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2199,
-                        "src": "18856:19:7",
+                        "referencedDeclaration": 2023,
+                        "src": "19182:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29586,26 +29727,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4243,
+                            "id": 4079,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18885:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19211:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4245,
+                          "id": 4081,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4244,
+                            "id": 4080,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18891:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19217:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29616,21 +29757,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18885:13:7",
+                          "src": "19211:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4246,
+                        "id": 4082,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2203,
-                        "src": "18885:21:7",
+                        "referencedDeclaration": 2027,
+                        "src": "19211:21:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29642,26 +29783,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4247,
+                            "id": 4083,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18916:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19242:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4249,
+                          "id": 4085,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4248,
+                            "id": 4084,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18922:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19248:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29672,23 +29813,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18916:13:7",
+                          "src": "19242:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4250,
+                        "id": 4086,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2205,
-                        "src": "18916:20:7",
+                        "referencedDeclaration": 2029,
+                        "src": "19242:20:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         }
                       },
@@ -29698,26 +29839,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4251,
+                            "id": 4087,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18946:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19272:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4253,
+                          "id": 4089,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4252,
+                            "id": 4088,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18952:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19278:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29728,21 +29869,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18946:13:7",
+                          "src": "19272:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4254,
+                        "id": 4090,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blockedBalance",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2207,
-                        "src": "18946:28:7",
+                        "referencedDeclaration": 2031,
+                        "src": "19272:28:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29754,26 +29895,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4255,
+                            "id": 4091,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18984:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19310:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4257,
+                          "id": 4093,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4256,
+                            "id": 4092,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18990:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19316:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29784,21 +29925,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18984:13:7",
+                          "src": "19310:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4258,
+                        "id": 4094,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "totalPayout",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2209,
-                        "src": "18984:25:7",
+                        "referencedDeclaration": 2033,
+                        "src": "19310:25:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -29810,26 +29951,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4259,
+                            "id": 4095,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "19019:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19345:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4261,
+                          "id": 4097,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4260,
+                            "id": 4096,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "19025:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19351:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -29840,49 +29981,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19019:13:7",
+                          "src": "19345:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4262,
+                        "id": 4098,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2211,
-                        "src": "19019:24:7",
+                        "referencedDeclaration": 2035,
+                        "src": "19345:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4263,
+                    "id": 4099,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18814:239:7",
+                    "src": "19140:239:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$2164_$_t_uint256_$_t_uint256_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$1988_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint256,uint256,uint256,enum Market.DealStatus,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4234,
-                  "id": 4264,
+                  "functionReturnParameters": 4070,
+                  "id": 4100,
                   "nodeType": "Return",
-                  "src": "18807:246:7"
+                  "src": "19133:246:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4266,
+            "id": 4102,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -29890,16 +30031,16 @@
             "name": "GetDealParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4219,
+              "id": 4055,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4218,
+                  "id": 4054,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18582:11:7",
+                  "scope": 4102,
+                  "src": "18908:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29907,10 +30048,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4217,
+                    "id": 4053,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18582:4:7",
+                    "src": "18908:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29920,20 +30061,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18581:13:7"
+              "src": "18907:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4234,
+              "id": 4070,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4221,
+                  "id": 4057,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18629:13:7",
+                  "scope": 4102,
+                  "src": "18955:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29941,10 +30082,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4220,
+                    "id": 4056,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18629:4:7",
+                    "src": "18955:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29955,11 +30096,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4223,
+                  "id": 4059,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18652:10:7",
+                  "scope": 4102,
+                  "src": "18978:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29967,10 +30108,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4222,
+                    "id": 4058,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18652:4:7",
+                    "src": "18978:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -29981,11 +30122,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4225,
+                  "id": 4061,
                   "name": "endTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18672:12:7",
+                  "scope": 4102,
+                  "src": "18998:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -29993,10 +30134,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4224,
+                    "id": 4060,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18672:4:7",
+                    "src": "18998:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30007,26 +30148,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4227,
+                  "id": 4063,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18694:17:7",
+                  "scope": 4102,
+                  "src": "19020:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$2164",
+                    "typeIdentifier": "t_enum$_DealStatus_$1988",
                     "typeString": "enum Market.DealStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4226,
+                    "id": 4062,
                     "name": "DealStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2164,
-                    "src": "18694:10:7",
+                    "referencedDeclaration": 1988,
+                    "src": "19020:10:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
@@ -30035,11 +30176,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4229,
+                  "id": 4065,
                   "name": "blockedBalance",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18721:19:7",
+                  "scope": 4102,
+                  "src": "19047:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30047,10 +30188,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4228,
+                    "id": 4064,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18721:4:7",
+                    "src": "19047:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30061,11 +30202,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4231,
+                  "id": 4067,
                   "name": "totalPayout",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18750:16:7",
+                  "scope": 4102,
+                  "src": "19076:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30073,10 +30214,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4230,
+                    "id": 4066,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18750:4:7",
+                    "src": "19076:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30087,11 +30228,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4233,
+                  "id": 4069,
                   "name": "lastBillTS",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18776:15:7",
+                  "scope": 4102,
+                  "src": "19102:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30099,10 +30240,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4232,
+                    "id": 4068,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18776:4:7",
+                    "src": "19102:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30112,19 +30253,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18619:178:7"
+              "src": "18945:178:6"
             },
-            "scope": 5229,
-            "src": "18559:501:7",
+            "scope": 5065,
+            "src": "18885:501:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4297,
+              "id": 4133,
               "nodeType": "Block",
-              "src": "19139:176:7",
+              "src": "19465:176:6",
               "statements": [
                 {
                   "condition": {
@@ -30133,7 +30274,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 4283,
+                    "id": 4119,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -30144,7 +30285,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4277,
+                      "id": 4113,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -30153,26 +30294,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4273,
+                          "id": 4109,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2361,
-                          "src": "19153:8:7",
+                          "referencedDeclaration": 2185,
+                          "src": "19479:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 4275,
+                        "id": 4111,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4274,
+                          "id": 4110,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4268,
-                          "src": "19162:7:7",
+                          "referencedDeclaration": 4104,
+                          "src": "19488:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -30183,7 +30324,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19153:17:7",
+                        "src": "19479:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -30194,14 +30335,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "307830",
-                        "id": 4276,
+                        "id": 4112,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "19174:3:7",
+                        "src": "19500:3:6",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -30209,7 +30350,7 @@
                         },
                         "value": "0x0"
                       },
-                      "src": "19153:24:7",
+                      "src": "19479:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -30223,7 +30364,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4282,
+                      "id": 4118,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -30232,26 +30373,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4278,
+                          "id": 4114,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2361,
-                          "src": "19181:8:7",
+                          "referencedDeclaration": 2185,
+                          "src": "19507:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 4280,
+                        "id": 4116,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4279,
+                          "id": 4115,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4268,
-                          "src": "19190:7:7",
+                          "referencedDeclaration": 4104,
+                          "src": "19516:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -30262,7 +30403,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19181:17:7",
+                        "src": "19507:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -30272,50 +30413,50 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4281,
+                        "id": 4117,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4268,
-                        "src": "19202:7:7",
+                        "referencedDeclaration": 4104,
+                        "src": "19528:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "19181:28:7",
+                      "src": "19507:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "19153:56:7",
+                    "src": "19479:56:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 4295,
+                    "id": 4131,
                     "nodeType": "Block",
-                    "src": "19258:51:7",
+                    "src": "19584:51:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4293,
+                          "id": 4129,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4289,
+                            "id": 4125,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4271,
-                            "src": "19272:6:7",
+                            "referencedDeclaration": 4107,
+                            "src": "19598:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -30327,26 +30468,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4290,
+                              "id": 4126,
                               "name": "masterOf",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2361,
-                              "src": "19281:8:7",
+                              "referencedDeclaration": 2185,
+                              "src": "19607:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                                 "typeString": "mapping(address => address)"
                               }
                             },
-                            "id": 4292,
+                            "id": 4128,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4291,
+                              "id": 4127,
                               "name": "_worker",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4268,
-                              "src": "19290:7:7",
+                              "referencedDeclaration": 4104,
+                              "src": "19616:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -30357,48 +30498,48 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "19281:17:7",
+                            "src": "19607:17:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19272:26:7",
+                          "src": "19598:26:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4294,
+                        "id": 4130,
                         "nodeType": "ExpressionStatement",
-                        "src": "19272:26:7"
+                        "src": "19598:26:6"
                       }
                     ]
                   },
-                  "id": 4296,
+                  "id": 4132,
                   "nodeType": "IfStatement",
-                  "src": "19149:160:7",
+                  "src": "19475:160:6",
                   "trueBody": {
-                    "id": 4288,
+                    "id": 4124,
                     "nodeType": "Block",
-                    "src": "19211:41:7",
+                    "src": "19537:41:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4286,
+                          "id": 4122,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4284,
+                            "id": 4120,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4271,
-                            "src": "19225:6:7",
+                            "referencedDeclaration": 4107,
+                            "src": "19551:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -30408,26 +30549,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 4285,
+                            "id": 4121,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4268,
-                            "src": "19234:7:7",
+                            "referencedDeclaration": 4104,
+                            "src": "19560:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19225:16:7",
+                          "src": "19551:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4287,
+                        "id": 4123,
                         "nodeType": "ExpressionStatement",
-                        "src": "19225:16:7"
+                        "src": "19551:16:6"
                       }
                     ]
                   }
@@ -30435,7 +30576,7 @@
               ]
             },
             "documentation": null,
-            "id": 4298,
+            "id": 4134,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -30443,16 +30584,16 @@
             "name": "GetMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4269,
+              "id": 4105,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4268,
+                  "id": 4104,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4298,
-                  "src": "19085:15:7",
+                  "scope": 4134,
+                  "src": "19411:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30460,10 +30601,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4267,
+                    "id": 4103,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19085:7:7",
+                    "src": "19411:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -30473,20 +30614,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19084:17:7"
+              "src": "19410:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4272,
+              "id": 4108,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4271,
+                  "id": 4107,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4298,
-                  "src": "19123:14:7",
+                  "scope": 4134,
+                  "src": "19449:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30494,10 +30635,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4270,
+                    "id": 4106,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19123:7:7",
+                    "src": "19449:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -30507,19 +30648,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19122:16:7"
+              "src": "19448:16:6"
             },
-            "scope": 5229,
-            "src": "19066:249:7",
+            "scope": 5065,
+            "src": "19392:249:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4335,
+              "id": 4171,
               "nodeType": "Block",
-              "src": "19528:250:7",
+              "src": "19854:250:6",
               "statements": [
                 {
                   "expression": {
@@ -30531,26 +30672,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4313,
+                            "id": 4149,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19555:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19881:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4315,
+                          "id": 4151,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4314,
+                            "id": 4150,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19564:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19890:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30561,21 +30702,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19555:25:7",
+                          "src": "19881:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4316,
+                        "id": 4152,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2243,
-                        "src": "19555:32:7",
+                        "referencedDeclaration": 2067,
+                        "src": "19881:32:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30587,26 +30728,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4317,
+                            "id": 4153,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19597:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19923:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4319,
+                          "id": 4155,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4318,
+                            "id": 4154,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19606:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19932:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30617,23 +30758,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19597:25:7",
+                          "src": "19923:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4320,
+                        "id": 4156,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "requestType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2245,
-                        "src": "19597:37:7",
+                        "referencedDeclaration": 2069,
+                        "src": "19923:37:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -30643,26 +30784,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4321,
+                            "id": 4157,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19644:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19970:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4323,
+                          "id": 4159,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4322,
+                            "id": 4158,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19653:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19979:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30673,21 +30814,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19644:25:7",
+                          "src": "19970:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4324,
+                        "id": 4160,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2247,
-                        "src": "19644:31:7",
+                        "referencedDeclaration": 2071,
+                        "src": "19970:31:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30699,26 +30840,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4325,
+                            "id": 4161,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19685:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "20011:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4327,
+                          "id": 4163,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4326,
+                            "id": 4162,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19694:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "20020:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30729,21 +30870,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19685:25:7",
+                          "src": "20011:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4328,
+                        "id": 4164,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2249,
-                        "src": "19685:34:7",
+                        "referencedDeclaration": 2073,
+                        "src": "20011:34:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -30755,26 +30896,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4329,
+                            "id": 4165,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19729:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "20055:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4331,
+                          "id": 4167,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4330,
+                            "id": 4166,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19738:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "20064:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -30785,49 +30926,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19729:25:7",
+                          "src": "20055:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4332,
+                        "id": 4168,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2251,
-                        "src": "19729:32:7",
+                        "referencedDeclaration": 2075,
+                        "src": "20055:32:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2002",
                           "typeString": "enum Market.RequestStatus"
                         }
                       }
                     ],
-                    "id": 4333,
+                    "id": 4169,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "19545:226:7",
+                    "src": "19871:226:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$2168_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2178_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$1992_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2002_$",
                       "typeString": "tuple(uint256,enum Market.OrderType,uint256,uint256,enum Market.RequestStatus)"
                     }
                   },
-                  "functionReturnParameters": 4312,
-                  "id": 4334,
+                  "functionReturnParameters": 4148,
+                  "id": 4170,
                   "nodeType": "Return",
-                  "src": "19538:233:7"
+                  "src": "19864:233:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4336,
+            "id": 4172,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -30835,16 +30976,16 @@
             "name": "GetChangeRequestInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4301,
+              "id": 4137,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4300,
+                  "id": 4136,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19351:20:7",
+                  "scope": 4172,
+                  "src": "19677:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30852,10 +30993,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4299,
+                    "id": 4135,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19351:4:7",
+                    "src": "19677:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30865,20 +31006,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19350:22:7"
+              "src": "19676:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4312,
+              "id": 4148,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4303,
+                  "id": 4139,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19407:11:7",
+                  "scope": 4172,
+                  "src": "19733:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30886,10 +31027,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4302,
+                    "id": 4138,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19407:4:7",
+                    "src": "19733:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30900,26 +31041,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4305,
+                  "id": 4141,
                   "name": "requestType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19428:21:7",
+                  "scope": 4172,
+                  "src": "19754:21:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4304,
+                    "id": 4140,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "19428:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "19754:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -30928,11 +31069,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4307,
+                  "id": 4143,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19459:10:7",
+                  "scope": 4172,
+                  "src": "19785:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30940,10 +31081,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4306,
+                    "id": 4142,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19459:4:7",
+                    "src": "19785:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30954,11 +31095,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4309,
+                  "id": 4145,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19479:13:7",
+                  "scope": 4172,
+                  "src": "19805:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -30966,10 +31107,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4308,
+                    "id": 4144,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19479:4:7",
+                    "src": "19805:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -30980,26 +31121,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4311,
+                  "id": 4147,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19502:20:7",
+                  "scope": 4172,
+                  "src": "19828:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                     "typeString": "enum Market.RequestStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4310,
+                    "id": 4146,
                     "name": "RequestStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2178,
-                    "src": "19502:13:7",
+                    "referencedDeclaration": 2002,
+                    "src": "19828:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                       "typeString": "enum Market.RequestStatus"
                     }
                   },
@@ -31007,43 +31148,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19397:131:7"
+              "src": "19723:131:6"
             },
-            "scope": 5229,
-            "src": "19321:457:7",
+            "scope": 5065,
+            "src": "19647:457:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4343,
+              "id": 4179,
               "nodeType": "Block",
-              "src": "19836:34:7",
+              "src": "20162:34:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4341,
+                    "id": 4177,
                     "name": "dealAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2327,
-                    "src": "19853:10:7",
+                    "referencedDeclaration": 2151,
+                    "src": "20179:10:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4340,
-                  "id": 4342,
+                  "functionReturnParameters": 4176,
+                  "id": 4178,
                   "nodeType": "Return",
-                  "src": "19846:17:7"
+                  "src": "20172:17:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4344,
+            "id": 4180,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31051,23 +31192,23 @@
             "name": "GetDealsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4337,
+              "id": 4173,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19807:2:7"
+              "src": "20133:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4340,
+              "id": 4176,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4339,
+                  "id": 4175,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4344,
-                  "src": "19831:4:7",
+                  "scope": 4180,
+                  "src": "20157:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31075,10 +31216,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4338,
+                    "id": 4174,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19831:4:7",
+                    "src": "20157:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31088,43 +31229,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19830:6:7"
+              "src": "20156:6:6"
             },
-            "scope": 5229,
-            "src": "19784:86:7",
+            "scope": 5065,
+            "src": "20110:86:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4351,
+              "id": 4187,
               "nodeType": "Block",
-              "src": "19929:36:7",
+              "src": "20255:36:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4349,
+                    "id": 4185,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2324,
-                    "src": "19946:12:7",
+                    "referencedDeclaration": 2148,
+                    "src": "20272:12:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4348,
-                  "id": 4350,
+                  "functionReturnParameters": 4184,
+                  "id": 4186,
                   "nodeType": "Return",
-                  "src": "19939:19:7"
+                  "src": "20265:19:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4352,
+            "id": 4188,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31132,23 +31273,23 @@
             "name": "GetOrdersAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4345,
+              "id": 4181,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19900:2:7"
+              "src": "20226:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4348,
+              "id": 4184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4347,
+                  "id": 4183,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4352,
-                  "src": "19924:4:7",
+                  "scope": 4188,
+                  "src": "20250:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31156,10 +31297,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4346,
+                    "id": 4182,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19924:4:7",
+                    "src": "20250:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31169,43 +31310,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19923:6:7"
+              "src": "20249:6:6"
             },
-            "scope": 5229,
-            "src": "19876:89:7",
+            "scope": 5065,
+            "src": "20202:89:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4359,
+              "id": 4195,
               "nodeType": "Block",
-              "src": "20032:38:7",
+              "src": "20358:38:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4357,
+                    "id": 4193,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2330,
-                    "src": "20049:14:7",
+                    "referencedDeclaration": 2154,
+                    "src": "20375:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4356,
-                  "id": 4358,
+                  "functionReturnParameters": 4192,
+                  "id": 4194,
                   "nodeType": "Return",
-                  "src": "20042:21:7"
+                  "src": "20368:21:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4360,
+            "id": 4196,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31213,23 +31354,23 @@
             "name": "GetChangeRequestsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4353,
+              "id": 4189,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20003:2:7"
+              "src": "20329:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4356,
+              "id": 4192,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4355,
+                  "id": 4191,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4360,
-                  "src": "20027:4:7",
+                  "scope": 4196,
+                  "src": "20353:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31237,10 +31378,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4354,
+                    "id": 4190,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20027:4:7",
+                    "src": "20353:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31250,43 +31391,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20026:6:7"
+              "src": "20352:6:6"
             },
-            "scope": 5229,
-            "src": "19971:99:7",
+            "scope": 5065,
+            "src": "20297:99:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4367,
+              "id": 4203,
               "nodeType": "Block",
-              "src": "20136:42:7",
+              "src": "20462:42:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4365,
+                    "id": 4201,
                     "name": "benchmarksQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2332,
-                    "src": "20153:18:7",
+                    "referencedDeclaration": 2156,
+                    "src": "20479:18:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4364,
-                  "id": 4366,
+                  "functionReturnParameters": 4200,
+                  "id": 4202,
                   "nodeType": "Return",
-                  "src": "20146:25:7"
+                  "src": "20472:25:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4368,
+            "id": 4204,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31294,23 +31435,23 @@
             "name": "GetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4361,
+              "id": 4197,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20106:2:7"
+              "src": "20432:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4364,
+              "id": 4200,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4363,
+                  "id": 4199,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4368,
-                  "src": "20130:4:7",
+                  "scope": 4204,
+                  "src": "20456:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31318,10 +31459,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4362,
+                    "id": 4198,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20130:4:7",
+                    "src": "20456:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31331,43 +31472,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20129:6:7"
+              "src": "20455:6:6"
             },
-            "scope": 5229,
-            "src": "20076:102:7",
+            "scope": 5065,
+            "src": "20402:102:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4375,
+              "id": 4211,
               "nodeType": "Block",
-              "src": "20242:40:7",
+              "src": "20568:40:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4373,
+                    "id": 4209,
                     "name": "netflagsQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2334,
-                    "src": "20259:16:7",
+                    "referencedDeclaration": 2158,
+                    "src": "20585:16:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4372,
-                  "id": 4374,
+                  "functionReturnParameters": 4208,
+                  "id": 4210,
                   "nodeType": "Return",
-                  "src": "20252:23:7"
+                  "src": "20578:23:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4376,
+            "id": 4212,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -31375,23 +31516,23 @@
             "name": "GetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4369,
+              "id": 4205,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20212:2:7"
+              "src": "20538:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4372,
+              "id": 4208,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4371,
+                  "id": 4207,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4376,
-                  "src": "20236:4:7",
+                  "scope": 4212,
+                  "src": "20562:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -31399,10 +31540,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4370,
+                    "id": 4206,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20236:4:7",
+                    "src": "20562:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -31412,19 +31553,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20235:6:7"
+              "src": "20561:6:6"
             },
-            "scope": 5229,
-            "src": "20184:98:7",
+            "scope": 5065,
+            "src": "20510:98:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4641,
+              "id": 4477,
               "nodeType": "Block",
-              "src": "20364:1917:7",
+              "src": "20690:1917:6",
               "statements": [
                 {
                   "expression": {
@@ -31433,10 +31574,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 4390,
+                        "id": 4226,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -31447,26 +31588,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4384,
+                              "id": 4220,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "20382:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "20708:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4386,
+                            "id": 4222,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4385,
+                              "id": 4221,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "20388:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "20714:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -31477,23 +31618,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "20382:13:7",
+                            "src": "20708:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4387,
+                          "id": 4223,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2205,
-                          "src": "20382:20:7",
+                          "referencedDeclaration": 2029,
+                          "src": "20708:20:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -31503,18 +31644,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4388,
+                            "id": 4224,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "20406:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "20732:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 4389,
+                          "id": 4225,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -31522,13 +31663,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "20406:26:7",
+                          "src": "20732:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "20382:50:7",
+                        "src": "20708:50:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -31542,21 +31683,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4383,
+                      "id": 4219,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "20374:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "20700:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4391,
+                    "id": 4227,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -31564,15 +31705,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20374:59:7",
+                    "src": "20700:59:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4392,
+                  "id": 4228,
                   "nodeType": "ExpressionStatement",
-                  "src": "20374:59:7"
+                  "src": "20700:59:6"
                 },
                 {
                   "expression": {
@@ -31584,7 +31725,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4416,
+                        "id": 4252,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -31595,7 +31736,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4408,
+                          "id": 4244,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -31606,7 +31747,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4400,
+                            "id": 4236,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31615,18 +31756,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4394,
+                                "id": 4230,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "20451:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "20777:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4395,
+                              "id": 4231,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -31634,7 +31775,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20451:10:7",
+                              "src": "20777:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -31648,26 +31789,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4396,
+                                  "id": 4232,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "20465:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "20791:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4398,
+                                "id": 4234,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4397,
+                                  "id": 4233,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4378,
-                                  "src": "20471:6:7",
+                                  "referencedDeclaration": 4214,
+                                  "src": "20797:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -31678,27 +31819,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20465:13:7",
+                                "src": "20791:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4399,
+                              "id": 4235,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "20465:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "20791:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20451:38:7",
+                            "src": "20777:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -31712,7 +31853,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4407,
+                            "id": 4243,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31721,18 +31862,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4401,
+                                "id": 4237,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "20493:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "20819:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4402,
+                              "id": 4238,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -31740,7 +31881,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20493:10:7",
+                              "src": "20819:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -31754,26 +31895,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4403,
+                                  "id": 4239,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "20507:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "20833:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4405,
+                                "id": 4241,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4404,
+                                  "id": 4240,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4378,
-                                  "src": "20513:6:7",
+                                  "referencedDeclaration": 4214,
+                                  "src": "20839:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -31784,33 +31925,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20507:13:7",
+                                "src": "20833:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4406,
+                              "id": 4242,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "20507:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "20833:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20493:38:7",
+                            "src": "20819:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "20451:80:7",
+                          "src": "20777:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -31824,7 +31965,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4415,
+                          "id": 4251,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -31833,18 +31974,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4409,
+                              "id": 4245,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "20535:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "20861:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4410,
+                            "id": 4246,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -31852,7 +31993,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20535:10:7",
+                            "src": "20861:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -31866,26 +32007,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4411,
+                                "id": 4247,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "20549:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "20875:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4413,
+                              "id": 4249,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4412,
+                                "id": 4248,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4378,
-                                "src": "20555:6:7",
+                                "referencedDeclaration": 4214,
+                                "src": "20881:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -31896,33 +32037,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "20549:13:7",
+                              "src": "20875:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4414,
+                            "id": 4250,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "20549:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "20875:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "20535:36:7",
+                          "src": "20861:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20451:120:7",
+                        "src": "20777:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -31936,21 +32077,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4393,
+                      "id": 4229,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "20443:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "20769:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4417,
+                    "id": 4253,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -31958,43 +32099,43 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20443:129:7",
+                    "src": "20769:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4418,
+                  "id": 4254,
                   "nodeType": "ExpressionStatement",
-                  "src": "20443:129:7"
+                  "src": "20769:129:6"
                 },
                 {
                   "assignments": [
-                    4420
+                    4256
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4420,
+                      "id": 4256,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4642,
-                      "src": "20582:16:7",
+                      "scope": 4478,
+                      "src": "20908:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4419,
+                        "id": 4255,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2212,
-                        "src": "20582:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "20908:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -32002,31 +32143,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4424,
+                  "id": 4260,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4421,
+                      "id": 4257,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2342,
-                      "src": "20601:5:7",
+                      "referencedDeclaration": 2166,
+                      "src": "20927:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 4423,
+                    "id": 4259,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4422,
+                      "id": 4258,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4378,
-                      "src": "20607:6:7",
+                      "referencedDeclaration": 4214,
+                      "src": "20933:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -32037,25 +32178,25 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "20601:13:7",
+                    "src": "20927:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20582:32:7"
+                  "src": "20908:32:6"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4426,
+                      "id": 4262,
                       "name": "paidAmount",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4642,
-                      "src": "20625:15:7",
+                      "scope": 4478,
+                      "src": "20951:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -32063,10 +32204,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4425,
+                        "id": 4261,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "20625:4:7",
+                        "src": "20951:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -32076,10 +32217,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4427,
+                  "id": 4263,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20625:15:7"
+                  "src": "20951:15:6"
                 },
                 {
                   "condition": {
@@ -32088,14 +32229,14 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 4437,
+                    "id": 4273,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4431,
+                      "id": 4267,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32103,18 +32244,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "!",
                       "prefix": true,
-                      "src": "20655:15:7",
+                      "src": "20981:15:6",
                       "subExpression": {
                         "argumentTypes": null,
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 4429,
+                            "id": 4265,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4378,
-                            "src": "20663:6:7",
+                            "referencedDeclaration": 4214,
+                            "src": "20989:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -32128,18 +32269,18 @@
                               "typeString": "uint256"
                             }
                           ],
-                          "id": 4428,
+                          "id": 4264,
                           "name": "IsSpot",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4843,
-                          "src": "20656:6:7",
+                          "referencedDeclaration": 4679,
+                          "src": "20982:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (uint256) view returns (bool)"
                           }
                         },
-                        "id": 4430,
+                        "id": 4266,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -32147,7 +32288,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "20656:14:7",
+                        "src": "20982:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -32166,7 +32307,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 4436,
+                      "id": 4272,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32175,26 +32316,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4432,
+                          "id": 4268,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4420,
-                          "src": "20674:4:7",
+                          "referencedDeclaration": 4256,
+                          "src": "21000:4:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 4433,
+                        "id": 4269,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2211,
-                        "src": "20674:15:7",
+                        "referencedDeclaration": 2035,
+                        "src": "21000:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -32206,38 +32347,38 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4434,
+                          "id": 4270,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4420,
-                          "src": "20693:4:7",
+                          "referencedDeclaration": 4256,
+                          "src": "21019:4:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 4435,
+                        "id": 4271,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2203,
-                        "src": "20693:12:7",
+                        "referencedDeclaration": 2027,
+                        "src": "21019:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "20674:31:7",
+                      "src": "21000:31:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "20655:50:7",
+                    "src": "20981:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -32250,7 +32391,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4456,
+                      "id": 4292,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -32261,14 +32402,14 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4450,
+                        "id": 4286,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4444,
+                          "id": 4280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -32276,18 +32417,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "20811:15:7",
+                          "src": "21137:15:6",
                           "subExpression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4442,
+                                "id": 4278,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4378,
-                                "src": "20819:6:7",
+                                "referencedDeclaration": 4214,
+                                "src": "21145:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -32301,18 +32442,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 4441,
+                              "id": 4277,
                               "name": "IsSpot",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4843,
-                              "src": "20812:6:7",
+                              "referencedDeclaration": 4679,
+                              "src": "21138:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                                 "typeString": "function (uint256) view returns (bool)"
                               }
                             },
-                            "id": 4443,
+                            "id": 4279,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -32320,7 +32461,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "20812:14:7",
+                            "src": "21138:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -32339,7 +32480,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4449,
+                          "id": 4285,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -32348,18 +32489,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4445,
+                              "id": 4281,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11305,
-                              "src": "20830:5:7",
+                              "referencedDeclaration": 11589,
+                              "src": "21156:5:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 4446,
+                            "id": 4282,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -32367,7 +32508,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20830:15:7",
+                            "src": "21156:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -32379,38 +32520,38 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4447,
+                              "id": 4283,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4420,
-                              "src": "20848:4:7",
+                              "referencedDeclaration": 4256,
+                              "src": "21174:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4448,
+                            "id": 4284,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2203,
-                            "src": "20848:12:7",
+                            "referencedDeclaration": 2027,
+                            "src": "21174:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "20830:30:7",
+                          "src": "21156:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20811:49:7",
+                        "src": "21137:49:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -32424,7 +32565,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 4455,
+                        "id": 4291,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -32433,26 +32574,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4451,
+                            "id": 4287,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4420,
-                            "src": "20864:4:7",
+                            "referencedDeclaration": 4256,
+                            "src": "21190:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4452,
+                          "id": 4288,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lastBillTS",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2211,
-                          "src": "20864:15:7",
+                          "referencedDeclaration": 2035,
+                          "src": "21190:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -32464,64 +32605,64 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4453,
+                            "id": 4289,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4420,
-                            "src": "20882:4:7",
+                            "referencedDeclaration": 4256,
+                            "src": "21208:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4454,
+                          "id": 4290,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "endTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2203,
-                          "src": "20882:12:7",
+                          "referencedDeclaration": 2027,
+                          "src": "21208:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "20864:30:7",
+                        "src": "21190:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "20811:83:7",
+                      "src": "21137:83:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": {
-                      "id": 4484,
+                      "id": 4320,
                       "nodeType": "Block",
-                      "src": "21003:104:7",
+                      "src": "21329:104:6",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4482,
+                            "id": 4318,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4471,
+                              "id": 4307,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4426,
-                              "src": "21017:10:7",
+                              "referencedDeclaration": 4262,
+                              "src": "21343:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -32536,26 +32677,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4473,
+                                    "id": 4309,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4420,
-                                    "src": "21047:4:7",
+                                    "referencedDeclaration": 4256,
+                                    "src": "21373:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4474,
+                                  "id": 4310,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "21047:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "21373:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32568,26 +32709,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4478,
+                                        "id": 4314,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "21079:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21405:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4479,
+                                      "id": 4315,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2211,
-                                      "src": "21079:15:7",
+                                      "referencedDeclaration": 2035,
+                                      "src": "21405:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -32605,18 +32746,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4475,
+                                        "id": 4311,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11305,
-                                        "src": "21059:5:7",
+                                        "referencedDeclaration": 11589,
+                                        "src": "21385:5:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 4476,
+                                      "id": 4312,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -32624,27 +32765,27 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "21059:15:7",
+                                      "src": "21385:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4477,
+                                    "id": 4313,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "21059:19:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "21385:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4480,
+                                  "id": 4316,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -32652,7 +32793,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21059:36:7",
+                                  "src": "21385:36:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32670,18 +32811,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4472,
+                                "id": 4308,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "21030:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "21356:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4481,
+                              "id": 4317,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -32689,48 +32830,48 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "21030:66:7",
+                              "src": "21356:66:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "21017:79:7",
+                            "src": "21343:79:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4483,
+                          "id": 4319,
                           "nodeType": "ExpressionStatement",
-                          "src": "21017:79:7"
+                          "src": "21343:79:6"
                         }
                       ]
                     },
-                    "id": 4485,
+                    "id": 4321,
                     "nodeType": "IfStatement",
-                    "src": "20807:300:7",
+                    "src": "21133:300:6",
                     "trueBody": {
-                      "id": 4470,
+                      "id": 4306,
                       "nodeType": "Block",
-                      "src": "20896:101:7",
+                      "src": "21222:101:6",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4468,
+                            "id": 4304,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4457,
+                              "id": 4293,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4426,
-                              "src": "20910:10:7",
+                              "referencedDeclaration": 4262,
+                              "src": "21236:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -32745,26 +32886,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4459,
+                                    "id": 4295,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4420,
-                                    "src": "20940:4:7",
+                                    "referencedDeclaration": 4256,
+                                    "src": "21266:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4460,
+                                  "id": 4296,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "20940:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "21266:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32777,26 +32918,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4464,
+                                        "id": 4300,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "20969:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21295:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4465,
+                                      "id": 4301,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2211,
-                                      "src": "20969:15:7",
+                                      "referencedDeclaration": 2035,
+                                      "src": "21295:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -32814,46 +32955,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4461,
+                                        "id": 4297,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "20952:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21278:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4462,
+                                      "id": 4298,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2203,
-                                      "src": "20952:12:7",
+                                      "referencedDeclaration": 2027,
+                                      "src": "21278:12:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4463,
+                                    "id": 4299,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "20952:16:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "21278:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4466,
+                                  "id": 4302,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -32861,7 +33002,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "20952:33:7",
+                                  "src": "21278:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -32879,18 +33020,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4458,
+                                "id": 4294,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "20923:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "21249:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4467,
+                              "id": 4303,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -32898,45 +33039,45 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "20923:63:7",
+                              "src": "21249:63:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "20910:76:7",
+                            "src": "21236:76:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4469,
+                          "id": 4305,
                           "nodeType": "ExpressionStatement",
-                          "src": "20910:76:7"
+                          "src": "21236:76:6"
                         }
                       ]
                     }
                   },
-                  "id": 4486,
+                  "id": 4322,
                   "nodeType": "IfStatement",
-                  "src": "20651:456:7",
+                  "src": "20977:456:6",
                   "trueBody": {
-                    "id": 4440,
+                    "id": 4276,
                     "nodeType": "Block",
-                    "src": "20707:94:7",
+                    "src": "21033:94:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 4438,
+                          "id": 4274,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "20786:4:7",
+                          "src": "21112:4:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -32944,10 +33085,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 4382,
-                        "id": 4439,
+                        "functionReturnParameters": 4218,
+                        "id": 4275,
                         "nodeType": "Return",
-                        "src": "20779:11:7"
+                        "src": "21105:11:6"
                       }
                     ]
                   }
@@ -32959,19 +33100,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4490,
+                    "id": 4326,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4487,
+                      "id": 4323,
                       "name": "paidAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4426,
-                      "src": "21121:10:7",
+                      "referencedDeclaration": 4262,
+                      "src": "21447:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -32983,45 +33124,45 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4488,
+                        "id": 4324,
                         "name": "deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4420,
-                        "src": "21134:4:7",
+                        "referencedDeclaration": 4256,
+                        "src": "21460:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                           "typeString": "struct Market.Deal memory"
                         }
                       },
-                      "id": 4489,
+                      "id": 4325,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "21134:19:7",
+                      "referencedDeclaration": 2031,
+                      "src": "21460:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "21121:32:7",
+                    "src": "21447:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4590,
+                  "id": 4426,
                   "nodeType": "IfStatement",
-                  "src": "21117:820:7",
+                  "src": "21443:820:6",
                   "trueBody": {
-                    "id": 4589,
+                    "id": 4425,
                     "nodeType": "Block",
-                    "src": "21155:782:7",
+                    "src": "21481:782:6",
                     "statements": [
                       {
                         "condition": {
@@ -33030,7 +33171,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4501,
+                          "id": 4337,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -33042,26 +33183,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4493,
+                                  "id": 4329,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4420,
-                                  "src": "21189:4:7",
+                                  "referencedDeclaration": 4256,
+                                  "src": "21515:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4494,
+                                "id": 4330,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "21189:15:7",
+                                "referencedDeclaration": 2013,
+                                "src": "21515:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -33077,32 +33218,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4491,
+                                "id": 4327,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2315,
-                                "src": "21173:5:7",
+                                "referencedDeclaration": 2139,
+                                "src": "21499:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$10080",
+                                  "typeIdentifier": "t_contract$_SNM_$10926",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 4492,
+                              "id": 4328,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10977,
-                              "src": "21173:15:7",
+                              "referencedDeclaration": 11261,
+                              "src": "21499:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 4495,
+                            "id": 4331,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -33110,7 +33251,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21173:32:7",
+                            "src": "21499:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -33125,26 +33266,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4498,
+                                  "id": 4334,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4420,
-                                  "src": "21224:4:7",
+                                  "referencedDeclaration": 4256,
+                                  "src": "21550:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4499,
+                                "id": 4335,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "blockedBalance",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2207,
-                                "src": "21224:19:7",
+                                "referencedDeclaration": 2031,
+                                "src": "21550:19:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -33160,32 +33301,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4496,
+                                "id": 4332,
                                 "name": "paidAmount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4426,
-                                "src": "21209:10:7",
+                                "referencedDeclaration": 4262,
+                                "src": "21535:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4497,
+                              "id": 4333,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "21209:14:7",
+                              "referencedDeclaration": 11055,
+                              "src": "21535:14:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4500,
+                            "id": 4336,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -33193,22 +33334,22 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21209:35:7",
+                            "src": "21535:35:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "21173:71:7",
+                          "src": "21499:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4587,
+                          "id": 4423,
                           "nodeType": "Block",
-                          "src": "21490:437:7",
+                          "src": "21816:437:6",
                           "statements": [
                             {
                               "eventCall": {
@@ -33216,12 +33357,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4535,
+                                    "id": 4371,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4378,
-                                    "src": "21520:6:7",
+                                    "referencedDeclaration": 4214,
+                                    "src": "21846:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33233,26 +33374,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 4536,
+                                        "id": 4372,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "21528:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "21854:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 4538,
+                                      "id": 4374,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 4537,
+                                        "id": 4373,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4378,
-                                        "src": "21534:6:7",
+                                        "referencedDeclaration": 4214,
+                                        "src": "21860:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -33263,21 +33404,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "21528:13:7",
+                                      "src": "21854:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 4539,
+                                    "id": 4375,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2207,
-                                    "src": "21528:28:7",
+                                    "referencedDeclaration": 2031,
+                                    "src": "21854:28:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33295,18 +33436,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4534,
+                                  "id": 4370,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2274,
-                                  "src": "21513:6:7",
+                                  "referencedDeclaration": 2098,
+                                  "src": "21839:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 4540,
+                                "id": 4376,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33314,15 +33455,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21513:44:7",
+                                "src": "21839:44:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4541,
+                              "id": 4377,
                               "nodeType": "EmitStatement",
-                              "src": "21508:49:7"
+                              "src": "21834:49:6"
                             },
                             {
                               "expression": {
@@ -33330,12 +33471,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4543,
+                                    "id": 4379,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4378,
-                                    "src": "21593:6:7",
+                                    "referencedDeclaration": 4214,
+                                    "src": "21919:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -33349,18 +33490,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4542,
+                                  "id": 4378,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5004,
-                                  "src": "21575:17:7",
+                                  "referencedDeclaration": 4840,
+                                  "src": "21901:17:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4544,
+                                "id": 4380,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33368,15 +33509,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21575:25:7",
+                                "src": "21901:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4545,
+                              "id": 4381,
                               "nodeType": "ExpressionStatement",
-                              "src": "21575:25:7"
+                              "src": "21901:25:6"
                             },
                             {
                               "expression": {
@@ -33389,26 +33530,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4549,
+                                          "id": 4385,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21641:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21967:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4550,
+                                        "id": 4386,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "masterID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2191,
-                                        "src": "21641:13:7",
+                                        "referencedDeclaration": 2015,
+                                        "src": "21967:13:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -33418,26 +33559,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4551,
+                                          "id": 4387,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21656:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21982:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4552,
+                                        "id": 4388,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "blockedBalance",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2207,
-                                        "src": "21656:19:7",
+                                        "referencedDeclaration": 2031,
+                                        "src": "21982:19:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -33457,32 +33598,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4547,
+                                        "id": 4383,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "21626:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "21952:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4548,
+                                      "id": 4384,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transfer",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 10965,
-                                      "src": "21626:14:7",
+                                      "referencedDeclaration": 11249,
+                                      "src": "21952:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4553,
+                                    "id": 4389,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -33490,7 +33631,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21626:50:7",
+                                    "src": "21952:50:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -33504,21 +33645,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4546,
+                                  "id": 4382,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "21618:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "21944:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4554,
+                                "id": 4390,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33526,20 +33667,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21618:59:7",
+                                "src": "21944:59:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4555,
+                              "id": 4391,
                               "nodeType": "ExpressionStatement",
-                              "src": "21618:59:7"
+                              "src": "21944:59:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4562,
+                                "id": 4398,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33550,26 +33691,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4556,
+                                      "id": 4392,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21695:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22021:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4558,
+                                    "id": 4394,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4557,
+                                      "id": 4393,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21701:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22027:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33580,21 +33721,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21695:13:7",
+                                    "src": "22021:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4559,
+                                  "id": 4395,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "lastBillTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2211,
-                                  "src": "21695:24:7",
+                                  "referencedDeclaration": 2035,
+                                  "src": "22021:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33606,18 +33747,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4560,
+                                    "id": 4396,
                                     "name": "block",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11305,
-                                    "src": "21722:5:7",
+                                    "referencedDeclaration": 11589,
+                                    "src": "22048:5:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_block",
                                       "typeString": "block"
                                     }
                                   },
-                                  "id": 4561,
+                                  "id": 4397,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -33625,26 +33766,26 @@
                                   "memberName": "timestamp",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "21722:15:7",
+                                  "src": "22048:15:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21695:42:7",
+                                "src": "22021:42:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4563,
+                              "id": 4399,
                               "nodeType": "ExpressionStatement",
-                              "src": "21695:42:7"
+                              "src": "22021:42:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4576,
+                                "id": 4412,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33655,26 +33796,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4564,
+                                      "id": 4400,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21755:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22081:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4566,
+                                    "id": 4402,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4565,
+                                      "id": 4401,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21761:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22087:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33685,21 +33826,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21755:13:7",
+                                    "src": "22081:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4567,
+                                  "id": 4403,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "totalPayout",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2209,
-                                  "src": "21755:25:7",
+                                  "referencedDeclaration": 2033,
+                                  "src": "22081:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33714,26 +33855,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4573,
+                                        "id": 4409,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "21813:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "22139:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4574,
+                                      "id": 4410,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "21813:19:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "22139:19:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33753,26 +33894,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4568,
+                                          "id": 4404,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "21783:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "22109:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4570,
+                                        "id": 4406,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4569,
+                                          "id": 4405,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4378,
-                                          "src": "21789:6:7",
+                                          "referencedDeclaration": 4214,
+                                          "src": "22115:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -33783,41 +33924,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21783:13:7",
+                                        "src": "22109:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4571,
+                                      "id": 4407,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "totalPayout",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2209,
-                                      "src": "21783:25:7",
+                                      "referencedDeclaration": 2033,
+                                      "src": "22109:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4572,
+                                    "id": 4408,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "21783:29:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "22109:29:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4575,
+                                  "id": 4411,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -33825,26 +33966,26 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21783:50:7",
+                                  "src": "22109:50:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21755:78:7",
+                                "src": "22081:78:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4577,
+                              "id": 4413,
                               "nodeType": "ExpressionStatement",
-                              "src": "21755:78:7"
+                              "src": "22081:78:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4583,
+                                "id": 4419,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -33855,26 +33996,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4578,
+                                      "id": 4414,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21851:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22177:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4580,
+                                    "id": 4416,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4579,
+                                      "id": 4415,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21857:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22183:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -33885,21 +34026,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21851:13:7",
+                                    "src": "22177:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4581,
+                                  "id": 4417,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "21851:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "22177:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -33910,14 +34051,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 4582,
+                                  "id": 4418,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "21882:1:7",
+                                  "src": "22208:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -33925,28 +34066,28 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "21851:32:7",
+                                "src": "22177:32:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4584,
+                              "id": 4420,
                               "nodeType": "ExpressionStatement",
-                              "src": "21851:32:7"
+                              "src": "22177:32:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4585,
+                                "id": 4421,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "21908:4:7",
+                                "src": "22234:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -33954,20 +34095,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4382,
-                              "id": 4586,
+                              "functionReturnParameters": 4218,
+                              "id": 4422,
                               "nodeType": "Return",
-                              "src": "21901:11:7"
+                              "src": "22227:11:6"
                             }
                           ]
                         },
-                        "id": 4588,
+                        "id": 4424,
                         "nodeType": "IfStatement",
-                        "src": "21169:758:7",
+                        "src": "21495:758:6",
                         "trueBody": {
-                          "id": 4533,
+                          "id": 4369,
                           "nodeType": "Block",
-                          "src": "21246:238:7",
+                          "src": "21572:238:6",
                           "statements": [
                             {
                               "expression": {
@@ -33980,26 +34121,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4505,
+                                          "id": 4341,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21291:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21617:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4506,
+                                        "id": 4342,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2189,
-                                        "src": "21291:15:7",
+                                        "referencedDeclaration": 2013,
+                                        "src": "21617:15:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -34007,14 +34148,14 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4507,
+                                        "id": 4343,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11366,
-                                        "src": "21308:4:7",
+                                        "referencedDeclaration": 11646,
+                                        "src": "21634:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         }
                                       },
@@ -34025,26 +34166,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 4510,
+                                              "id": 4346,
                                               "name": "deal",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 4420,
-                                              "src": "21329:4:7",
+                                              "referencedDeclaration": 4256,
+                                              "src": "21655:4:6",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                                 "typeString": "struct Market.Deal memory"
                                               }
                                             },
-                                            "id": 4511,
+                                            "id": 4347,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "blockedBalance",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 2207,
-                                            "src": "21329:19:7",
+                                            "referencedDeclaration": 2031,
+                                            "src": "21655:19:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -34060,32 +34201,32 @@
                                           ],
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 4508,
+                                            "id": 4344,
                                             "name": "paidAmount",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4426,
-                                            "src": "21314:10:7",
+                                            "referencedDeclaration": 4262,
+                                            "src": "21640:10:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             }
                                           },
-                                          "id": 4509,
+                                          "id": 4345,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "sub",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 10771,
-                                          "src": "21314:14:7",
+                                          "referencedDeclaration": 11055,
+                                          "src": "21640:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                                           }
                                         },
-                                        "id": 4512,
+                                        "id": 4348,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -34093,7 +34234,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "21314:35:7",
+                                        "src": "21640:35:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -34107,7 +34248,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -34117,32 +34258,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4503,
+                                        "id": 4339,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "21272:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "21598:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4504,
+                                      "id": 4340,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 11153,
-                                      "src": "21272:18:7",
+                                      "referencedDeclaration": 11437,
+                                      "src": "21598:18:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4513,
+                                    "id": 4349,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -34150,7 +34291,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21272:78:7",
+                                    "src": "21598:78:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -34164,21 +34305,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4502,
+                                  "id": 4338,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "21264:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "21590:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4514,
+                                "id": 4350,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -34186,20 +34327,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21264:87:7",
+                                "src": "21590:87:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4515,
+                              "id": 4351,
                               "nodeType": "ExpressionStatement",
-                              "src": "21264:87:7"
+                              "src": "21590:87:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4531,
+                                "id": 4367,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -34210,26 +34351,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4516,
+                                      "id": 4352,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21369:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "21695:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4518,
+                                    "id": 4354,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4517,
+                                      "id": 4353,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21375:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "21701:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -34240,21 +34381,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21369:13:7",
+                                    "src": "21695:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4519,
+                                  "id": 4355,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "21369:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "21695:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -34272,26 +34413,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 4527,
+                                            "id": 4363,
                                             "name": "deal",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4420,
-                                            "src": "21448:4:7",
+                                            "referencedDeclaration": 4256,
+                                            "src": "21774:4:6",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                               "typeString": "struct Market.Deal memory"
                                             }
                                           },
-                                          "id": 4528,
+                                          "id": 4364,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blockedBalance",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2207,
-                                          "src": "21448:19:7",
+                                          "referencedDeclaration": 2031,
+                                          "src": "21774:19:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -34307,32 +34448,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4525,
+                                          "id": 4361,
                                           "name": "paidAmount",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4426,
-                                          "src": "21433:10:7",
+                                          "referencedDeclaration": 4262,
+                                          "src": "21759:10:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
                                           }
                                         },
-                                        "id": 4526,
+                                        "id": 4362,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "sub",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 10771,
-                                        "src": "21433:14:7",
+                                        "referencedDeclaration": 11055,
+                                        "src": "21759:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                                         }
                                       },
-                                      "id": 4529,
+                                      "id": 4365,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -34340,7 +34481,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "21433:35:7",
+                                      "src": "21759:35:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -34360,26 +34501,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4520,
+                                          "id": 4356,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "21400:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "21726:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4522,
+                                        "id": 4358,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4521,
+                                          "id": 4357,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4378,
-                                          "src": "21406:6:7",
+                                          "referencedDeclaration": 4214,
+                                          "src": "21732:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -34390,41 +34531,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21400:13:7",
+                                        "src": "21726:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4523,
+                                      "id": 4359,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "21400:28:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "21726:28:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4524,
+                                    "id": 4360,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "21400:32:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "21726:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4530,
+                                  "id": 4366,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -34432,21 +34573,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21400:69:7",
+                                  "src": "21726:69:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21369:100:7",
+                                "src": "21695:100:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4532,
+                              "id": 4368,
                               "nodeType": "ExpressionStatement",
-                              "src": "21369:100:7"
+                              "src": "21695:100:6"
                             }
                           ]
                         }
@@ -34465,26 +34606,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4594,
+                              "id": 4430,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4420,
-                              "src": "21969:4:7",
+                              "referencedDeclaration": 4256,
+                              "src": "22295:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4595,
+                            "id": 4431,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "21969:13:7",
+                            "referencedDeclaration": 2015,
+                            "src": "22295:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -34492,12 +34633,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 4596,
+                            "id": 4432,
                             "name": "paidAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4426,
-                            "src": "21984:10:7",
+                            "referencedDeclaration": 4262,
+                            "src": "22310:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -34517,32 +34658,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4592,
+                            "id": 4428,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "21954:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "22280:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 4593,
+                          "id": 4429,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10965,
-                          "src": "21954:14:7",
+                          "referencedDeclaration": 11249,
+                          "src": "22280:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 4597,
+                        "id": 4433,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -34550,7 +34691,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "21954:41:7",
+                        "src": "22280:41:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -34564,21 +34705,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4591,
+                      "id": 4427,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "21946:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "22272:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4598,
+                    "id": 4434,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34586,20 +34727,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "21946:50:7",
+                    "src": "22272:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4599,
+                  "id": 4435,
                   "nodeType": "ExpressionStatement",
-                  "src": "21946:50:7"
+                  "src": "22272:50:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4611,
+                    "id": 4447,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34610,26 +34751,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4600,
+                          "id": 4436,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22006:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22332:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4602,
+                        "id": 4438,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4601,
+                          "id": 4437,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22012:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22338:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34640,21 +34781,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22006:13:7",
+                        "src": "22332:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4603,
+                      "id": 4439,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "22006:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "22332:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -34667,12 +34808,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4609,
+                          "id": 4445,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4426,
-                          "src": "22070:10:7",
+                          "referencedDeclaration": 4262,
+                          "src": "22396:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34692,26 +34833,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4604,
+                              "id": 4440,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "22037:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "22363:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4606,
+                            "id": 4442,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4605,
+                              "id": 4441,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "22043:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "22369:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -34722,41 +34863,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22037:13:7",
+                            "src": "22363:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4607,
+                          "id": 4443,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "blockedBalance",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2207,
-                          "src": "22037:28:7",
+                          "referencedDeclaration": 2031,
+                          "src": "22363:28:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4608,
+                        "id": 4444,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "22037:32:7",
+                        "referencedDeclaration": 11055,
+                        "src": "22363:32:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 4610,
+                      "id": 4446,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -34764,26 +34905,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22037:44:7",
+                      "src": "22363:44:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22006:75:7",
+                    "src": "22332:75:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4612,
+                  "id": 4448,
                   "nodeType": "ExpressionStatement",
-                  "src": "22006:75:7"
+                  "src": "22332:75:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4624,
+                    "id": 4460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34794,26 +34935,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4613,
+                          "id": 4449,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22091:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22417:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4615,
+                        "id": 4451,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4614,
+                          "id": 4450,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22097:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22423:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34824,21 +34965,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22091:13:7",
+                        "src": "22417:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4616,
+                      "id": 4452,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "totalPayout",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2209,
-                      "src": "22091:25:7",
+                      "referencedDeclaration": 2033,
+                      "src": "22417:25:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -34851,12 +34992,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4622,
+                          "id": 4458,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4426,
-                          "src": "22149:10:7",
+                          "referencedDeclaration": 4262,
+                          "src": "22475:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -34876,26 +35017,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4617,
+                              "id": 4453,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "22119:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "22445:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4619,
+                            "id": 4455,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4618,
+                              "id": 4454,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "22125:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "22451:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -34906,41 +35047,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22119:13:7",
+                            "src": "22445:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4620,
+                          "id": 4456,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "totalPayout",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2209,
-                          "src": "22119:25:7",
+                          "referencedDeclaration": 2033,
+                          "src": "22445:25:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4621,
+                        "id": 4457,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "22119:29:7",
+                        "referencedDeclaration": 11079,
+                        "src": "22445:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 4623,
+                      "id": 4459,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -34948,26 +35089,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22119:41:7",
+                      "src": "22445:41:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22091:69:7",
+                    "src": "22417:69:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4625,
+                  "id": 4461,
                   "nodeType": "ExpressionStatement",
-                  "src": "22091:69:7"
+                  "src": "22417:69:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4632,
+                    "id": 4468,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -34978,26 +35119,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4626,
+                          "id": 4462,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22170:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22496:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4628,
+                        "id": 4464,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4627,
+                          "id": 4463,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22176:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22502:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -35008,21 +35149,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22170:13:7",
+                        "src": "22496:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4629,
+                      "id": 4465,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lastBillTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2211,
-                      "src": "22170:24:7",
+                      "referencedDeclaration": 2035,
+                      "src": "22496:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -35034,18 +35175,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4630,
+                        "id": 4466,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "22197:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "22523:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 4631,
+                      "id": 4467,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -35053,21 +35194,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "22197:15:7",
+                      "src": "22523:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22170:42:7",
+                    "src": "22496:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4633,
+                  "id": 4469,
                   "nodeType": "ExpressionStatement",
-                  "src": "22170:42:7"
+                  "src": "22496:42:6"
                 },
                 {
                   "eventCall": {
@@ -35075,12 +35216,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4635,
+                        "id": 4471,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4378,
-                        "src": "22234:6:7",
+                        "referencedDeclaration": 4214,
+                        "src": "22560:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35088,12 +35229,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4636,
+                        "id": 4472,
                         "name": "paidAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4426,
-                        "src": "22242:10:7",
+                        "referencedDeclaration": 4262,
+                        "src": "22568:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35111,18 +35252,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4634,
+                      "id": 4470,
                       "name": "Billed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2274,
-                      "src": "22227:6:7",
+                      "referencedDeclaration": 2098,
+                      "src": "22553:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 4637,
+                    "id": 4473,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -35130,28 +35271,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22227:26:7",
+                    "src": "22553:26:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4638,
+                  "id": 4474,
                   "nodeType": "EmitStatement",
-                  "src": "22222:31:7"
+                  "src": "22548:31:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4639,
+                    "id": 4475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "22270:4:7",
+                    "src": "22596:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -35159,15 +35300,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4382,
-                  "id": 4640,
+                  "functionReturnParameters": 4218,
+                  "id": 4476,
                   "nodeType": "Return",
-                  "src": "22263:11:7"
+                  "src": "22589:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4642,
+            "id": 4478,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -35175,16 +35316,16 @@
             "name": "InternalBill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4379,
+              "id": 4215,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4378,
+                  "id": 4214,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4642,
-                  "src": "20328:11:7",
+                  "scope": 4478,
+                  "src": "20654:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -35192,10 +35333,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4377,
+                    "id": 4213,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20328:4:7",
+                    "src": "20654:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -35205,20 +35346,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20327:13:7"
+              "src": "20653:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4382,
+              "id": 4218,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4381,
+                  "id": 4217,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4642,
-                  "src": "20359:4:7",
+                  "scope": 4478,
+                  "src": "20685:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -35226,10 +35367,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4380,
+                    "id": 4216,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20359:4:7",
+                    "src": "20685:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -35239,30 +35380,30 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20358:6:7"
+              "src": "20684:6:6"
             },
-            "scope": 5229,
-            "src": "20306:1975:7",
+            "scope": 5065,
+            "src": "20632:1975:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4789,
+              "id": 4625,
               "nodeType": "Block",
-              "src": "22356:1314:7",
+              "src": "22682:1314:6",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4650,
+                      "id": 4486,
                       "name": "nextPeriod",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4790,
-                      "src": "22366:15:7",
+                      "scope": 4626,
+                      "src": "22692:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -35270,10 +35411,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4649,
+                        "id": 4485,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "22366:4:7",
+                        "src": "22692:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35283,38 +35424,38 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4651,
+                  "id": 4487,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22366:15:7"
+                  "src": "22692:15:6"
                 },
                 {
                   "assignments": [
-                    4653
+                    4489
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4653,
+                      "id": 4489,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4790,
-                      "src": "22391:16:7",
+                      "scope": 4626,
+                      "src": "22717:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4652,
+                        "id": 4488,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2212,
-                        "src": "22391:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "22717:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -35322,31 +35463,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4657,
+                  "id": 4493,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4654,
+                      "id": 4490,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2342,
-                      "src": "22410:5:7",
+                      "referencedDeclaration": 2166,
+                      "src": "22736:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 4656,
+                    "id": 4492,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4655,
+                      "id": 4491,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4644,
-                      "src": "22416:6:7",
+                      "referencedDeclaration": 4480,
+                      "src": "22742:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -35357,14 +35498,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "22410:13:7",
+                    "src": "22736:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22391:32:7"
+                  "src": "22717:32:6"
                 },
                 {
                   "condition": {
@@ -35372,12 +35513,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4659,
+                        "id": 4495,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4644,
-                        "src": "22445:6:7",
+                        "referencedDeclaration": 4480,
+                        "src": "22771:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -35391,18 +35532,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4658,
+                      "id": 4494,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4843,
-                      "src": "22438:6:7",
+                      "referencedDeclaration": 4679,
+                      "src": "22764:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 4660,
+                    "id": 4496,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -35410,16 +35551,16 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22438:14:7",
+                    "src": "22764:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 4708,
+                    "id": 4544,
                     "nodeType": "Block",
-                    "src": "22607:360:7",
+                    "src": "22933:360:6",
                     "statements": [
                       {
                         "condition": {
@@ -35428,7 +35569,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4679,
+                          "id": 4515,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35437,18 +35578,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4675,
+                              "id": 4511,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11305,
-                              "src": "22625:5:7",
+                              "referencedDeclaration": 11589,
+                              "src": "22951:5:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 4676,
+                            "id": 4512,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -35456,7 +35597,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22625:15:7",
+                            "src": "22951:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -35468,58 +35609,58 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4677,
+                              "id": 4513,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4653,
-                              "src": "22643:4:7",
+                              "referencedDeclaration": 4489,
+                              "src": "22969:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4678,
+                            "id": 4514,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2203,
-                            "src": "22643:12:7",
+                            "referencedDeclaration": 2027,
+                            "src": "22969:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "22625:30:7",
+                          "src": "22951:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4683,
+                        "id": 4519,
                         "nodeType": "IfStatement",
-                        "src": "22621:138:7",
+                        "src": "22947:138:6",
                         "trueBody": {
-                          "id": 4682,
+                          "id": 4518,
                           "nodeType": "Block",
-                          "src": "22657:102:7",
+                          "src": "22983:102:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4680,
+                                "id": 4516,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22740:4:7",
+                                "src": "23066:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -35527,10 +35668,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4681,
+                              "functionReturnParameters": 4484,
+                              "id": 4517,
                               "nodeType": "Return",
-                              "src": "22733:11:7"
+                              "src": "23059:11:6"
                             }
                           ]
                         }
@@ -35542,7 +35683,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4691,
+                          "id": 4527,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35554,18 +35695,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4687,
+                                  "id": 4523,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11305,
-                                  "src": "22793:5:7",
+                                  "referencedDeclaration": 11589,
+                                  "src": "23119:5:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 4688,
+                                "id": 4524,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -35573,7 +35714,7 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "22793:15:7",
+                                "src": "23119:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -35591,46 +35732,46 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4684,
+                                  "id": 4520,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4653,
-                                  "src": "22776:4:7",
+                                  "referencedDeclaration": 4489,
+                                  "src": "23102:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4685,
+                                "id": 4521,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "endTime",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2203,
-                                "src": "22776:12:7",
+                                "referencedDeclaration": 2027,
+                                "src": "23102:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4686,
+                              "id": 4522,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "22776:16:7",
+                              "referencedDeclaration": 11055,
+                              "src": "23102:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4689,
+                            "id": 4525,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -35638,7 +35779,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "22776:33:7",
+                            "src": "23102:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -35649,14 +35790,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4690,
+                            "id": 4526,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22812:6:7",
+                            "src": "23138:6:6",
                             "subdenomination": "days",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_86400_by_1",
@@ -35664,33 +35805,33 @@
                             },
                             "value": "1"
                           },
-                          "src": "22776:42:7",
+                          "src": "23102:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4706,
+                          "id": 4542,
                           "nodeType": "Block",
-                          "src": "22905:52:7",
+                          "src": "23231:52:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4704,
+                                "id": 4540,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 4702,
+                                  "id": 4538,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "22923:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23249:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -35701,14 +35842,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 4703,
+                                  "id": 4539,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "22936:6:7",
+                                  "src": "23262:6:6",
                                   "subdenomination": "days",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_86400_by_1",
@@ -35716,42 +35857,42 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "22923:19:7",
+                                "src": "23249:19:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4705,
+                              "id": 4541,
                               "nodeType": "ExpressionStatement",
-                              "src": "22923:19:7"
+                              "src": "23249:19:6"
                             }
                           ]
                         },
-                        "id": 4707,
+                        "id": 4543,
                         "nodeType": "IfStatement",
-                        "src": "22772:185:7",
+                        "src": "23098:185:6",
                         "trueBody": {
-                          "id": 4701,
+                          "id": 4537,
                           "nodeType": "Block",
-                          "src": "22820:79:7",
+                          "src": "23146:79:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4699,
+                                "id": 4535,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 4692,
+                                  "id": 4528,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "22838:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23164:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -35766,18 +35907,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4696,
+                                        "id": 4532,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11305,
-                                        "src": "22868:5:7",
+                                        "referencedDeclaration": 11589,
+                                        "src": "23194:5:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 4697,
+                                      "id": 4533,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -35785,7 +35926,7 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "22868:15:7",
+                                      "src": "23194:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -35803,46 +35944,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4693,
+                                        "id": 4529,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4653,
-                                        "src": "22851:4:7",
+                                        "referencedDeclaration": 4489,
+                                        "src": "23177:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4694,
+                                      "id": 4530,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2203,
-                                      "src": "22851:12:7",
+                                      "referencedDeclaration": 2027,
+                                      "src": "23177:12:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4695,
+                                    "id": 4531,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "22851:16:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "23177:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4698,
+                                  "id": 4534,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -35850,43 +35991,43 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "22851:33:7",
+                                  "src": "23177:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "22838:46:7",
+                                "src": "23164:46:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4700,
+                              "id": 4536,
                               "nodeType": "ExpressionStatement",
-                              "src": "22838:46:7"
+                              "src": "23164:46:6"
                             }
                           ]
                         }
                       }
                     ]
                   },
-                  "id": 4709,
+                  "id": 4545,
                   "nodeType": "IfStatement",
-                  "src": "22434:533:7",
+                  "src": "22760:533:6",
                   "trueBody": {
-                    "id": 4674,
+                    "id": 4510,
                     "nodeType": "Block",
-                    "src": "22454:147:7",
+                    "src": "22780:147:6",
                     "statements": [
                       {
                         "condition": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           },
-                          "id": 4665,
+                          "id": 4501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -35895,28 +36036,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4661,
+                              "id": 4497,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4653,
-                              "src": "22472:4:7",
+                              "referencedDeclaration": 4489,
+                              "src": "22798:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4662,
+                            "id": 4498,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2205,
-                            "src": "22472:11:7",
+                            "referencedDeclaration": 2029,
+                            "src": "22798:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
@@ -35926,18 +36067,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4663,
+                              "id": 4499,
                               "name": "DealStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2164,
-                              "src": "22487:10:7",
+                              "referencedDeclaration": 1988,
+                              "src": "22813:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                 "typeString": "type(enum Market.DealStatus)"
                               }
                             },
-                            "id": 4664,
+                            "id": 4500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -35945,39 +36086,39 @@
                             "memberName": "STATUS_CLOSED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22487:24:7",
+                            "src": "22813:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
-                          "src": "22472:39:7",
+                          "src": "22798:39:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4669,
+                        "id": 4505,
                         "nodeType": "IfStatement",
-                        "src": "22468:89:7",
+                        "src": "22794:89:6",
                         "trueBody": {
-                          "id": 4668,
+                          "id": 4504,
                           "nodeType": "Block",
-                          "src": "22513:44:7",
+                          "src": "22839:44:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4666,
+                                "id": 4502,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22538:4:7",
+                                "src": "22864:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -35985,10 +36126,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4667,
+                              "functionReturnParameters": 4484,
+                              "id": 4503,
                               "nodeType": "Return",
-                              "src": "22531:11:7"
+                              "src": "22857:11:6"
                             }
                           ]
                         }
@@ -35996,19 +36137,19 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4672,
+                          "id": 4508,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4670,
+                            "id": 4506,
                             "name": "nextPeriod",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4650,
-                            "src": "22570:10:7",
+                            "referencedDeclaration": 4486,
+                            "src": "22896:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -36019,14 +36160,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4671,
+                            "id": 4507,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22583:7:7",
+                            "src": "22909:7:6",
                             "subdenomination": "hours",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_3600_by_1",
@@ -36034,15 +36175,15 @@
                             },
                             "value": "1"
                           },
-                          "src": "22570:20:7",
+                          "src": "22896:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4673,
+                        "id": 4509,
                         "nodeType": "ExpressionStatement",
-                        "src": "22570:20:7"
+                        "src": "22896:20:6"
                       }
                     ]
                   }
@@ -36054,7 +36195,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4719,
+                    "id": 4555,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -36066,26 +36207,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4711,
+                            "id": 4547,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4653,
-                            "src": "22998:4:7",
+                            "referencedDeclaration": 4489,
+                            "src": "23324:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4712,
+                          "id": 4548,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2199,
-                          "src": "22998:10:7",
+                          "referencedDeclaration": 2023,
+                          "src": "23324:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36093,12 +36234,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4713,
+                          "id": 4549,
                           "name": "nextPeriod",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4650,
-                          "src": "23010:10:7",
+                          "referencedDeclaration": 4486,
+                          "src": "23336:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36116,18 +36257,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4710,
+                        "id": 4546,
                         "name": "CalculatePayment",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4870,
-                        "src": "22981:16:7",
+                        "referencedDeclaration": 4706,
+                        "src": "23307:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                           "typeString": "function (uint256,uint256) view returns (uint256)"
                         }
                       },
-                      "id": 4714,
+                      "id": 4550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -36135,7 +36276,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22981:40:7",
+                      "src": "23307:40:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -36149,26 +36290,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4715,
+                          "id": 4551,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "23024:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "23350:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4717,
+                        "id": 4553,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4716,
+                          "id": 4552,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4644,
-                          "src": "23030:6:7",
+                          "referencedDeclaration": 4480,
+                          "src": "23356:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -36179,53 +36320,53 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23024:13:7",
+                        "src": "23350:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4718,
+                      "id": 4554,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "23024:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "23350:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22981:71:7",
+                    "src": "23307:71:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4786,
+                  "id": 4622,
                   "nodeType": "IfStatement",
-                  "src": "22977:666:7",
+                  "src": "23303:666:6",
                   "trueBody": {
-                    "id": 4785,
+                    "id": 4621,
                     "nodeType": "Block",
-                    "src": "23054:589:7",
+                    "src": "23380:589:6",
                     "statements": [
                       {
                         "assignments": [
-                          4721
+                          4557
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 4721,
+                            "id": 4557,
                             "name": "nextPeriodSum",
                             "nodeType": "VariableDeclaration",
-                            "scope": 4790,
-                            "src": "23068:18:7",
+                            "scope": 4626,
+                            "src": "23394:18:6",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -36233,10 +36374,10 @@
                               "typeString": "uint256"
                             },
                             "typeName": {
-                              "id": 4720,
+                              "id": 4556,
                               "name": "uint",
                               "nodeType": "ElementaryTypeName",
-                              "src": "23068:4:7",
+                              "src": "23394:4:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -36246,7 +36387,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 4733,
+                        "id": 4569,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -36256,26 +36397,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4728,
+                                  "id": 4564,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23134:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "23460:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4730,
+                                "id": 4566,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4729,
+                                  "id": 4565,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4644,
-                                  "src": "23140:6:7",
+                                  "referencedDeclaration": 4480,
+                                  "src": "23466:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36286,21 +36427,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23134:13:7",
+                                "src": "23460:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4731,
+                              "id": 4567,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2207,
-                              "src": "23134:28:7",
+                              "referencedDeclaration": 2031,
+                              "src": "23460:28:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -36321,26 +36462,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4723,
+                                    "id": 4559,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4653,
-                                    "src": "23106:4:7",
+                                    "referencedDeclaration": 4489,
+                                    "src": "23432:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4724,
+                                  "id": 4560,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "23106:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "23432:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36348,12 +36489,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 4725,
+                                  "id": 4561,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "23118:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23444:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -36371,18 +36512,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4722,
+                                "id": 4558,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "23089:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "23415:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4726,
+                              "id": 4562,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -36390,27 +36531,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "23089:40:7",
+                              "src": "23415:40:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 4727,
+                            "id": 4563,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "sub",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10771,
-                            "src": "23089:44:7",
+                            "referencedDeclaration": 11055,
+                            "src": "23415:44:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 4732,
+                          "id": 4568,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -36418,14 +36559,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23089:74:7",
+                          "src": "23415:74:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "23068:95:7"
+                        "src": "23394:95:6"
                       },
                       {
                         "condition": {
@@ -36434,7 +36575,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4740,
+                          "id": 4576,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -36446,26 +36587,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4736,
+                                  "id": 4572,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4653,
-                                  "src": "23198:4:7",
+                                  "referencedDeclaration": 4489,
+                                  "src": "23524:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4737,
+                                "id": 4573,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "23198:15:7",
+                                "referencedDeclaration": 2013,
+                                "src": "23524:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -36481,32 +36622,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4734,
+                                "id": 4570,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2315,
-                                "src": "23182:5:7",
+                                "referencedDeclaration": 2139,
+                                "src": "23508:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$10080",
+                                  "typeIdentifier": "t_contract$_SNM_$10926",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 4735,
+                              "id": 4571,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10977,
-                              "src": "23182:15:7",
+                              "referencedDeclaration": 11261,
+                              "src": "23508:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 4738,
+                            "id": 4574,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -36514,7 +36655,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "23182:32:7",
+                            "src": "23508:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -36524,27 +36665,27 @@
                           "operator": ">=",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4739,
+                            "id": 4575,
                             "name": "nextPeriodSum",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4721,
-                            "src": "23218:13:7",
+                            "referencedDeclaration": 4557,
+                            "src": "23544:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "23182:49:7",
+                          "src": "23508:49:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4783,
+                          "id": 4619,
                           "nodeType": "Block",
-                          "src": "23433:200:7",
+                          "src": "23759:200:6",
                           "statements": [
                             {
                               "eventCall": {
@@ -36552,12 +36693,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4766,
+                                    "id": 4602,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23463:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23789:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36569,26 +36710,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 4767,
+                                        "id": 4603,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "23471:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "23797:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 4769,
+                                      "id": 4605,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 4768,
+                                        "id": 4604,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4644,
-                                        "src": "23477:6:7",
+                                        "referencedDeclaration": 4480,
+                                        "src": "23803:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -36599,21 +36740,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "23471:13:7",
+                                      "src": "23797:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 4770,
+                                    "id": 4606,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2207,
-                                    "src": "23471:28:7",
+                                    "referencedDeclaration": 2031,
+                                    "src": "23797:28:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36631,18 +36772,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4765,
+                                  "id": 4601,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2274,
-                                  "src": "23456:6:7",
+                                  "referencedDeclaration": 2098,
+                                  "src": "23782:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 4771,
+                                "id": 4607,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36650,15 +36791,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23456:44:7",
+                                "src": "23782:44:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4772,
+                              "id": 4608,
                               "nodeType": "EmitStatement",
-                              "src": "23451:49:7"
+                              "src": "23777:49:6"
                             },
                             {
                               "expression": {
@@ -36666,12 +36807,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4774,
+                                    "id": 4610,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23536:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23862:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36685,18 +36826,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4773,
+                                  "id": 4609,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5004,
-                                  "src": "23518:17:7",
+                                  "referencedDeclaration": 4840,
+                                  "src": "23844:17:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4775,
+                                "id": 4611,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36704,15 +36845,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23518:25:7",
+                                "src": "23844:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4776,
+                              "id": 4612,
                               "nodeType": "ExpressionStatement",
-                              "src": "23518:25:7"
+                              "src": "23844:25:6"
                             },
                             {
                               "expression": {
@@ -36720,12 +36861,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4778,
+                                    "id": 4614,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23582:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23908:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -36739,18 +36880,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4777,
+                                  "id": 4613,
                                   "name": "RefundRemainingFunds",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4828,
-                                  "src": "23561:20:7",
+                                  "referencedDeclaration": 4664,
+                                  "src": "23887:20:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 4779,
+                                "id": 4615,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36758,28 +36899,28 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23561:28:7",
+                                "src": "23887:28:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 4780,
+                              "id": 4616,
                               "nodeType": "ExpressionStatement",
-                              "src": "23561:28:7"
+                              "src": "23887:28:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4781,
+                                "id": 4617,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "23614:4:7",
+                                "src": "23940:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -36787,20 +36928,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4782,
+                              "functionReturnParameters": 4484,
+                              "id": 4618,
                               "nodeType": "Return",
-                              "src": "23607:11:7"
+                              "src": "23933:11:6"
                             }
                           ]
                         },
-                        "id": 4784,
+                        "id": 4620,
                         "nodeType": "IfStatement",
-                        "src": "23178:455:7",
+                        "src": "23504:455:6",
                         "trueBody": {
-                          "id": 4764,
+                          "id": 4600,
                           "nodeType": "Block",
-                          "src": "23233:194:7",
+                          "src": "23559:194:6",
                           "statements": [
                             {
                               "expression": {
@@ -36813,26 +36954,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4744,
+                                          "id": 4580,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4653,
-                                          "src": "23278:4:7",
+                                          "referencedDeclaration": 4489,
+                                          "src": "23604:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4745,
+                                        "id": 4581,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2189,
-                                        "src": "23278:15:7",
+                                        "referencedDeclaration": 2013,
+                                        "src": "23604:15:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -36840,25 +36981,25 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4746,
+                                        "id": 4582,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11366,
-                                        "src": "23295:4:7",
+                                        "referencedDeclaration": 11646,
+                                        "src": "23621:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         }
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4747,
+                                        "id": 4583,
                                         "name": "nextPeriodSum",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4721,
-                                        "src": "23301:13:7",
+                                        "referencedDeclaration": 4557,
+                                        "src": "23627:13:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -36872,7 +37013,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -36882,32 +37023,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4742,
+                                        "id": 4578,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "23259:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "23585:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4743,
+                                      "id": 4579,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 11153,
-                                      "src": "23259:18:7",
+                                      "referencedDeclaration": 11437,
+                                      "src": "23585:18:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4748,
+                                    "id": 4584,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -36915,7 +37056,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "23259:56:7",
+                                    "src": "23585:56:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -36929,21 +37070,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4741,
+                                  "id": 4577,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "23251:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "23577:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4749,
+                                "id": 4585,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36951,20 +37092,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23251:65:7",
+                                "src": "23577:65:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4750,
+                              "id": 4586,
                               "nodeType": "ExpressionStatement",
-                              "src": "23251:65:7"
+                              "src": "23577:65:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4762,
+                                "id": 4598,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -36975,26 +37116,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4751,
+                                      "id": 4587,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "23334:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "23660:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4753,
+                                    "id": 4589,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4752,
+                                      "id": 4588,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4644,
-                                      "src": "23340:6:7",
+                                      "referencedDeclaration": 4480,
+                                      "src": "23666:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -37005,21 +37146,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "23334:13:7",
+                                    "src": "23660:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4754,
+                                  "id": 4590,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "23334:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "23660:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37032,12 +37173,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 4760,
+                                      "id": 4596,
                                       "name": "nextPeriodSum",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4721,
-                                      "src": "23398:13:7",
+                                      "referencedDeclaration": 4557,
+                                      "src": "23724:13:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -37057,26 +37198,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4755,
+                                          "id": 4591,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "23365:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "23691:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4757,
+                                        "id": 4593,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4756,
+                                          "id": 4592,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4644,
-                                          "src": "23371:6:7",
+                                          "referencedDeclaration": 4480,
+                                          "src": "23697:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -37087,41 +37228,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "23365:13:7",
+                                        "src": "23691:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4758,
+                                      "id": 4594,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "23365:28:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "23691:28:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4759,
+                                    "id": 4595,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "23365:32:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "23691:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4761,
+                                  "id": 4597,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -37129,21 +37270,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "23365:47:7",
+                                  "src": "23691:47:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "23334:78:7",
+                                "src": "23660:78:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4763,
+                              "id": 4599,
                               "nodeType": "ExpressionStatement",
-                              "src": "23334:78:7"
+                              "src": "23660:78:6"
                             }
                           ]
                         }
@@ -37155,14 +37296,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4787,
+                    "id": 4623,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23659:4:7",
+                    "src": "23985:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -37170,15 +37311,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4648,
-                  "id": 4788,
+                  "functionReturnParameters": 4484,
+                  "id": 4624,
                   "nodeType": "Return",
-                  "src": "23652:11:7"
+                  "src": "23978:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4790,
+            "id": 4626,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -37186,16 +37327,16 @@
             "name": "ReserveNextPeriodFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4645,
+              "id": 4481,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4644,
+                  "id": 4480,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4790,
-                  "src": "22319:11:7",
+                  "scope": 4626,
+                  "src": "22645:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37203,10 +37344,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4643,
+                    "id": 4479,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22319:4:7",
+                    "src": "22645:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37216,20 +37357,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22318:13:7"
+              "src": "22644:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4648,
+              "id": 4484,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4647,
+                  "id": 4483,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4790,
-                  "src": "22350:4:7",
+                  "scope": 4626,
+                  "src": "22676:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37237,10 +37378,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4646,
+                    "id": 4482,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22350:4:7",
+                    "src": "22676:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37250,19 +37391,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22349:6:7"
+              "src": "22675:6:6"
             },
-            "scope": 5229,
-            "src": "22287:1383:7",
+            "scope": 5065,
+            "src": "22613:1383:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4827,
+              "id": 4663,
               "nodeType": "Block",
-              "src": "23742:217:7",
+              "src": "24068:217:6",
               "statements": [
                 {
                   "condition": {
@@ -37271,7 +37412,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4802,
+                    "id": 4638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -37282,26 +37423,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4797,
+                          "id": 4633,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "23756:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "24082:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4799,
+                        "id": 4635,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4798,
+                          "id": 4634,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4792,
-                          "src": "23762:6:7",
+                          "referencedDeclaration": 4628,
+                          "src": "24088:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -37312,21 +37453,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23756:13:7",
+                        "src": "24082:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4800,
+                      "id": 4636,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "23756:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "24082:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -37337,14 +37478,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4801,
+                      "id": 4637,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "23788:1:7",
+                      "src": "24114:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -37352,20 +37493,20 @@
                       },
                       "value": "0"
                     },
-                    "src": "23756:33:7",
+                    "src": "24082:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4824,
+                  "id": 4660,
                   "nodeType": "IfStatement",
-                  "src": "23752:180:7",
+                  "src": "24078:180:6",
                   "trueBody": {
-                    "id": 4823,
+                    "id": 4659,
                     "nodeType": "Block",
-                    "src": "23791:141:7",
+                    "src": "24117:141:6",
                     "statements": [
                       {
                         "expression": {
@@ -37377,26 +37518,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4806,
+                                  "id": 4642,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23820:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24146:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4808,
+                                "id": 4644,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4807,
+                                  "id": 4643,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4792,
-                                  "src": "23826:6:7",
+                                  "referencedDeclaration": 4628,
+                                  "src": "24152:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37407,21 +37548,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23820:13:7",
+                                "src": "24146:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4809,
+                              "id": 4645,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "23820:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "24146:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -37433,26 +37574,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4810,
+                                  "id": 4646,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23846:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24172:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4812,
+                                "id": 4648,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4811,
+                                  "id": 4647,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4792,
-                                  "src": "23852:6:7",
+                                  "referencedDeclaration": 4628,
+                                  "src": "24178:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -37463,21 +37604,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23846:13:7",
+                                "src": "24172:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4813,
+                              "id": 4649,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2207,
-                              "src": "23846:28:7",
+                              "referencedDeclaration": 2031,
+                              "src": "24172:28:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -37497,32 +37638,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4803,
+                              "id": 4639,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2315,
-                              "src": "23805:5:7",
+                              "referencedDeclaration": 2139,
+                              "src": "24131:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_SNM_$10080",
+                                "typeIdentifier": "t_contract$_SNM_$10926",
                                 "typeString": "contract SNM"
                               }
                             },
-                            "id": 4805,
+                            "id": 4641,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "transfer",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10965,
-                            "src": "23805:14:7",
+                            "referencedDeclaration": 11249,
+                            "src": "24131:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                               "typeString": "function (address,uint256) external returns (bool)"
                             }
                           },
-                          "id": 4814,
+                          "id": 4650,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -37530,20 +37671,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23805:70:7",
+                          "src": "24131:70:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4815,
+                        "id": 4651,
                         "nodeType": "ExpressionStatement",
-                        "src": "23805:70:7"
+                        "src": "24131:70:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4821,
+                          "id": 4657,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -37554,26 +37695,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4816,
+                                "id": 4652,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "23889:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "24215:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4818,
+                              "id": 4654,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4817,
+                                "id": 4653,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4792,
-                                "src": "23895:6:7",
+                                "referencedDeclaration": 4628,
+                                "src": "24221:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -37584,21 +37725,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "23889:13:7",
+                              "src": "24215:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4819,
+                            "id": 4655,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "blockedBalance",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2207,
-                            "src": "23889:28:7",
+                            "referencedDeclaration": 2031,
+                            "src": "24215:28:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -37609,14 +37750,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 4820,
+                            "id": 4656,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "23920:1:7",
+                            "src": "24246:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -37624,15 +37765,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "23889:32:7",
+                          "src": "24215:32:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4822,
+                        "id": 4658,
                         "nodeType": "ExpressionStatement",
-                        "src": "23889:32:7"
+                        "src": "24215:32:6"
                       }
                     ]
                   }
@@ -37641,14 +37782,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4825,
+                    "id": 4661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23948:4:7",
+                    "src": "24274:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -37656,15 +37797,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4796,
-                  "id": 4826,
+                  "functionReturnParameters": 4632,
+                  "id": 4662,
                   "nodeType": "Return",
-                  "src": "23941:11:7"
+                  "src": "24267:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4828,
+            "id": 4664,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -37672,16 +37813,16 @@
             "name": "RefundRemainingFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4793,
+              "id": 4629,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4792,
+                  "id": 4628,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4828,
-                  "src": "23706:11:7",
+                  "scope": 4664,
+                  "src": "24032:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37689,10 +37830,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4791,
+                    "id": 4627,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23706:4:7",
+                    "src": "24032:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37702,20 +37843,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23705:13:7"
+              "src": "24031:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4796,
+              "id": 4632,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4795,
+                  "id": 4631,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4828,
-                  "src": "23737:4:7",
+                  "scope": 4664,
+                  "src": "24063:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37723,10 +37864,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4794,
+                    "id": 4630,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23737:4:7",
+                    "src": "24063:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37736,19 +37877,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23736:6:7"
+              "src": "24062:6:6"
             },
-            "scope": 5229,
-            "src": "23676:283:7",
+            "scope": 5065,
+            "src": "24002:283:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4842,
+              "id": 4678,
               "nodeType": "Block",
-              "src": "24022:51:7",
+              "src": "24348:51:6",
               "statements": [
                 {
                   "expression": {
@@ -37757,7 +37898,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4840,
+                    "id": 4676,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -37768,26 +37909,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4835,
+                          "id": 4671,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "24039:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "24365:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4837,
+                        "id": 4673,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4836,
+                          "id": 4672,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4830,
-                          "src": "24045:6:7",
+                          "referencedDeclaration": 4666,
+                          "src": "24371:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -37798,21 +37939,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24039:13:7",
+                        "src": "24365:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4838,
+                      "id": 4674,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2197,
-                      "src": "24039:22:7",
+                      "referencedDeclaration": 2021,
+                      "src": "24365:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -37823,14 +37964,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4839,
+                      "id": 4675,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "24065:1:7",
+                      "src": "24391:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -37838,21 +37979,21 @@
                       },
                       "value": "0"
                     },
-                    "src": "24039:27:7",
+                    "src": "24365:27:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 4834,
-                  "id": 4841,
+                  "functionReturnParameters": 4670,
+                  "id": 4677,
                   "nodeType": "Return",
-                  "src": "24032:34:7"
+                  "src": "24358:34:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4843,
+            "id": 4679,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -37860,16 +38001,16 @@
             "name": "IsSpot",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4831,
+              "id": 4667,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4830,
+                  "id": 4666,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4843,
-                  "src": "23981:11:7",
+                  "scope": 4679,
+                  "src": "24307:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37877,10 +38018,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4829,
+                    "id": 4665,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23981:4:7",
+                    "src": "24307:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -37890,20 +38031,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23980:13:7"
+              "src": "24306:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4834,
+              "id": 4670,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4833,
+                  "id": 4669,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4843,
-                  "src": "24017:4:7",
+                  "scope": 4679,
+                  "src": "24343:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -37911,10 +38052,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4832,
+                    "id": 4668,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24017:4:7",
+                    "src": "24343:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -37924,32 +38065,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24016:6:7"
+              "src": "24342:6:6"
             },
-            "scope": 5229,
-            "src": "23965:108:7",
+            "scope": 5065,
+            "src": "24291:108:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4869,
+              "id": 4705,
               "nodeType": "Block",
-              "src": "24161:109:7",
+              "src": "24487:109:6",
               "statements": [
                 {
                   "assignments": [
-                    4853
+                    4689
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4853,
+                      "id": 4689,
                       "name": "rate",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4870,
-                      "src": "24171:9:7",
+                      "scope": 4706,
+                      "src": "24497:9:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -37957,10 +38098,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4852,
+                        "id": 4688,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "24171:4:7",
+                        "src": "24497:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -37970,7 +38111,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4857,
+                  "id": 4693,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [],
@@ -37978,32 +38119,32 @@
                       "argumentTypes": [],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4854,
+                        "id": 4690,
                         "name": "oracle",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2319,
-                        "src": "24183:6:7",
+                        "referencedDeclaration": 2143,
+                        "src": "24509:6:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                          "typeIdentifier": "t_contract$_OracleUSD_$9523",
                           "typeString": "contract OracleUSD"
                         }
                       },
-                      "id": 4855,
+                      "id": 4691,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "getCurrentPrice",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 8676,
-                      "src": "24183:22:7",
+                      "referencedDeclaration": 9522,
+                      "src": "24509:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                         "typeString": "function () view external returns (uint256)"
                       }
                     },
-                    "id": 4856,
+                    "id": 4692,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38011,14 +38152,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24183:24:7",
+                    "src": "24509:24:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "24171:36:7"
+                  "src": "24497:36:6"
                 },
                 {
                   "expression": {
@@ -38027,14 +38168,14 @@
                       {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 4866,
+                        "id": 4702,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "24258:4:7",
+                        "src": "24584:4:6",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -38055,12 +38196,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 4863,
+                            "id": 4699,
                             "name": "_period",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4847,
-                            "src": "24245:7:7",
+                            "referencedDeclaration": 4683,
+                            "src": "24571:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -38079,12 +38220,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4860,
+                                "id": 4696,
                                 "name": "_price",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4845,
-                                "src": "24233:6:7",
+                                "referencedDeclaration": 4681,
+                                "src": "24559:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -38100,32 +38241,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4858,
+                                "id": 4694,
                                 "name": "rate",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4853,
-                                "src": "24224:4:7",
+                                "referencedDeclaration": 4689,
+                                "src": "24550:4:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4859,
+                              "id": 4695,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "mul",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10737,
-                              "src": "24224:8:7",
+                              "referencedDeclaration": 11021,
+                              "src": "24550:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4861,
+                            "id": 4697,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38133,27 +38274,27 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24224:16:7",
+                            "src": "24550:16:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4862,
+                          "id": 4698,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "mul",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10737,
-                          "src": "24224:20:7",
+                          "referencedDeclaration": 11021,
+                          "src": "24550:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 4864,
+                        "id": 4700,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -38161,27 +38302,27 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "24224:29:7",
+                        "src": "24550:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "id": 4865,
+                      "id": 4701,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "div",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 10751,
-                      "src": "24224:33:7",
+                      "referencedDeclaration": 11035,
+                      "src": "24550:33:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                         "typeString": "function (uint256,uint256) pure returns (uint256)"
                       }
                     },
-                    "id": 4867,
+                    "id": 4703,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38189,21 +38330,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24224:39:7",
+                    "src": "24550:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4851,
-                  "id": 4868,
+                  "functionReturnParameters": 4687,
+                  "id": 4704,
                   "nodeType": "Return",
-                  "src": "24217:46:7"
+                  "src": "24543:46:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4870,
+            "id": 4706,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -38211,16 +38352,16 @@
             "name": "CalculatePayment",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4848,
+              "id": 4684,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4845,
+                  "id": 4681,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24105:11:7",
+                  "scope": 4706,
+                  "src": "24431:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38228,10 +38369,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4844,
+                    "id": 4680,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24105:4:7",
+                    "src": "24431:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38242,11 +38383,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4847,
+                  "id": 4683,
                   "name": "_period",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24118:12:7",
+                  "scope": 4706,
+                  "src": "24444:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38254,10 +38395,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4846,
+                    "id": 4682,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24118:4:7",
+                    "src": "24444:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38267,20 +38408,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24104:27:7"
+              "src": "24430:27:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4851,
+              "id": 4687,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4850,
+                  "id": 4686,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24155:4:7",
+                  "scope": 4706,
+                  "src": "24481:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -38288,10 +38429,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4849,
+                    "id": 4685,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24155:4:7",
+                    "src": "24481:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -38301,19 +38442,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24154:6:7"
+              "src": "24480:6:6"
             },
-            "scope": 5229,
-            "src": "24079:191:7",
+            "scope": 5065,
+            "src": "24405:191:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4930,
+              "id": 4766,
               "nodeType": "Block",
-              "src": "24344:418:7",
+              "src": "24670:418:6",
               "statements": [
                 {
                   "expression": {
@@ -38325,7 +38466,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4889,
+                        "id": 4725,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -38336,7 +38477,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4884,
+                          "id": 4720,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -38345,18 +38486,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4878,
+                              "id": 4714,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "24401:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "24727:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4879,
+                            "id": 4715,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38364,7 +38505,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24401:10:7",
+                            "src": "24727:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -38378,26 +38519,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4880,
+                                "id": 4716,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "24415:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "24741:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4882,
+                              "id": 4718,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4881,
+                                "id": 4717,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4872,
-                                "src": "24421:6:7",
+                                "referencedDeclaration": 4708,
+                                "src": "24747:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -38408,27 +38549,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "24415:13:7",
+                              "src": "24741:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4883,
+                            "id": 4719,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "24415:24:7",
+                            "referencedDeclaration": 2013,
+                            "src": "24741:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "24401:38:7",
+                          "src": "24727:38:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -38439,24 +38580,24 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                            "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                             "typeString": "enum Market.BlacklistPerson"
                           },
-                          "id": 4888,
+                          "id": 4724,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4885,
+                            "id": 4721,
                             "name": "role",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4874,
-                            "src": "24443:4:7",
+                            "referencedDeclaration": 4710,
+                            "src": "24769:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
@@ -38466,18 +38607,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4886,
+                              "id": 4722,
                               "name": "BlacklistPerson",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2182,
-                              "src": "24451:15:7",
+                              "referencedDeclaration": 2006,
+                              "src": "24777:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                                 "typeString": "type(enum Market.BlacklistPerson)"
                               }
                             },
-                            "id": 4887,
+                            "id": 4723,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -38485,19 +38626,19 @@
                             "memberName": "BLACKLIST_NOBODY",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24451:32:7",
+                            "src": "24777:32:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
-                          "src": "24443:40:7",
+                          "src": "24769:40:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "24401:82:7",
+                        "src": "24727:82:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -38511,21 +38652,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4877,
+                      "id": 4713,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24393:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "24719:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4890,
+                    "id": 4726,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -38533,38 +38674,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24393:91:7",
+                    "src": "24719:91:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4891,
+                  "id": 4727,
                   "nodeType": "ExpressionStatement",
-                  "src": "24393:91:7"
+                  "src": "24719:91:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     },
-                    "id": 4895,
+                    "id": 4731,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4892,
+                      "id": 4728,
                       "name": "role",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4874,
-                      "src": "24498:4:7",
+                      "referencedDeclaration": 4710,
+                      "src": "24824:4:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
@@ -38574,18 +38715,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4893,
+                        "id": 4729,
                         "name": "BlacklistPerson",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2182,
-                        "src": "24506:15:7",
+                        "referencedDeclaration": 2006,
+                        "src": "24832:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                           "typeString": "type(enum Market.BlacklistPerson)"
                         }
                       },
-                      "id": 4894,
+                      "id": 4730,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -38593,13 +38734,13 @@
                       "memberName": "BLACKLIST_WORKER",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24506:32:7",
+                      "src": "24832:32:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
-                    "src": "24498:40:7",
+                    "src": "24824:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -38609,24 +38750,24 @@
                     "condition": {
                       "argumentTypes": null,
                       "commonType": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       },
-                      "id": 4913,
+                      "id": 4749,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 4910,
+                        "id": 4746,
                         "name": "role",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4874,
-                        "src": "24633:4:7",
+                        "referencedDeclaration": 4710,
+                        "src": "24959:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
@@ -38636,18 +38777,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4911,
+                          "id": 4747,
                           "name": "BlacklistPerson",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2182,
-                          "src": "24641:15:7",
+                          "referencedDeclaration": 2006,
+                          "src": "24967:15:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                             "typeString": "type(enum Market.BlacklistPerson)"
                           }
                         },
-                        "id": 4912,
+                        "id": 4748,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -38655,26 +38796,26 @@
                         "memberName": "BLACKLIST_MASTER",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "24641:32:7",
+                        "src": "24967:32:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
-                      "src": "24633:40:7",
+                      "src": "24959:40:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4928,
+                    "id": 4764,
                     "nodeType": "IfStatement",
-                    "src": "24629:127:7",
+                    "src": "24955:127:6",
                     "trueBody": {
-                      "id": 4927,
+                      "id": 4763,
                       "nodeType": "Block",
-                      "src": "24675:81:7",
+                      "src": "25001:81:6",
                       "statements": [
                         {
                           "expression": {
@@ -38686,26 +38827,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4917,
+                                    "id": 4753,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "24696:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "25022:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 4919,
+                                  "id": 4755,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4918,
+                                    "id": 4754,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4872,
-                                    "src": "24702:6:7",
+                                    "referencedDeclaration": 4708,
+                                    "src": "25028:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -38716,21 +38857,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24696:13:7",
+                                  "src": "25022:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 4920,
+                                "id": 4756,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "24696:24:7",
+                                "referencedDeclaration": 2013,
+                                "src": "25022:24:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -38742,26 +38883,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4921,
+                                    "id": 4757,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "24722:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "25048:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 4923,
+                                  "id": 4759,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4922,
+                                    "id": 4758,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4872,
-                                    "src": "24728:6:7",
+                                    "referencedDeclaration": 4708,
+                                    "src": "25054:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -38772,21 +38913,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24722:13:7",
+                                  "src": "25048:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 4924,
+                                "id": 4760,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "masterID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2191,
-                                "src": "24722:22:7",
+                                "referencedDeclaration": 2015,
+                                "src": "25048:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -38806,32 +38947,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4914,
+                                "id": 4750,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "24689:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "25015:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 4916,
+                              "id": 4752,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1056,
-                              "src": "24689:6:7",
+                              "referencedDeclaration": 880,
+                              "src": "25015:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) external returns (bool)"
                               }
                             },
-                            "id": 4925,
+                            "id": 4761,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -38839,26 +38980,26 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24689:56:7",
+                            "src": "25015:56:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "id": 4926,
+                          "id": 4762,
                           "nodeType": "ExpressionStatement",
-                          "src": "24689:56:7"
+                          "src": "25015:56:6"
                         }
                       ]
                     }
                   },
-                  "id": 4929,
+                  "id": 4765,
                   "nodeType": "IfStatement",
-                  "src": "24494:262:7",
+                  "src": "24820:262:6",
                   "trueBody": {
-                    "id": 4909,
+                    "id": 4745,
                     "nodeType": "Block",
-                    "src": "24540:83:7",
+                    "src": "24866:83:6",
                     "statements": [
                       {
                         "expression": {
@@ -38870,26 +39011,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4899,
+                                  "id": 4735,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24561:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24887:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4901,
+                                "id": 4737,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4900,
+                                  "id": 4736,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4872,
-                                  "src": "24567:6:7",
+                                  "referencedDeclaration": 4708,
+                                  "src": "24893:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -38900,21 +39041,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24561:13:7",
+                                "src": "24887:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4902,
+                              "id": 4738,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "24561:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "24887:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -38926,26 +39067,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4903,
+                                  "id": 4739,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24587:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24913:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4905,
+                                "id": 4741,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4904,
+                                  "id": 4740,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4872,
-                                  "src": "24593:6:7",
+                                  "referencedDeclaration": 4708,
+                                  "src": "24919:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -38956,21 +39097,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24587:13:7",
+                                "src": "24913:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4906,
+                              "id": 4742,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "24587:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "24913:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -38990,32 +39131,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4896,
+                              "id": 4732,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2317,
-                              "src": "24554:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "24880:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 4898,
+                            "id": 4734,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 1056,
-                            "src": "24554:6:7",
+                            "referencedDeclaration": 880,
+                            "src": "24880:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) external returns (bool)"
                             }
                           },
-                          "id": 4907,
+                          "id": 4743,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39023,15 +39164,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "24554:58:7",
+                          "src": "24880:58:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4908,
+                        "id": 4744,
                         "nodeType": "ExpressionStatement",
-                        "src": "24554:58:7"
+                        "src": "24880:58:6"
                       }
                     ]
                   }
@@ -39039,7 +39180,7 @@
               ]
             },
             "documentation": null,
-            "id": 4931,
+            "id": 4767,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -39047,16 +39188,16 @@
             "name": "AddToBlacklist",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4875,
+              "id": 4711,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4872,
+                  "id": 4708,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4931,
-                  "src": "24300:11:7",
+                  "scope": 4767,
+                  "src": "24626:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -39064,10 +39205,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4871,
+                    "id": 4707,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24300:4:7",
+                    "src": "24626:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -39078,26 +39219,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4874,
+                  "id": 4710,
                   "name": "role",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4931,
-                  "src": "24313:20:7",
+                  "scope": 4767,
+                  "src": "24639:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4873,
+                    "id": 4709,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2182,
-                    "src": "24313:15:7",
+                    "referencedDeclaration": 2006,
+                    "src": "24639:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -39105,35 +39246,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24299:35:7"
+              "src": "24625:35:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4876,
+              "id": 4712,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24344:0:7"
+              "src": "24670:0:6"
             },
-            "scope": 5229,
-            "src": "24276:486:7",
+            "scope": 5065,
+            "src": "24602:486:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5003,
+              "id": 4839,
               "nodeType": "Block",
-              "src": "24817:451:7",
+              "src": "25143:451:6",
               "statements": [
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     },
-                    "id": 4942,
+                    "id": 4778,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39144,26 +39285,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4936,
+                          "id": 4772,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "24831:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25157:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4938,
+                        "id": 4774,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4937,
+                          "id": 4773,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "24837:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25163:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39174,23 +39315,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24831:13:7",
+                        "src": "25157:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4939,
+                      "id": 4775,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2205,
-                      "src": "24831:20:7",
+                      "referencedDeclaration": 2029,
+                      "src": "25157:20:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -39200,18 +39341,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4940,
+                        "id": 4776,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2164,
-                        "src": "24855:10:7",
+                        "referencedDeclaration": 1988,
+                        "src": "25181:10:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 4941,
+                      "id": 4777,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -39219,33 +39360,33 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24855:24:7",
+                      "src": "25181:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "24831:48:7",
+                    "src": "25157:48:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4945,
+                  "id": 4781,
                   "nodeType": "IfStatement",
-                  "src": "24827:85:7",
+                  "src": "25153:85:6",
                   "trueBody": {
-                    "id": 4944,
+                    "id": 4780,
                     "nodeType": "Block",
-                    "src": "24881:31:7",
+                    "src": "25207:31:6",
                     "statements": [
                       {
                         "expression": null,
-                        "functionReturnParameters": 4935,
-                        "id": 4943,
+                        "functionReturnParameters": 4771,
+                        "id": 4779,
                         "nodeType": "Return",
-                        "src": "24895:7:7"
+                        "src": "25221:7:6"
                       }
                     ]
                   }
@@ -39260,10 +39401,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 4953,
+                            "id": 4789,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39274,26 +39415,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4947,
+                                  "id": 4783,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24930:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25256:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4949,
+                                "id": 4785,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4948,
+                                  "id": 4784,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "24936:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25262:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39304,23 +39445,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24930:13:7",
+                                "src": "25256:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4950,
+                              "id": 4786,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2205,
-                              "src": "24930:20:7",
+                              "referencedDeclaration": 2029,
+                              "src": "25256:20:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -39330,18 +39471,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4951,
+                                "id": 4787,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2164,
-                                "src": "24954:10:7",
+                                "referencedDeclaration": 1988,
+                                "src": "25280:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 4952,
+                              "id": 4788,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -39349,27 +39490,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "24954:26:7",
+                              "src": "25280:26:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "24930:50:7",
+                            "src": "25256:50:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 4954,
+                        "id": 4790,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "24929:52:7",
+                        "src": "25255:52:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -39383,21 +39524,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4946,
+                      "id": 4782,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24921:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "25247:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4955,
+                    "id": 4791,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39405,15 +39546,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24921:61:7",
+                    "src": "25247:61:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4956,
+                  "id": 4792,
                   "nodeType": "ExpressionStatement",
-                  "src": "24921:61:7"
+                  "src": "25247:61:6"
                 },
                 {
                   "expression": {
@@ -39425,7 +39566,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4980,
+                        "id": 4816,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -39436,7 +39577,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4972,
+                          "id": 4808,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39447,7 +39588,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4964,
+                            "id": 4800,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39456,18 +39597,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4958,
+                                "id": 4794,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "25000:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "25326:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4959,
+                              "id": 4795,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -39475,7 +39616,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25000:10:7",
+                              "src": "25326:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -39489,26 +39630,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4960,
+                                  "id": 4796,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "25014:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25340:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4962,
+                                "id": 4798,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4961,
+                                  "id": 4797,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "25020:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25346:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39519,27 +39660,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25014:13:7",
+                                "src": "25340:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4963,
+                              "id": 4799,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "25014:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "25340:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25000:38:7",
+                            "src": "25326:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -39553,7 +39694,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4971,
+                            "id": 4807,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39562,18 +39703,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4965,
+                                "id": 4801,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "25042:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "25368:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4966,
+                              "id": 4802,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -39581,7 +39722,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25042:10:7",
+                              "src": "25368:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -39595,26 +39736,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4967,
+                                  "id": 4803,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "25056:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25382:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4969,
+                                "id": 4805,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4968,
+                                  "id": 4804,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "25062:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25388:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -39625,33 +39766,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25056:13:7",
+                                "src": "25382:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4970,
+                              "id": 4806,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "25056:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "25382:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25042:38:7",
+                            "src": "25368:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25000:80:7",
+                          "src": "25326:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -39665,7 +39806,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4979,
+                          "id": 4815,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -39674,18 +39815,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4973,
+                              "id": 4809,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "25084:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "25410:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4974,
+                            "id": 4810,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -39693,7 +39834,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "25084:10:7",
+                            "src": "25410:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -39707,26 +39848,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4975,
+                                "id": 4811,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "25098:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "25424:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4977,
+                              "id": 4813,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4976,
+                                "id": 4812,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4933,
-                                "src": "25104:6:7",
+                                "referencedDeclaration": 4769,
+                                "src": "25430:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -39737,33 +39878,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "25098:13:7",
+                              "src": "25424:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4978,
+                            "id": 4814,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "25098:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "25424:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "25084:36:7",
+                          "src": "25410:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "25000:120:7",
+                        "src": "25326:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -39777,21 +39918,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4957,
+                      "id": 4793,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24992:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "25318:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4981,
+                    "id": 4817,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39799,20 +39940,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24992:129:7",
+                    "src": "25318:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4982,
+                  "id": 4818,
                   "nodeType": "ExpressionStatement",
-                  "src": "24992:129:7"
+                  "src": "25318:129:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4989,
+                    "id": 4825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39823,26 +39964,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4983,
+                          "id": 4819,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "25131:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25457:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4985,
+                        "id": 4821,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4984,
+                          "id": 4820,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "25137:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25463:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39853,23 +39994,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25131:13:7",
+                        "src": "25457:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4986,
+                      "id": 4822,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2205,
-                      "src": "25131:20:7",
+                      "referencedDeclaration": 2029,
+                      "src": "25457:20:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -39879,18 +40020,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4987,
+                        "id": 4823,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2164,
-                        "src": "25154:10:7",
+                        "referencedDeclaration": 1988,
+                        "src": "25480:10:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 4988,
+                      "id": 4824,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -39898,26 +40039,26 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25154:24:7",
+                      "src": "25480:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "25131:47:7",
+                    "src": "25457:47:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
-                  "id": 4990,
+                  "id": 4826,
                   "nodeType": "ExpressionStatement",
-                  "src": "25131:47:7"
+                  "src": "25457:47:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4997,
+                    "id": 4833,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -39928,26 +40069,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4991,
+                          "id": 4827,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "25188:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25514:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4993,
+                        "id": 4829,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4992,
+                          "id": 4828,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "25194:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25520:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -39958,21 +40099,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25188:13:7",
+                        "src": "25514:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4994,
+                      "id": 4830,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2203,
-                      "src": "25188:21:7",
+                      "referencedDeclaration": 2027,
+                      "src": "25514:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -39984,18 +40125,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4995,
+                        "id": 4831,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "25212:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "25538:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 4996,
+                      "id": 4832,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40003,21 +40144,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25212:15:7",
+                      "src": "25538:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25188:39:7",
+                    "src": "25514:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4998,
+                  "id": 4834,
                   "nodeType": "ExpressionStatement",
-                  "src": "25188:39:7"
+                  "src": "25514:39:6"
                 },
                 {
                   "eventCall": {
@@ -40025,12 +40166,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5000,
+                        "id": 4836,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4933,
-                        "src": "25254:6:7",
+                        "referencedDeclaration": 4769,
+                        "src": "25580:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40044,18 +40185,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4999,
+                      "id": 4835,
                       "name": "DealUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2268,
-                      "src": "25242:11:7",
+                      "referencedDeclaration": 2092,
+                      "src": "25568:11:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5001,
+                    "id": 4837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40063,20 +40204,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25242:19:7",
+                    "src": "25568:19:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5002,
+                  "id": 4838,
                   "nodeType": "EmitStatement",
-                  "src": "25237:24:7"
+                  "src": "25563:24:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5004,
+            "id": 4840,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -40084,16 +40225,16 @@
             "name": "InternalCloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4934,
+              "id": 4770,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4933,
+                  "id": 4769,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5004,
-                  "src": "24795:11:7",
+                  "scope": 4840,
+                  "src": "25121:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40101,10 +40242,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4932,
+                    "id": 4768,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24795:4:7",
+                    "src": "25121:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -40114,39 +40255,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24794:13:7"
+              "src": "25120:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4935,
+              "id": 4771,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24817:0:7"
+              "src": "25143:0:6"
             },
-            "scope": 5229,
-            "src": "24768:500:7",
+            "scope": 5065,
+            "src": "25094:500:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5046,
+              "id": 4882,
               "nodeType": "Block",
-              "src": "25355:215:7",
+              "src": "25681:215:6",
               "statements": [
                 {
                   "assignments": [
-                    5016
+                    4852
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5016,
+                      "id": 4852,
                       "name": "benchmarks",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5047,
-                      "src": "25365:26:7",
+                      "scope": 4883,
+                      "src": "25691:26:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -40155,19 +40296,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5014,
+                          "id": 4850,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25365:6:7",
+                          "src": "25691:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5015,
+                        "id": 4851,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25365:8:7",
+                        "src": "25691:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
@@ -40177,18 +40318,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5022,
+                  "id": 4858,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5020,
+                        "id": 4856,
                         "name": "benchmarksQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2332,
-                        "src": "25407:18:7",
+                        "referencedDeclaration": 2156,
+                        "src": "25733:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40202,39 +40343,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5019,
+                      "id": 4855,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25394:12:7",
+                      "src": "25720:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint64_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint64[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5017,
+                          "id": 4853,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25398:6:7",
+                          "src": "25724:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5018,
+                        "id": 4854,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25398:8:7",
+                        "src": "25724:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
                         }
                       }
                     },
-                    "id": 5021,
+                    "id": 4857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40242,25 +40383,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25394:32:7",
+                    "src": "25720:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                       "typeString": "uint64[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25365:61:7"
+                  "src": "25691:61:6"
                 },
                 {
                   "body": {
-                    "id": 5042,
+                    "id": 4878,
                     "nodeType": "Block",
-                    "src": "25482:55:7",
+                    "src": "25808:55:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5040,
+                          "id": 4876,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -40269,26 +40410,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5034,
+                              "id": 4870,
                               "name": "benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5016,
-                              "src": "25496:10:7",
+                              "referencedDeclaration": 4852,
+                              "src": "25822:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 5036,
+                            "id": 4872,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5035,
+                              "id": 4871,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5024,
-                              "src": "25507:1:7",
+                              "referencedDeclaration": 4860,
+                              "src": "25833:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40299,7 +40440,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25496:13:7",
+                            "src": "25822:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
@@ -40311,26 +40452,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5037,
+                              "id": 4873,
                               "name": "_benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5007,
-                              "src": "25512:11:7",
+                              "referencedDeclaration": 4843,
+                              "src": "25838:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 5039,
+                            "id": 4875,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5038,
+                              "id": 4874,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5024,
-                              "src": "25524:1:7",
+                              "referencedDeclaration": 4860,
+                              "src": "25850:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40341,21 +40482,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25512:14:7",
+                            "src": "25838:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
                             }
                           },
-                          "src": "25496:30:7",
+                          "src": "25822:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5041,
+                        "id": 4877,
                         "nodeType": "ExpressionStatement",
-                        "src": "25496:30:7"
+                        "src": "25822:30:6"
                       }
                     ]
                   },
@@ -40365,19 +40506,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5030,
+                    "id": 4866,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5027,
+                      "id": 4863,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5024,
-                      "src": "25453:1:7",
+                      "referencedDeclaration": 4860,
+                      "src": "25779:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -40389,18 +40530,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5028,
+                        "id": 4864,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5007,
-                        "src": "25457:11:7",
+                        "referencedDeclaration": 4843,
+                        "src": "25783:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 5029,
+                      "id": 4865,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40408,31 +40549,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25457:18:7",
+                      "src": "25783:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25453:22:7",
+                    "src": "25779:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5043,
+                  "id": 4879,
                   "initializationExpression": {
                     "assignments": [
-                      5024
+                      4860
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 5024,
+                        "id": 4860,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 5047,
-                        "src": "25441:6:7",
+                        "scope": 4883,
+                        "src": "25767:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -40440,10 +40581,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 5023,
+                          "id": 4859,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25441:4:7",
+                          "src": "25767:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -40453,18 +40594,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 5026,
+                    "id": 4862,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5025,
+                      "id": 4861,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25450:1:7",
+                      "src": "25776:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -40473,12 +40614,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25441:10:7"
+                    "src": "25767:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 5032,
+                      "id": 4868,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40486,15 +40627,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25477:3:7",
+                      "src": "25803:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 5031,
+                        "id": 4867,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5024,
-                        "src": "25477:1:7",
+                        "referencedDeclaration": 4860,
+                        "src": "25803:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40505,36 +40646,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 5033,
+                    "id": 4869,
                     "nodeType": "ExpressionStatement",
-                    "src": "25477:3:7"
+                    "src": "25803:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25436:101:7"
+                  "src": "25762:101:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5044,
+                    "id": 4880,
                     "name": "benchmarks",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5016,
-                    "src": "25553:10:7",
+                    "referencedDeclaration": 4852,
+                    "src": "25879:10:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                       "typeString": "uint64[] memory"
                     }
                   },
-                  "functionReturnParameters": 5012,
-                  "id": 5045,
+                  "functionReturnParameters": 4848,
+                  "id": 4881,
                   "nodeType": "Return",
-                  "src": "25546:17:7"
+                  "src": "25872:17:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5047,
+            "id": 4883,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -40542,16 +40683,16 @@
             "name": "ResizeBenchmarks",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5008,
+              "id": 4844,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5007,
+                  "id": 4843,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5047,
-                  "src": "25300:20:7",
+                  "scope": 4883,
+                  "src": "25626:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40560,19 +40701,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5005,
+                      "id": 4841,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25300:6:7",
+                      "src": "25626:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 5006,
+                    "id": 4842,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25300:8:7",
+                    "src": "25626:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -40582,20 +40723,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25299:22:7"
+              "src": "25625:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5012,
+              "id": 4848,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5011,
+                  "id": 4847,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5047,
-                  "src": "25345:8:7",
+                  "scope": 4883,
+                  "src": "25671:8:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -40604,19 +40745,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5009,
+                      "id": 4845,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25345:6:7",
+                      "src": "25671:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 5010,
+                    "id": 4846,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25345:8:7",
+                    "src": "25671:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -40626,32 +40767,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25344:10:7"
+              "src": "25670:10:6"
             },
-            "scope": 5229,
-            "src": "25274:296:7",
+            "scope": 5065,
+            "src": "25600:296:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5089,
+              "id": 4925,
               "nodeType": "Block",
-              "src": "25649:199:7",
+              "src": "25975:199:6",
               "statements": [
                 {
                   "assignments": [
-                    5059
+                    4895
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5059,
+                      "id": 4895,
                       "name": "netflags",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5090,
-                      "src": "25659:22:7",
+                      "scope": 4926,
+                      "src": "25985:22:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -40660,19 +40801,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5057,
+                          "id": 4893,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25659:4:7",
+                          "src": "25985:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5058,
+                        "id": 4894,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25659:6:7",
+                        "src": "25985:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
@@ -40682,18 +40823,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5065,
+                  "id": 4901,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5063,
+                        "id": 4899,
                         "name": "netflagsQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2334,
-                        "src": "25695:16:7",
+                        "referencedDeclaration": 2158,
+                        "src": "26021:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -40707,39 +40848,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5062,
+                      "id": 4898,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25684:10:7",
+                      "src": "26010:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (bool[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5060,
+                          "id": 4896,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25688:4:7",
+                          "src": "26014:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5061,
+                        "id": 4897,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25688:6:7",
+                        "src": "26014:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
                         }
                       }
                     },
-                    "id": 5064,
+                    "id": 4900,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -40747,25 +40888,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25684:28:7",
+                    "src": "26010:28:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                       "typeString": "bool[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25659:53:7"
+                  "src": "25985:53:6"
                 },
                 {
                   "body": {
-                    "id": 5085,
+                    "id": 4921,
                     "nodeType": "Block",
-                    "src": "25766:51:7",
+                    "src": "26092:51:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5083,
+                          "id": 4919,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -40774,26 +40915,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5077,
+                              "id": 4913,
                               "name": "netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5059,
-                              "src": "25780:8:7",
+                              "referencedDeclaration": 4895,
+                              "src": "26106:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 5079,
+                            "id": 4915,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5078,
+                              "id": 4914,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5067,
-                              "src": "25789:1:7",
+                              "referencedDeclaration": 4903,
+                              "src": "26115:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40804,7 +40945,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25780:11:7",
+                            "src": "26106:11:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -40816,26 +40957,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5080,
+                              "id": 4916,
                               "name": "_netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5050,
-                              "src": "25794:9:7",
+                              "referencedDeclaration": 4886,
+                              "src": "26120:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 5082,
+                            "id": 4918,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5081,
+                              "id": 4917,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5067,
-                              "src": "25804:1:7",
+                              "referencedDeclaration": 4903,
+                              "src": "26130:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -40846,21 +40987,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25794:12:7",
+                            "src": "26120:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25780:26:7",
+                          "src": "26106:26:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5084,
+                        "id": 4920,
                         "nodeType": "ExpressionStatement",
-                        "src": "25780:26:7"
+                        "src": "26106:26:6"
                       }
                     ]
                   },
@@ -40870,19 +41011,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5073,
+                    "id": 4909,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5070,
+                      "id": 4906,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5067,
-                      "src": "25739:1:7",
+                      "referencedDeclaration": 4903,
+                      "src": "26065:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -40894,18 +41035,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5071,
+                        "id": 4907,
                         "name": "_netflags",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5050,
-                        "src": "25743:9:7",
+                        "referencedDeclaration": 4886,
+                        "src": "26069:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 5072,
+                      "id": 4908,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40913,31 +41054,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25743:16:7",
+                      "src": "26069:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25739:20:7",
+                    "src": "26065:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5086,
+                  "id": 4922,
                   "initializationExpression": {
                     "assignments": [
-                      5067
+                      4903
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 5067,
+                        "id": 4903,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 5090,
-                        "src": "25727:6:7",
+                        "scope": 4926,
+                        "src": "26053:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -40945,10 +41086,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 5066,
+                          "id": 4902,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25727:4:7",
+                          "src": "26053:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -40958,18 +41099,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 5069,
+                    "id": 4905,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5068,
+                      "id": 4904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25736:1:7",
+                      "src": "26062:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -40978,12 +41119,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25727:10:7"
+                    "src": "26053:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 5075,
+                      "id": 4911,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -40991,15 +41132,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25761:3:7",
+                      "src": "26087:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 5074,
+                        "id": 4910,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5067,
-                        "src": "25761:1:7",
+                        "referencedDeclaration": 4903,
+                        "src": "26087:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -41010,36 +41151,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 5076,
+                    "id": 4912,
                     "nodeType": "ExpressionStatement",
-                    "src": "25761:3:7"
+                    "src": "26087:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25722:95:7"
+                  "src": "26048:95:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5087,
+                    "id": 4923,
                     "name": "netflags",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5059,
-                    "src": "25833:8:7",
+                    "referencedDeclaration": 4895,
+                    "src": "26159:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                       "typeString": "bool[] memory"
                     }
                   },
-                  "functionReturnParameters": 5055,
-                  "id": 5088,
+                  "functionReturnParameters": 4891,
+                  "id": 4924,
                   "nodeType": "Return",
-                  "src": "25826:15:7"
+                  "src": "26152:15:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5090,
+            "id": 4926,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -41047,16 +41188,16 @@
             "name": "ResizeNetflags",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5051,
+              "id": 4887,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5050,
+                  "id": 4886,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5090,
-                  "src": "25600:16:7",
+                  "scope": 4926,
+                  "src": "25926:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41065,19 +41206,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5048,
+                      "id": 4884,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25600:4:7",
+                      "src": "25926:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 5049,
+                    "id": 4885,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25600:6:7",
+                    "src": "25926:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -41087,20 +41228,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25599:18:7"
+              "src": "25925:18:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5055,
+              "id": 4891,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5054,
+                  "id": 4890,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5090,
-                  "src": "25641:6:7",
+                  "scope": 4926,
+                  "src": "25967:6:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41109,19 +41250,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5052,
+                      "id": 4888,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25641:4:7",
+                      "src": "25967:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 5053,
+                    "id": 4889,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25641:6:7",
+                    "src": "25967:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -41131,38 +41272,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25640:8:7"
+              "src": "25966:8:6"
             },
-            "scope": 5229,
-            "src": "25576:272:7",
+            "scope": 5065,
+            "src": "25902:272:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5107,
+              "id": 4943,
               "nodeType": "Block",
-              "src": "25953:66:7",
+              "src": "26279:66:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5103,
+                    "id": 4939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5099,
+                      "id": 4935,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2321,
-                      "src": "25963:2:7",
+                      "referencedDeclaration": 2145,
+                      "src": "26289:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -41173,12 +41314,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5101,
+                          "id": 4937,
                           "name": "_newPR",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5092,
-                          "src": "25984:6:7",
+                          "referencedDeclaration": 4928,
+                          "src": "26310:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41192,18 +41333,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5100,
+                        "id": 4936,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10035,
-                        "src": "25968:15:7",
+                        "referencedDeclaration": 10881,
+                        "src": "26294:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 5102,
+                      "id": 4938,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41211,34 +41352,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "25968:23:7",
+                      "src": "26294:23:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "25963:28:7",
+                    "src": "26289:28:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 5104,
+                  "id": 4940,
                   "nodeType": "ExpressionStatement",
-                  "src": "25963:28:7"
+                  "src": "26289:28:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5105,
+                    "id": 4941,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26008:4:7",
+                    "src": "26334:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41246,52 +41387,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5098,
-                  "id": 5106,
+                  "functionReturnParameters": 4934,
+                  "id": 4942,
                   "nodeType": "Return",
-                  "src": "26001:11:7"
+                  "src": "26327:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5108,
+            "id": 4944,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5095,
+                "id": 4931,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5094,
+                  "id": 4930,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "25921:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26254:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "25921:9:7"
+                "src": "26254:9:6"
               }
             ],
             "name": "SetProfileRegistryAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5093,
+              "id": 4929,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5092,
+                  "id": 4928,
                   "name": "_newPR",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5108,
-                  "src": "25905:14:7",
+                  "scope": 4944,
+                  "src": "26231:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41299,10 +41440,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5091,
+                    "id": 4927,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25905:7:7",
+                    "src": "26231:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41312,20 +41453,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25904:16:7"
+              "src": "26230:16:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5098,
+              "id": 4934,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5097,
+                  "id": 4933,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5108,
-                  "src": "25947:4:7",
+                  "scope": 4944,
+                  "src": "26273:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41333,10 +41474,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5096,
+                    "id": 4932,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25947:4:7",
+                    "src": "26273:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41346,38 +41487,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25946:6:7"
+              "src": "26272:6:6"
             },
-            "scope": 5229,
-            "src": "25870:149:7",
+            "scope": 5065,
+            "src": "26196:149:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5125,
+              "id": 4961,
               "nodeType": "Block",
-              "src": "26102:60:7",
+              "src": "26428:60:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5121,
+                    "id": 4957,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5117,
+                      "id": 4953,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2317,
-                      "src": "26112:2:7",
+                      "referencedDeclaration": 2141,
+                      "src": "26438:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -41388,12 +41529,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5119,
+                          "id": 4955,
                           "name": "_newBL",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5110,
-                          "src": "26127:6:7",
+                          "referencedDeclaration": 4946,
+                          "src": "26453:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41407,18 +41548,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5118,
+                        "id": 4954,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1161,
-                        "src": "26117:9:7",
+                        "referencedDeclaration": 985,
+                        "src": "26443:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$985_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 5120,
+                      "id": 4956,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41426,34 +41567,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26117:17:7",
+                      "src": "26443:17:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "26112:22:7",
+                    "src": "26438:22:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$1161",
+                      "typeIdentifier": "t_contract$_Blacklist_$985",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 5122,
+                  "id": 4958,
                   "nodeType": "ExpressionStatement",
-                  "src": "26112:22:7"
+                  "src": "26438:22:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5123,
+                    "id": 4959,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26151:4:7",
+                    "src": "26477:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41461,52 +41602,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5116,
-                  "id": 5124,
+                  "functionReturnParameters": 4952,
+                  "id": 4960,
                   "nodeType": "Return",
-                  "src": "26144:11:7"
+                  "src": "26470:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5126,
+            "id": 4962,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5113,
+                "id": 4949,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5112,
+                  "id": 4948,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26070:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26403:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26070:9:7"
+                "src": "26403:9:6"
               }
             ],
             "name": "SetBlacklistAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5111,
+              "id": 4947,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5110,
+                  "id": 4946,
                   "name": "_newBL",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5126,
-                  "src": "26054:14:7",
+                  "scope": 4962,
+                  "src": "26380:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41514,10 +41655,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5109,
+                    "id": 4945,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26054:7:7",
+                    "src": "26380:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41527,20 +41668,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26053:16:7"
+              "src": "26379:16:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5116,
+              "id": 4952,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5115,
+                  "id": 4951,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5126,
-                  "src": "26096:4:7",
+                  "scope": 4962,
+                  "src": "26422:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41548,10 +41689,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5114,
+                    "id": 4950,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26096:4:7",
+                    "src": "26422:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41561,19 +41702,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26095:6:7"
+              "src": "26421:6:6"
             },
-            "scope": 5229,
-            "src": "26025:137:7",
+            "scope": 5065,
+            "src": "26351:137:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5153,
+              "id": 4989,
               "nodeType": "Block",
-              "src": "26246:131:7",
+              "src": "26572:131:6",
               "statements": [
                 {
                   "expression": {
@@ -41585,7 +41726,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5142,
+                        "id": 4978,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -41600,12 +41741,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 5137,
+                                  "id": 4973,
                                   "name": "_newOracle",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5128,
-                                  "src": "26274:10:7",
+                                  "referencedDeclaration": 4964,
+                                  "src": "26600:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -41619,18 +41760,18 @@
                                     "typeString": "address"
                                   }
                                 ],
-                                "id": 5136,
+                                "id": 4972,
                                 "name": "OracleUSD",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 8677,
-                                "src": "26264:9:7",
+                                "referencedDeclaration": 9523,
+                                "src": "26590:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                                   "typeString": "type(contract OracleUSD)"
                                 }
                               },
-                              "id": 5138,
+                              "id": 4974,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -41638,27 +41779,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "26264:21:7",
+                              "src": "26590:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                                "typeIdentifier": "t_contract$_OracleUSD_$9523",
                                 "typeString": "contract OracleUSD"
                               }
                             },
-                            "id": 5139,
+                            "id": 4975,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getCurrentPrice",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 8676,
-                            "src": "26264:37:7",
+                            "referencedDeclaration": 9522,
+                            "src": "26590:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                               "typeString": "function () view external returns (uint256)"
                             }
                           },
-                          "id": 5140,
+                          "id": 4976,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -41666,7 +41807,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "26264:39:7",
+                          "src": "26590:39:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -41677,14 +41818,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5141,
+                          "id": 4977,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "26307:1:7",
+                          "src": "26633:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -41692,7 +41833,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "26264:44:7",
+                        "src": "26590:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -41706,21 +41847,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5135,
+                      "id": 4971,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26256:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "26582:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5143,
+                    "id": 4979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -41728,34 +41869,34 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26256:53:7",
+                    "src": "26582:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5144,
+                  "id": 4980,
                   "nodeType": "ExpressionStatement",
-                  "src": "26256:53:7"
+                  "src": "26582:53:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5149,
+                    "id": 4985,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5145,
+                      "id": 4981,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2319,
-                      "src": "26319:6:7",
+                      "referencedDeclaration": 2143,
+                      "src": "26645:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -41766,12 +41907,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5147,
+                          "id": 4983,
                           "name": "_newOracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5128,
-                          "src": "26338:10:7",
+                          "referencedDeclaration": 4964,
+                          "src": "26664:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -41785,18 +41926,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5146,
+                        "id": 4982,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8677,
-                        "src": "26328:9:7",
+                        "referencedDeclaration": 9523,
+                        "src": "26654:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 5148,
+                      "id": 4984,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -41804,34 +41945,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26328:21:7",
+                      "src": "26654:21:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "26319:30:7",
+                    "src": "26645:30:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                      "typeIdentifier": "t_contract$_OracleUSD_$9523",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 5150,
+                  "id": 4986,
                   "nodeType": "ExpressionStatement",
-                  "src": "26319:30:7"
+                  "src": "26645:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5151,
+                    "id": 4987,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26366:4:7",
+                    "src": "26692:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -41839,52 +41980,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5134,
-                  "id": 5152,
+                  "functionReturnParameters": 4970,
+                  "id": 4988,
                   "nodeType": "Return",
-                  "src": "26359:11:7"
+                  "src": "26685:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5154,
+            "id": 4990,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5131,
+                "id": 4967,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5130,
+                  "id": 4966,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26214:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26547:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26214:9:7"
+                "src": "26547:9:6"
               }
             ],
             "name": "SetOracleAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5129,
+              "id": 4965,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5128,
+                  "id": 4964,
                   "name": "_newOracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5154,
-                  "src": "26194:18:7",
+                  "scope": 4990,
+                  "src": "26520:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41892,10 +42033,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5127,
+                    "id": 4963,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26194:7:7",
+                    "src": "26520:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -41905,20 +42046,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26193:20:7"
+              "src": "26519:20:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5134,
+              "id": 4970,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5133,
+                  "id": 4969,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5154,
-                  "src": "26240:4:7",
+                  "scope": 4990,
+                  "src": "26566:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -41926,10 +42067,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5132,
+                    "id": 4968,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26240:4:7",
+                    "src": "26566:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -41939,19 +42080,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26239:6:7"
+              "src": "26565:6:6"
             },
-            "scope": 5229,
-            "src": "26168:209:7",
+            "scope": 5065,
+            "src": "26494:209:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5179,
+              "id": 5015,
               "nodeType": "Block",
-              "src": "26465:172:7",
+              "src": "26791:172:6",
               "statements": [
                 {
                   "expression": {
@@ -41963,19 +42104,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5166,
+                        "id": 5002,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5164,
+                          "id": 5000,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5156,
-                          "src": "26483:12:7",
+                          "referencedDeclaration": 4992,
+                          "src": "26809:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -41985,18 +42126,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5165,
+                          "id": 5001,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2332,
-                          "src": "26498:18:7",
+                          "referencedDeclaration": 2156,
+                          "src": "26824:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26483:33:7",
+                        "src": "26809:33:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -42010,21 +42151,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5163,
+                      "id": 4999,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26475:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "26801:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5167,
+                    "id": 5003,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42032,15 +42173,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26475:42:7",
+                    "src": "26801:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5168,
+                  "id": 5004,
                   "nodeType": "ExpressionStatement",
-                  "src": "26475:42:7"
+                  "src": "26801:42:6"
                 },
                 {
                   "eventCall": {
@@ -42048,12 +42189,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5170,
+                        "id": 5006,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5156,
-                        "src": "26553:12:7",
+                        "referencedDeclaration": 4992,
+                        "src": "26879:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42067,18 +42208,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5169,
+                      "id": 5005,
                       "name": "NumBenchmarksUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2304,
-                      "src": "26532:20:7",
+                      "referencedDeclaration": 2128,
+                      "src": "26858:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5171,
+                    "id": 5007,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42086,32 +42227,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26532:34:7",
+                    "src": "26858:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5172,
+                  "id": 5008,
                   "nodeType": "EmitStatement",
-                  "src": "26527:39:7"
+                  "src": "26853:39:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5175,
+                    "id": 5011,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5173,
+                      "id": 5009,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "26576:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "26902:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -42121,39 +42262,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5174,
+                      "id": 5010,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5156,
-                      "src": "26597:12:7",
+                      "referencedDeclaration": 4992,
+                      "src": "26923:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26576:33:7",
+                    "src": "26902:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5176,
+                  "id": 5012,
                   "nodeType": "ExpressionStatement",
-                  "src": "26576:33:7"
+                  "src": "26902:33:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5177,
+                    "id": 5013,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26626:4:7",
+                    "src": "26952:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -42161,52 +42302,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5162,
-                  "id": 5178,
+                  "functionReturnParameters": 4998,
+                  "id": 5014,
                   "nodeType": "Return",
-                  "src": "26619:11:7"
+                  "src": "26945:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5180,
+            "id": 5016,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5159,
+                "id": 4995,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5158,
+                  "id": 4994,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26433:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26766:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26433:9:7"
+                "src": "26766:9:6"
               }
             ],
             "name": "SetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5157,
+              "id": 4993,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5156,
+                  "id": 4992,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5180,
-                  "src": "26414:17:7",
+                  "scope": 5016,
+                  "src": "26740:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42214,10 +42355,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5155,
+                    "id": 4991,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26414:4:7",
+                    "src": "26740:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -42227,20 +42368,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26413:19:7"
+              "src": "26739:19:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5162,
+              "id": 4998,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5161,
+                  "id": 4997,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5180,
-                  "src": "26459:4:7",
+                  "scope": 5016,
+                  "src": "26785:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42248,10 +42389,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5160,
+                    "id": 4996,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26459:4:7",
+                    "src": "26785:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -42261,19 +42402,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26458:6:7"
+              "src": "26784:6:6"
             },
-            "scope": 5229,
-            "src": "26383:254:7",
+            "scope": 5065,
+            "src": "26709:254:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5205,
+              "id": 5041,
               "nodeType": "Block",
-              "src": "26723:166:7",
+              "src": "27049:166:6",
               "statements": [
                 {
                   "expression": {
@@ -42285,19 +42426,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5192,
+                        "id": 5028,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5190,
+                          "id": 5026,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5182,
-                          "src": "26741:12:7",
+                          "referencedDeclaration": 5018,
+                          "src": "27067:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -42307,18 +42448,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5191,
+                          "id": 5027,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2334,
-                          "src": "26756:16:7",
+                          "referencedDeclaration": 2158,
+                          "src": "27082:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26741:31:7",
+                        "src": "27067:31:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -42332,21 +42473,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5189,
+                      "id": 5025,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26733:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "27059:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5193,
+                    "id": 5029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42354,15 +42495,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26733:40:7",
+                    "src": "27059:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5194,
+                  "id": 5030,
                   "nodeType": "ExpressionStatement",
-                  "src": "26733:40:7"
+                  "src": "27059:40:6"
                 },
                 {
                   "eventCall": {
@@ -42370,12 +42511,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5196,
+                        "id": 5032,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5182,
-                        "src": "26807:12:7",
+                        "referencedDeclaration": 5018,
+                        "src": "27133:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42389,18 +42530,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5195,
+                      "id": 5031,
                       "name": "NumNetflagsUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2308,
-                      "src": "26788:18:7",
+                      "referencedDeclaration": 2132,
+                      "src": "27114:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5197,
+                    "id": 5033,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42408,32 +42549,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26788:32:7",
+                    "src": "27114:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5198,
+                  "id": 5034,
                   "nodeType": "EmitStatement",
-                  "src": "26783:37:7"
+                  "src": "27109:37:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5201,
+                    "id": 5037,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5199,
+                      "id": 5035,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "26830:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "27156:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -42443,39 +42584,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5200,
+                      "id": 5036,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5182,
-                      "src": "26849:12:7",
+                      "referencedDeclaration": 5018,
+                      "src": "27175:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26830:31:7",
+                    "src": "27156:31:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5202,
+                  "id": 5038,
                   "nodeType": "ExpressionStatement",
-                  "src": "26830:31:7"
+                  "src": "27156:31:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5203,
+                    "id": 5039,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26878:4:7",
+                    "src": "27204:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -42483,52 +42624,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5188,
-                  "id": 5204,
+                  "functionReturnParameters": 5024,
+                  "id": 5040,
                   "nodeType": "Return",
-                  "src": "26871:11:7"
+                  "src": "27197:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5206,
+            "id": 5042,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5185,
+                "id": 5021,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5184,
+                  "id": 5020,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26691:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "27024:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26691:9:7"
+                "src": "27024:9:6"
               }
             ],
             "name": "SetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5183,
+              "id": 5019,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5182,
+                  "id": 5018,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5206,
-                  "src": "26672:17:7",
+                  "scope": 5042,
+                  "src": "26998:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42536,10 +42677,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5181,
+                    "id": 5017,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26672:4:7",
+                    "src": "26998:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -42549,20 +42690,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26671:19:7"
+              "src": "26997:19:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5188,
+              "id": 5024,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5187,
+                  "id": 5023,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5206,
-                  "src": "26717:4:7",
+                  "scope": 5042,
+                  "src": "27043:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -42570,10 +42711,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5186,
+                    "id": 5022,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26717:4:7",
+                    "src": "27043:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -42583,19 +42724,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26716:6:7"
+              "src": "27042:6:6"
             },
-            "scope": 5229,
-            "src": "26643:246:7",
+            "scope": 5065,
+            "src": "26969:246:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5227,
+              "id": 5063,
               "nodeType": "Block",
-              "src": "26934:99:7",
+              "src": "27260:99:6",
               "statements": [
                 {
                   "expression": {
@@ -42603,12 +42744,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5214,
+                        "id": 5050,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "26959:5:7",
+                        "referencedDeclaration": 11084,
+                        "src": "27285:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -42622,14 +42763,14 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 5218,
+                                "id": 5054,
                                 "name": "this",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11366,
-                                "src": "26990:4:7",
+                                "referencedDeclaration": 11646,
+                                "src": "27316:4:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Market_$5229",
+                                  "typeIdentifier": "t_contract$_Market_$5065",
                                   "typeString": "contract Market"
                                 }
                               }
@@ -42637,24 +42778,24 @@
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_contract$_Market_$5229",
+                                  "typeIdentifier": "t_contract$_Market_$5065",
                                   "typeString": "contract Market"
                                 }
                               ],
-                              "id": 5217,
+                              "id": 5053,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "lValueRequested": false,
                               "nodeType": "ElementaryTypeNameExpression",
-                              "src": "26982:7:7",
+                              "src": "27308:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_type$_t_address_$",
                                 "typeString": "type(address)"
                               },
                               "typeName": "address"
                             },
-                            "id": 5219,
+                            "id": 5055,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -42662,7 +42803,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "26982:13:7",
+                            "src": "27308:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -42678,32 +42819,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5215,
+                            "id": 5051,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "26966:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "27292:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 5216,
+                          "id": 5052,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "balanceOf",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10977,
-                          "src": "26966:15:7",
+                          "referencedDeclaration": 11261,
+                          "src": "27292:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                             "typeString": "function (address) view external returns (uint256)"
                           }
                         },
-                        "id": 5220,
+                        "id": 5056,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -42711,7 +42852,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "26966:30:7",
+                        "src": "27292:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -42731,32 +42872,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5211,
+                        "id": 5047,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2315,
-                        "src": "26944:5:7",
+                        "referencedDeclaration": 2139,
+                        "src": "27270:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$10080",
+                          "typeIdentifier": "t_contract$_SNM_$10926",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 5213,
+                      "id": 5049,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transfer",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 10965,
-                      "src": "26944:14:7",
+                      "referencedDeclaration": 11249,
+                      "src": "27270:14:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 5221,
+                    "id": 5057,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42764,15 +42905,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26944:53:7",
+                    "src": "27270:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5222,
+                  "id": 5058,
                   "nodeType": "ExpressionStatement",
-                  "src": "26944:53:7"
+                  "src": "27270:53:6"
                 },
                 {
                   "expression": {
@@ -42780,12 +42921,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5224,
+                        "id": 5060,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "27020:5:7",
+                        "referencedDeclaration": 11084,
+                        "src": "27346:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -42799,18 +42940,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5223,
+                      "id": 5059,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11323,
-                      "src": "27007:12:7",
+                      "referencedDeclaration": 11607,
+                      "src": "27333:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5225,
+                    "id": 5061,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -42818,84 +42959,84 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "27007:19:7",
+                    "src": "27333:19:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5226,
+                  "id": 5062,
                   "nodeType": "ExpressionStatement",
-                  "src": "27007:19:7"
+                  "src": "27333:19:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5228,
+            "id": 5064,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5209,
+                "id": 5045,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5208,
+                  "id": 5044,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26917:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "27250:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26917:9:7"
+                "src": "27250:9:6"
               }
             ],
             "name": "KillMarket",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5207,
+              "id": 5043,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26914:2:7"
+              "src": "27240:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5210,
+              "id": 5046,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26934:0:7"
+              "src": "27260:0:6"
             },
-            "scope": 5229,
-            "src": "26895:138:7",
+            "scope": 5065,
+            "src": "27221:138:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5230,
-        "src": "254:26781:7"
+        "scope": 5066,
+        "src": "254:27107:6"
       }
     ],
-    "src": "0:27036:7"
+    "src": "0:27362:6"
   },
   "legacyAST": {
     "absolutePath": "contracts/Market.sol",
     "exportedSymbols": {
       "Market": [
-        5229
+        5065
       ]
     },
-    "id": 5230,
+    "id": 5066,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 2147,
+        "id": 1971,
         "literals": [
           "solidity",
           "^",
@@ -42903,71 +43044,71 @@
           ".23"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:7"
+        "src": "0:24:6"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 2148,
+        "id": 1972,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10883,
-        "src": "27:59:7",
+        "scope": 5066,
+        "sourceUnit": 11167,
+        "src": "27:59:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 2149,
+        "id": 1973,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10703,
-        "src": "87:60:7",
+        "scope": 5066,
+        "sourceUnit": 10987,
+        "src": "87:60:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/SNM.sol",
         "file": "./SNM.sol",
-        "id": 2150,
+        "id": 1974,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10081,
-        "src": "148:19:7",
+        "scope": 5066,
+        "sourceUnit": 10927,
+        "src": "148:19:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/Blacklist.sol",
         "file": "./Blacklist.sol",
-        "id": 2151,
+        "id": 1975,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 1162,
-        "src": "168:25:7",
+        "scope": 5066,
+        "sourceUnit": 986,
+        "src": "168:25:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/OracleUSD.sol",
         "file": "./OracleUSD.sol",
-        "id": 2152,
+        "id": 1976,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 8678,
-        "src": "194:25:7",
+        "scope": 5066,
+        "sourceUnit": 9524,
+        "src": "194:25:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "contracts/ProfileRegistry.sol",
         "file": "./ProfileRegistry.sol",
-        "id": 2153,
+        "id": 1977,
         "nodeType": "ImportDirective",
-        "scope": 5230,
-        "sourceUnit": 10036,
-        "src": "220:31:7",
+        "scope": 5066,
+        "sourceUnit": 10882,
+        "src": "220:31:6",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -42977,76 +43118,76 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 2154,
+              "id": 1978,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "273:7:7",
+              "referencedDeclaration": 11166,
+              "src": "273:7:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 2155,
+            "id": 1979,
             "nodeType": "InheritanceSpecifier",
-            "src": "273:7:7"
+            "src": "273:7:6"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 2156,
+              "id": 1980,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10702,
-              "src": "282:8:7",
+              "referencedDeclaration": 10986,
+              "src": "282:8:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$10702",
+                "typeIdentifier": "t_contract$_Pausable_$10986",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 2157,
+            "id": 1981,
             "nodeType": "InheritanceSpecifier",
-            "src": "282:8:7"
+            "src": "282:8:6"
           }
         ],
         "contractDependencies": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 5229,
+        "id": 5065,
         "linearizedBaseContracts": [
-          5229,
-          10702,
-          10882
+          5065,
+          10986,
+          11166
         ],
         "name": "Market",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 2160,
+            "id": 1984,
             "libraryName": {
               "contractScope": null,
-              "id": 2158,
+              "id": 1982,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
-              "src": "304:8:7",
+              "referencedDeclaration": 11080,
+              "src": "304:8:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
-            "src": "298:27:7",
+            "src": "298:27:6",
             "typeName": {
-              "id": 2159,
+              "id": 1983,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
-              "src": "317:7:7",
+              "src": "317:7:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -43055,162 +43196,162 @@
           },
           {
             "canonicalName": "Market.DealStatus",
-            "id": 2164,
+            "id": 1988,
             "members": [
               {
-                "id": 2161,
+                "id": 1985,
                 "name": "STATUS_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "377:14:7"
+                "src": "377:14:6"
               },
               {
-                "id": 2162,
+                "id": 1986,
                 "name": "STATUS_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "401:15:7"
+                "src": "401:15:6"
               },
               {
-                "id": 2163,
+                "id": 1987,
                 "name": "STATUS_CLOSED",
                 "nodeType": "EnumValue",
-                "src": "426:13:7"
+                "src": "426:13:6"
               }
             ],
             "name": "DealStatus",
             "nodeType": "EnumDefinition",
-            "src": "352:93:7"
+            "src": "352:93:6"
           },
           {
             "canonicalName": "Market.OrderType",
-            "id": 2168,
+            "id": 1992,
             "members": [
               {
-                "id": 2165,
+                "id": 1989,
                 "name": "ORDER_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "476:13:7"
+                "src": "476:13:6"
               },
               {
-                "id": 2166,
+                "id": 1990,
                 "name": "ORDER_BID",
                 "nodeType": "EnumValue",
-                "src": "499:9:7"
+                "src": "499:9:6"
               },
               {
-                "id": 2167,
+                "id": 1991,
                 "name": "ORDER_ASK",
                 "nodeType": "EnumValue",
-                "src": "518:9:7"
+                "src": "518:9:6"
               }
             ],
             "name": "OrderType",
             "nodeType": "EnumDefinition",
-            "src": "451:82:7"
+            "src": "451:82:6"
           },
           {
             "canonicalName": "Market.OrderStatus",
-            "id": 2172,
+            "id": 1996,
             "members": [
               {
-                "id": 2169,
+                "id": 1993,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "566:7:7"
+                "src": "566:7:6"
               },
               {
-                "id": 2170,
+                "id": 1994,
                 "name": "ORDER_INACTIVE",
                 "nodeType": "EnumValue",
-                "src": "583:14:7"
+                "src": "583:14:6"
               },
               {
-                "id": 2171,
+                "id": 1995,
                 "name": "ORDER_ACTIVE",
                 "nodeType": "EnumValue",
-                "src": "607:12:7"
+                "src": "607:12:6"
               }
             ],
             "name": "OrderStatus",
             "nodeType": "EnumDefinition",
-            "src": "539:86:7"
+            "src": "539:86:6"
           },
           {
             "canonicalName": "Market.RequestStatus",
-            "id": 2178,
+            "id": 2002,
             "members": [
               {
-                "id": 2173,
+                "id": 1997,
                 "name": "REQUEST_UNKNOWN",
                 "nodeType": "EnumValue",
-                "src": "660:15:7"
+                "src": "660:15:6"
               },
               {
-                "id": 2174,
+                "id": 1998,
                 "name": "REQUEST_CREATED",
                 "nodeType": "EnumValue",
-                "src": "685:15:7"
+                "src": "685:15:6"
               },
               {
-                "id": 2175,
+                "id": 1999,
                 "name": "REQUEST_CANCELED",
                 "nodeType": "EnumValue",
-                "src": "710:16:7"
+                "src": "710:16:6"
               },
               {
-                "id": 2176,
+                "id": 2000,
                 "name": "REQUEST_REJECTED",
                 "nodeType": "EnumValue",
-                "src": "736:16:7"
+                "src": "736:16:6"
               },
               {
-                "id": 2177,
+                "id": 2001,
                 "name": "REQUEST_ACCEPTED",
                 "nodeType": "EnumValue",
-                "src": "762:16:7"
+                "src": "762:16:6"
               }
             ],
             "name": "RequestStatus",
             "nodeType": "EnumDefinition",
-            "src": "631:153:7"
+            "src": "631:153:6"
           },
           {
             "canonicalName": "Market.BlacklistPerson",
-            "id": 2182,
+            "id": 2006,
             "members": [
               {
-                "id": 2179,
+                "id": 2003,
                 "name": "BLACKLIST_NOBODY",
                 "nodeType": "EnumValue",
-                "src": "821:16:7"
+                "src": "821:16:6"
               },
               {
-                "id": 2180,
+                "id": 2004,
                 "name": "BLACKLIST_WORKER",
                 "nodeType": "EnumValue",
-                "src": "847:16:7"
+                "src": "847:16:6"
               },
               {
-                "id": 2181,
+                "id": 2005,
                 "name": "BLACKLIST_MASTER",
                 "nodeType": "EnumValue",
-                "src": "873:16:7"
+                "src": "873:16:6"
               }
             ],
             "name": "BlacklistPerson",
             "nodeType": "EnumDefinition",
-            "src": "790:105:7"
+            "src": "790:105:6"
           },
           {
             "canonicalName": "Market.Deal",
-            "id": 2212,
+            "id": 2036,
             "members": [
               {
                 "constant": false,
-                "id": 2185,
+                "id": 2009,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "923:19:7",
+                "scope": 2036,
+                "src": "923:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43219,19 +43360,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2183,
+                    "id": 2007,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "923:6:7",
+                    "src": "923:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 2184,
+                  "id": 2008,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "923:8:7",
+                  "src": "923:8:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -43242,11 +43383,11 @@
               },
               {
                 "constant": false,
-                "id": 2187,
+                "id": 2011,
                 "name": "supplierID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "952:18:7",
+                "scope": 2036,
+                "src": "952:18:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43254,10 +43395,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2186,
+                  "id": 2010,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "952:7:7",
+                  "src": "952:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43268,11 +43409,11 @@
               },
               {
                 "constant": false,
-                "id": 2189,
+                "id": 2013,
                 "name": "consumerID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "980:18:7",
+                "scope": 2036,
+                "src": "980:18:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43280,10 +43421,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2188,
+                  "id": 2012,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "980:7:7",
+                  "src": "980:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43294,11 +43435,11 @@
               },
               {
                 "constant": false,
-                "id": 2191,
+                "id": 2015,
                 "name": "masterID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1008:16:7",
+                "scope": 2036,
+                "src": "1008:16:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43306,10 +43447,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2190,
+                  "id": 2014,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1008:7:7",
+                  "src": "1008:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43320,11 +43461,11 @@
               },
               {
                 "constant": false,
-                "id": 2193,
+                "id": 2017,
                 "name": "askID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1034:10:7",
+                "scope": 2036,
+                "src": "1034:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43332,10 +43473,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2192,
+                  "id": 2016,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1034:4:7",
+                  "src": "1034:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43346,11 +43487,11 @@
               },
               {
                 "constant": false,
-                "id": 2195,
+                "id": 2019,
                 "name": "bidID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1054:10:7",
+                "scope": 2036,
+                "src": "1054:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43358,10 +43499,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2194,
+                  "id": 2018,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1054:4:7",
+                  "src": "1054:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43372,11 +43513,11 @@
               },
               {
                 "constant": false,
-                "id": 2197,
+                "id": 2021,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1074:13:7",
+                "scope": 2036,
+                "src": "1074:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43384,10 +43525,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2196,
+                  "id": 2020,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1074:4:7",
+                  "src": "1074:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43398,11 +43539,11 @@
               },
               {
                 "constant": false,
-                "id": 2199,
+                "id": 2023,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1097:10:7",
+                "scope": 2036,
+                "src": "1097:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43410,10 +43551,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2198,
+                  "id": 2022,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1097:4:7",
+                  "src": "1097:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43424,11 +43565,11 @@
               },
               {
                 "constant": false,
-                "id": 2201,
+                "id": 2025,
                 "name": "startTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1132:14:7",
+                "scope": 2036,
+                "src": "1132:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43436,10 +43577,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2200,
+                  "id": 2024,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1132:4:7",
+                  "src": "1132:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43450,11 +43591,11 @@
               },
               {
                 "constant": false,
-                "id": 2203,
+                "id": 2027,
                 "name": "endTime",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1156:12:7",
+                "scope": 2036,
+                "src": "1156:12:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43462,10 +43603,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2202,
+                  "id": 2026,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1156:4:7",
+                  "src": "1156:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43476,26 +43617,26 @@
               },
               {
                 "constant": false,
-                "id": 2205,
+                "id": 2029,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1178:17:7",
+                "scope": 2036,
+                "src": "1178:17:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_DealStatus_$2164",
+                  "typeIdentifier": "t_enum$_DealStatus_$1988",
                   "typeString": "enum Market.DealStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2204,
+                  "id": 2028,
                   "name": "DealStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2164,
-                  "src": "1178:10:7",
+                  "referencedDeclaration": 1988,
+                  "src": "1178:10:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$2164",
+                    "typeIdentifier": "t_enum$_DealStatus_$1988",
                     "typeString": "enum Market.DealStatus"
                   }
                 },
@@ -43504,11 +43645,11 @@
               },
               {
                 "constant": false,
-                "id": 2207,
+                "id": 2031,
                 "name": "blockedBalance",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1205:19:7",
+                "scope": 2036,
+                "src": "1205:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43516,10 +43657,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2206,
+                  "id": 2030,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1205:4:7",
+                  "src": "1205:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43530,11 +43671,11 @@
               },
               {
                 "constant": false,
-                "id": 2209,
+                "id": 2033,
                 "name": "totalPayout",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1234:16:7",
+                "scope": 2036,
+                "src": "1234:16:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43542,10 +43683,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2208,
+                  "id": 2032,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1234:4:7",
+                  "src": "1234:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43556,11 +43697,11 @@
               },
               {
                 "constant": false,
-                "id": 2211,
+                "id": 2035,
                 "name": "lastBillTS",
                 "nodeType": "VariableDeclaration",
-                "scope": 2212,
-                "src": "1260:15:7",
+                "scope": 2036,
+                "src": "1260:15:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43568,10 +43709,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2210,
+                  "id": 2034,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1260:4:7",
+                  "src": "1260:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43583,36 +43724,36 @@
             ],
             "name": "Deal",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "901:381:7",
+            "scope": 5065,
+            "src": "901:381:6",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.Order",
-            "id": 2241,
+            "id": 2065,
             "members": [
               {
                 "constant": false,
-                "id": 2214,
+                "id": 2038,
                 "name": "orderType",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1311:19:7",
+                "scope": 2065,
+                "src": "1311:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$2168",
+                  "typeIdentifier": "t_enum$_OrderType_$1992",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2213,
+                  "id": 2037,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2168,
-                  "src": "1311:9:7",
+                  "referencedDeclaration": 1992,
+                  "src": "1311:9:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -43621,26 +43762,26 @@
               },
               {
                 "constant": false,
-                "id": 2216,
+                "id": 2040,
                 "name": "orderStatus",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1340:23:7",
+                "scope": 2065,
+                "src": "1340:23:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                  "typeIdentifier": "t_enum$_OrderStatus_$1996",
                   "typeString": "enum Market.OrderStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2215,
+                  "id": 2039,
                   "name": "OrderStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2172,
-                  "src": "1340:11:7",
+                  "referencedDeclaration": 1996,
+                  "src": "1340:11:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                    "typeIdentifier": "t_enum$_OrderStatus_$1996",
                     "typeString": "enum Market.OrderStatus"
                   }
                 },
@@ -43649,11 +43790,11 @@
               },
               {
                 "constant": false,
-                "id": 2218,
+                "id": 2042,
                 "name": "author",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1373:14:7",
+                "scope": 2065,
+                "src": "1373:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43661,10 +43802,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2217,
+                  "id": 2041,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1373:7:7",
+                  "src": "1373:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43675,11 +43816,11 @@
               },
               {
                 "constant": false,
-                "id": 2220,
+                "id": 2044,
                 "name": "counterparty",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1397:20:7",
+                "scope": 2065,
+                "src": "1397:20:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43687,10 +43828,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2219,
+                  "id": 2043,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1397:7:7",
+                  "src": "1397:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43701,11 +43842,11 @@
               },
               {
                 "constant": false,
-                "id": 2222,
+                "id": 2046,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1427:13:7",
+                "scope": 2065,
+                "src": "1427:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43713,10 +43854,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2221,
+                  "id": 2045,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1427:4:7",
+                  "src": "1427:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43727,11 +43868,11 @@
               },
               {
                 "constant": false,
-                "id": 2224,
+                "id": 2048,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1450:13:7",
+                "scope": 2065,
+                "src": "1450:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43739,10 +43880,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2223,
+                  "id": 2047,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1450:7:7",
+                  "src": "1450:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43753,11 +43894,11 @@
               },
               {
                 "constant": false,
-                "id": 2227,
+                "id": 2051,
                 "name": "netflags",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1473:15:7",
+                "scope": 2065,
+                "src": "1473:15:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43766,19 +43907,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2225,
+                    "id": 2049,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1473:4:7",
+                    "src": "1473:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2226,
+                  "id": 2050,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1473:6:7",
+                  "src": "1473:6:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                     "typeString": "bool[]"
@@ -43789,26 +43930,26 @@
               },
               {
                 "constant": false,
-                "id": 2229,
+                "id": 2053,
                 "name": "identityLevel",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1498:43:7",
+                "scope": 2065,
+                "src": "1498:43:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                  "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                   "typeString": "enum ProfileRegistry.IdentityLevel"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2228,
+                  "id": 2052,
                   "name": "ProfileRegistry.IdentityLevel",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 9497,
-                  "src": "1498:29:7",
+                  "referencedDeclaration": 10343,
+                  "src": "1498:29:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   }
                 },
@@ -43817,11 +43958,11 @@
               },
               {
                 "constant": false,
-                "id": 2231,
+                "id": 2055,
                 "name": "blacklist",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1551:17:7",
+                "scope": 2065,
+                "src": "1551:17:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43829,10 +43970,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 2230,
+                  "id": 2054,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1551:7:7",
+                  "src": "1551:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -43843,11 +43984,11 @@
               },
               {
                 "constant": false,
-                "id": 2233,
+                "id": 2057,
                 "name": "tag",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1578:11:7",
+                "scope": 2065,
+                "src": "1578:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43855,10 +43996,10 @@
                   "typeString": "bytes32"
                 },
                 "typeName": {
-                  "id": 2232,
+                  "id": 2056,
                   "name": "bytes32",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1578:7:7",
+                  "src": "1578:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes32",
                     "typeString": "bytes32"
@@ -43869,11 +44010,11 @@
               },
               {
                 "constant": false,
-                "id": 2236,
+                "id": 2060,
                 "name": "benchmarks",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1599:19:7",
+                "scope": 2065,
+                "src": "1599:19:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43882,19 +44023,19 @@
                 },
                 "typeName": {
                   "baseType": {
-                    "id": 2234,
+                    "id": 2058,
                     "name": "uint64",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1599:6:7",
+                    "src": "1599:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint64",
                       "typeString": "uint64"
                     }
                   },
-                  "id": 2235,
+                  "id": 2059,
                   "length": null,
                   "nodeType": "ArrayTypeName",
-                  "src": "1599:8:7",
+                  "src": "1599:8:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                     "typeString": "uint64[]"
@@ -43905,11 +44046,11 @@
               },
               {
                 "constant": false,
-                "id": 2238,
+                "id": 2062,
                 "name": "frozenSum",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1628:14:7",
+                "scope": 2065,
+                "src": "1628:14:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43917,10 +44058,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2237,
+                  "id": 2061,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1628:4:7",
+                  "src": "1628:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43931,11 +44072,11 @@
               },
               {
                 "constant": false,
-                "id": 2240,
+                "id": 2064,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2241,
-                "src": "1652:11:7",
+                "scope": 2065,
+                "src": "1652:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43943,10 +44084,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2239,
+                  "id": 2063,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1652:4:7",
+                  "src": "1652:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43958,21 +44099,21 @@
             ],
             "name": "Order",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "1288:382:7",
+            "scope": 5065,
+            "src": "1288:382:6",
             "visibility": "public"
           },
           {
             "canonicalName": "Market.ChangeRequest",
-            "id": 2252,
+            "id": 2076,
             "members": [
               {
                 "constant": false,
-                "id": 2243,
+                "id": 2067,
                 "name": "dealID",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1707:11:7",
+                "scope": 2076,
+                "src": "1707:11:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -43980,10 +44121,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2242,
+                  "id": 2066,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1707:4:7",
+                  "src": "1707:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -43994,26 +44135,26 @@
               },
               {
                 "constant": false,
-                "id": 2245,
+                "id": 2069,
                 "name": "requestType",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1728:21:7",
+                "scope": 2076,
+                "src": "1728:21:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_OrderType_$2168",
+                  "typeIdentifier": "t_enum$_OrderType_$1992",
                   "typeString": "enum Market.OrderType"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2244,
+                  "id": 2068,
                   "name": "OrderType",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2168,
-                  "src": "1728:9:7",
+                  "referencedDeclaration": 1992,
+                  "src": "1728:9:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   }
                 },
@@ -44022,11 +44163,11 @@
               },
               {
                 "constant": false,
-                "id": 2247,
+                "id": 2071,
                 "name": "price",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1759:10:7",
+                "scope": 2076,
+                "src": "1759:10:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -44034,10 +44175,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2246,
+                  "id": 2070,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1759:4:7",
+                  "src": "1759:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -44048,11 +44189,11 @@
               },
               {
                 "constant": false,
-                "id": 2249,
+                "id": 2073,
                 "name": "duration",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1779:13:7",
+                "scope": 2076,
+                "src": "1779:13:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -44060,10 +44201,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 2248,
+                  "id": 2072,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1779:4:7",
+                  "src": "1779:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -44074,26 +44215,26 @@
               },
               {
                 "constant": false,
-                "id": 2251,
+                "id": 2075,
                 "name": "status",
                 "nodeType": "VariableDeclaration",
-                "scope": 2252,
-                "src": "1802:20:7",
+                "scope": 2076,
+                "src": "1802:20:6",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                   "typeString": "enum Market.RequestStatus"
                 },
                 "typeName": {
                   "contractScope": null,
-                  "id": 2250,
+                  "id": 2074,
                   "name": "RequestStatus",
                   "nodeType": "UserDefinedTypeName",
-                  "referencedDeclaration": 2178,
-                  "src": "1802:13:7",
+                  "referencedDeclaration": 2002,
+                  "src": "1802:13:6",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                     "typeString": "enum Market.RequestStatus"
                   }
                 },
@@ -44103,28 +44244,28 @@
             ],
             "name": "ChangeRequest",
             "nodeType": "StructDefinition",
-            "scope": 5229,
-            "src": "1676:153:7",
+            "scope": 5065,
+            "src": "1676:153:6",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2256,
+            "id": 2080,
             "name": "OrderPlaced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2255,
+              "id": 2079,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2254,
+                  "id": 2078,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2256,
-                  "src": "1868:20:7",
+                  "scope": 2080,
+                  "src": "1868:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44132,10 +44273,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2253,
+                    "id": 2077,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1868:4:7",
+                    "src": "1868:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44145,28 +44286,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1867:22:7"
+              "src": "1867:22:6"
             },
-            "src": "1850:40:7"
+            "src": "1850:40:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2260,
+            "id": 2084,
             "name": "OrderUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2259,
+              "id": 2083,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2258,
+                  "id": 2082,
                   "indexed": true,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2260,
-                  "src": "1914:20:7",
+                  "scope": 2084,
+                  "src": "1914:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44174,10 +44315,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2257,
+                    "id": 2081,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1914:4:7",
+                    "src": "1914:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44187,28 +44328,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1913:22:7"
+              "src": "1913:22:6"
             },
-            "src": "1895:41:7"
+            "src": "1895:41:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2264,
+            "id": 2088,
             "name": "DealOpened",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2263,
+              "id": 2087,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2262,
+                  "id": 2086,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2264,
-                  "src": "1959:19:7",
+                  "scope": 2088,
+                  "src": "1959:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44216,10 +44357,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2261,
+                    "id": 2085,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1959:4:7",
+                    "src": "1959:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44229,28 +44370,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1958:21:7"
+              "src": "1958:21:6"
             },
-            "src": "1942:38:7"
+            "src": "1942:38:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2268,
+            "id": 2092,
             "name": "DealUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2267,
+              "id": 2091,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2266,
+                  "id": 2090,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2268,
-                  "src": "2003:19:7",
+                  "scope": 2092,
+                  "src": "2003:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44258,10 +44399,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2265,
+                    "id": 2089,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2003:4:7",
+                    "src": "2003:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44271,28 +44412,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2002:21:7"
+              "src": "2002:21:6"
             },
-            "src": "1985:39:7"
+            "src": "1985:39:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2274,
+            "id": 2098,
             "name": "Billed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2273,
+              "id": 2097,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2270,
+                  "id": 2094,
                   "indexed": true,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2274,
-                  "src": "2043:19:7",
+                  "scope": 2098,
+                  "src": "2043:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44300,10 +44441,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2269,
+                    "id": 2093,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2043:4:7",
+                    "src": "2043:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44314,12 +44455,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2272,
+                  "id": 2096,
                   "indexed": true,
                   "name": "paidAmount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2274,
-                  "src": "2064:23:7",
+                  "scope": 2098,
+                  "src": "2064:23:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44327,10 +44468,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2271,
+                    "id": 2095,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2064:4:7",
+                    "src": "2064:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44340,28 +44481,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2042:46:7"
+              "src": "2042:46:6"
             },
-            "src": "2030:59:7"
+            "src": "2030:59:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2278,
+            "id": 2102,
             "name": "DealChangeRequestSet",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2277,
+              "id": 2101,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2276,
+                  "id": 2100,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2278,
-                  "src": "2122:28:7",
+                  "scope": 2102,
+                  "src": "2122:28:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44369,10 +44510,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2275,
+                    "id": 2099,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2122:4:7",
+                    "src": "2122:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44382,28 +44523,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2121:30:7"
+              "src": "2121:30:6"
             },
-            "src": "2095:57:7"
+            "src": "2095:57:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2282,
+            "id": 2106,
             "name": "DealChangeRequestUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2281,
+              "id": 2105,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2280,
+                  "id": 2104,
                   "indexed": true,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2282,
-                  "src": "2188:28:7",
+                  "scope": 2106,
+                  "src": "2188:28:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44411,10 +44552,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2279,
+                    "id": 2103,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2188:4:7",
+                    "src": "2188:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44424,28 +44565,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2187:30:7"
+              "src": "2187:30:6"
             },
-            "src": "2157:61:7"
+            "src": "2157:61:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2288,
+            "id": 2112,
             "name": "WorkerAnnounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2287,
+              "id": 2111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2284,
+                  "id": 2108,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2288,
-                  "src": "2246:22:7",
+                  "scope": 2112,
+                  "src": "2246:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44453,10 +44594,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2283,
+                    "id": 2107,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2246:7:7",
+                    "src": "2246:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44467,12 +44608,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2286,
+                  "id": 2110,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2288,
-                  "src": "2270:22:7",
+                  "scope": 2112,
+                  "src": "2270:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44480,10 +44621,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2285,
+                    "id": 2109,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2270:7:7",
+                    "src": "2270:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44493,28 +44634,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2245:48:7"
+              "src": "2245:48:6"
             },
-            "src": "2224:70:7"
+            "src": "2224:70:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2294,
+            "id": 2118,
             "name": "WorkerConfirmed",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2293,
+              "id": 2117,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2290,
+                  "id": 2114,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2294,
-                  "src": "2321:22:7",
+                  "scope": 2118,
+                  "src": "2321:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44522,10 +44663,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2289,
+                    "id": 2113,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2321:7:7",
+                    "src": "2321:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44536,12 +44677,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2292,
+                  "id": 2116,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2294,
-                  "src": "2345:22:7",
+                  "scope": 2118,
+                  "src": "2345:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44549,10 +44690,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2291,
+                    "id": 2115,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:7",
+                    "src": "2345:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44562,28 +44703,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2320:48:7"
+              "src": "2320:48:6"
             },
-            "src": "2299:70:7"
+            "src": "2299:70:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2300,
+            "id": 2124,
             "name": "WorkerRemoved",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2299,
+              "id": 2123,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2296,
+                  "id": 2120,
                   "indexed": true,
                   "name": "worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2300,
-                  "src": "2394:22:7",
+                  "scope": 2124,
+                  "src": "2394:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44591,10 +44732,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2295,
+                    "id": 2119,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2394:7:7",
+                    "src": "2394:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44605,12 +44746,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 2298,
+                  "id": 2122,
                   "indexed": true,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2300,
-                  "src": "2418:22:7",
+                  "scope": 2124,
+                  "src": "2418:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44618,10 +44759,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2297,
+                    "id": 2121,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2418:7:7",
+                    "src": "2418:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -44631,28 +44772,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2393:48:7"
+              "src": "2393:48:6"
             },
-            "src": "2374:68:7"
+            "src": "2374:68:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2304,
+            "id": 2128,
             "name": "NumBenchmarksUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2303,
+              "id": 2127,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2302,
+                  "id": 2126,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2304,
-                  "src": "2475:19:7",
+                  "scope": 2128,
+                  "src": "2475:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44660,10 +44801,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2301,
+                    "id": 2125,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2475:4:7",
+                    "src": "2475:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44673,28 +44814,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2474:21:7"
+              "src": "2474:21:6"
             },
-            "src": "2448:48:7"
+            "src": "2448:48:6"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 2308,
+            "id": 2132,
             "name": "NumNetflagsUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 2307,
+              "id": 2131,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2306,
+                  "id": 2130,
                   "indexed": true,
                   "name": "newNum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2308,
-                  "src": "2526:19:7",
+                  "scope": 2132,
+                  "src": "2526:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -44702,10 +44843,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2305,
+                    "id": 2129,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2526:4:7",
+                    "src": "2526:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -44715,17 +44856,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2525:21:7"
+              "src": "2525:21:6"
             },
-            "src": "2501:46:7"
+            "src": "2501:46:6"
           },
           {
             "constant": true,
-            "id": 2313,
+            "id": 2137,
             "name": "MAX_BENCHMARKS_VALUE",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2566:44:7",
+            "scope": 5065,
+            "src": "2566:44:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44733,10 +44874,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2309,
+              "id": 2133,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2566:4:7",
+              "src": "2566:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44748,7 +44889,7 @@
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
               },
-              "id": 2312,
+              "id": 2136,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -44756,14 +44897,14 @@
               "leftExpression": {
                 "argumentTypes": null,
                 "hexValue": "32",
-                "id": 2310,
+                "id": 2134,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2603:1:7",
+                "src": "2603:1:6",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_2_by_1",
@@ -44776,14 +44917,14 @@
               "rightExpression": {
                 "argumentTypes": null,
                 "hexValue": "3633",
-                "id": 2311,
+                "id": 2135,
                 "isConstant": false,
                 "isLValue": false,
                 "isPure": true,
                 "kind": "number",
                 "lValueRequested": false,
                 "nodeType": "Literal",
-                "src": "2608:2:7",
+                "src": "2608:2:6",
                 "subdenomination": null,
                 "typeDescriptions": {
                   "typeIdentifier": "t_rational_63_by_1",
@@ -44791,7 +44932,7 @@
                 },
                 "value": "63"
               },
-              "src": "2603:7:7",
+              "src": "2603:7:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_9223372036854775808_by_1",
                 "typeString": "int_const 9223372036854775808"
@@ -44801,26 +44942,26 @@
           },
           {
             "constant": false,
-            "id": 2315,
+            "id": 2139,
             "name": "token",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2617:9:7",
+            "scope": 5065,
+            "src": "2617:9:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_SNM_$10080",
+              "typeIdentifier": "t_contract$_SNM_$10926",
               "typeString": "contract SNM"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2314,
+              "id": 2138,
               "name": "SNM",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10080,
-              "src": "2617:3:7",
+              "referencedDeclaration": 10926,
+              "src": "2617:3:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SNM_$10080",
+                "typeIdentifier": "t_contract$_SNM_$10926",
                 "typeString": "contract SNM"
               }
             },
@@ -44829,26 +44970,26 @@
           },
           {
             "constant": false,
-            "id": 2317,
+            "id": 2141,
             "name": "bl",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2633:12:7",
+            "scope": 5065,
+            "src": "2633:12:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_Blacklist_$1161",
+              "typeIdentifier": "t_contract$_Blacklist_$985",
               "typeString": "contract Blacklist"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2316,
+              "id": 2140,
               "name": "Blacklist",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 1161,
-              "src": "2633:9:7",
+              "referencedDeclaration": 985,
+              "src": "2633:9:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                "typeIdentifier": "t_contract$_Blacklist_$985",
                 "typeString": "contract Blacklist"
               }
             },
@@ -44857,26 +44998,26 @@
           },
           {
             "constant": false,
-            "id": 2319,
+            "id": 2143,
             "name": "oracle",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2652:16:7",
+            "scope": 5065,
+            "src": "2652:16:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_OracleUSD_$8677",
+              "typeIdentifier": "t_contract$_OracleUSD_$9523",
               "typeString": "contract OracleUSD"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2318,
+              "id": 2142,
               "name": "OracleUSD",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 8677,
-              "src": "2652:9:7",
+              "referencedDeclaration": 9523,
+              "src": "2652:9:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                "typeIdentifier": "t_contract$_OracleUSD_$9523",
                 "typeString": "contract OracleUSD"
               }
             },
@@ -44885,26 +45026,26 @@
           },
           {
             "constant": false,
-            "id": 2321,
+            "id": 2145,
             "name": "pr",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2675:18:7",
+            "scope": 5065,
+            "src": "2675:18:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+              "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
               "typeString": "contract ProfileRegistry"
             },
             "typeName": {
               "contractScope": null,
-              "id": 2320,
+              "id": 2144,
               "name": "ProfileRegistry",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10035,
-              "src": "2675:15:7",
+              "referencedDeclaration": 10881,
+              "src": "2675:15:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                 "typeString": "contract ProfileRegistry"
               }
             },
@@ -44913,11 +45054,11 @@
           },
           {
             "constant": false,
-            "id": 2324,
+            "id": 2148,
             "name": "ordersAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2700:21:7",
+            "scope": 5065,
+            "src": "2700:21:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44925,10 +45066,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2322,
+              "id": 2146,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2700:4:7",
+              "src": "2700:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44937,14 +45078,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2323,
+              "id": 2147,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2720:1:7",
+              "src": "2720:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -44956,11 +45097,11 @@
           },
           {
             "constant": false,
-            "id": 2327,
+            "id": 2151,
             "name": "dealAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2728:19:7",
+            "scope": 5065,
+            "src": "2728:19:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -44968,10 +45109,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2325,
+              "id": 2149,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2728:4:7",
+              "src": "2728:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -44980,14 +45121,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2326,
+              "id": 2150,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2746:1:7",
+              "src": "2746:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -44999,11 +45140,11 @@
           },
           {
             "constant": false,
-            "id": 2330,
+            "id": 2154,
             "name": "requestsAmount",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2754:23:7",
+            "scope": 5065,
+            "src": "2754:23:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45011,10 +45152,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2328,
+              "id": 2152,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2754:4:7",
+              "src": "2754:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45023,14 +45164,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 2329,
+              "id": 2153,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "2776:1:7",
+              "src": "2776:1:6",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_0_by_1",
@@ -45042,11 +45183,11 @@
           },
           {
             "constant": false,
-            "id": 2332,
+            "id": 2156,
             "name": "benchmarksQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2820:23:7",
+            "scope": 5065,
+            "src": "2820:23:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45054,10 +45195,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2331,
+              "id": 2155,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2820:4:7",
+              "src": "2820:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45068,11 +45209,11 @@
           },
           {
             "constant": false,
-            "id": 2334,
+            "id": 2158,
             "name": "netflagsQuantity",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2884:21:7",
+            "scope": 5065,
+            "src": "2884:21:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45080,10 +45221,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 2333,
+              "id": 2157,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "2884:4:7",
+              "src": "2884:4:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -45094,44 +45235,44 @@
           },
           {
             "constant": false,
-            "id": 2338,
+            "id": 2162,
             "name": "orders",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2912:36:7",
+            "scope": 5065,
+            "src": "2912:36:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
               "typeString": "mapping(uint256 => struct Market.Order)"
             },
             "typeName": {
-              "id": 2337,
+              "id": 2161,
               "keyType": {
-                "id": 2335,
+                "id": 2159,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2920:4:7",
+                "src": "2920:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2912:22:7",
+              "src": "2912:22:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Order)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2336,
+                "id": 2160,
                 "name": "Order",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2241,
-                "src": "2928:5:7",
+                "referencedDeclaration": 2065,
+                "src": "2928:5:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                  "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                   "typeString": "struct Market.Order"
                 }
               }
@@ -45141,44 +45282,44 @@
           },
           {
             "constant": false,
-            "id": 2342,
+            "id": 2166,
             "name": "deals",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2955:34:7",
+            "scope": 5065,
+            "src": "2955:34:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
               "typeString": "mapping(uint256 => struct Market.Deal)"
             },
             "typeName": {
-              "id": 2341,
+              "id": 2165,
               "keyType": {
-                "id": 2339,
+                "id": 2163,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "2963:4:7",
+                "src": "2963:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2955:21:7",
+              "src": "2955:21:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                 "typeString": "mapping(uint256 => struct Market.Deal)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2340,
+                "id": 2164,
                 "name": "Deal",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2212,
-                "src": "2971:4:7",
+                "referencedDeclaration": 2036,
+                "src": "2971:4:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                  "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                   "typeString": "struct Market.Deal"
                 }
               }
@@ -45188,11 +45329,11 @@
           },
           {
             "constant": false,
-            "id": 2347,
+            "id": 2171,
             "name": "dealsID",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "2996:34:7",
+            "scope": 5065,
+            "src": "2996:34:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45200,38 +45341,38 @@
               "typeString": "mapping(address => uint256[])"
             },
             "typeName": {
-              "id": 2346,
+              "id": 2170,
               "keyType": {
-                "id": 2343,
+                "id": 2167,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3004:7:7",
+                "src": "3004:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "2996:26:7",
+              "src": "2996:26:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_array$_t_uint256_$dyn_storage_$",
                 "typeString": "mapping(address => uint256[])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 2344,
+                  "id": 2168,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3015:4:7",
+                  "src": "3015:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 2345,
+                "id": 2169,
                 "length": null,
                 "nodeType": "ArrayTypeName",
-                "src": "3015:6:7",
+                "src": "3015:6:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                   "typeString": "uint256[]"
@@ -45243,44 +45384,44 @@
           },
           {
             "constant": false,
-            "id": 2351,
+            "id": 2175,
             "name": "requests",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3037:39:7",
+            "scope": 5065,
+            "src": "3037:39:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
               "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
             },
             "typeName": {
-              "id": 2350,
+              "id": 2174,
               "keyType": {
-                "id": 2348,
+                "id": 2172,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3045:4:7",
+                "src": "3045:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3037:30:7",
+              "src": "3037:30:6",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                 "typeString": "mapping(uint256 => struct Market.ChangeRequest)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 2349,
+                "id": 2173,
                 "name": "ChangeRequest",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 2252,
-                "src": "3053:13:7",
+                "referencedDeclaration": 2076,
+                "src": "3053:13:6",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                  "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                   "typeString": "struct Market.ChangeRequest"
                 }
               }
@@ -45290,11 +45431,11 @@
           },
           {
             "constant": false,
-            "id": 2357,
+            "id": 2181,
             "name": "actualRequests",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3083:39:7",
+            "scope": 5065,
+            "src": "3083:39:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45302,46 +45443,46 @@
               "typeString": "mapping(uint256 => uint256[2])"
             },
             "typeName": {
-              "id": 2356,
+              "id": 2180,
               "keyType": {
-                "id": 2352,
+                "id": 2176,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "3091:4:7",
+                "src": "3091:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3083:24:7",
+              "src": "3083:24:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                 "typeString": "mapping(uint256 => uint256[2])"
               },
               "valueType": {
                 "baseType": {
-                  "id": 2353,
+                  "id": 2177,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3099:4:7",
+                  "src": "3099:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   }
                 },
-                "id": 2355,
+                "id": 2179,
                 "length": {
                   "argumentTypes": null,
                   "hexValue": "32",
-                  "id": 2354,
+                  "id": 2178,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": false,
                   "kind": "number",
                   "lValueRequested": false,
                   "nodeType": "Literal",
-                  "src": "3104:1:7",
+                  "src": "3104:1:6",
                   "subdenomination": null,
                   "typeDescriptions": {
                     "typeIdentifier": null,
@@ -45350,7 +45491,7 @@
                   "value": "2"
                 },
                 "nodeType": "ArrayTypeName",
-                "src": "3099:7:7",
+                "src": "3099:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_array$_t_uint256_$2_storage_ptr",
                   "typeString": "uint256[2]"
@@ -45362,11 +45503,11 @@
           },
           {
             "constant": false,
-            "id": 2361,
+            "id": 2185,
             "name": "masterOf",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3129:36:7",
+            "scope": 5065,
+            "src": "3129:36:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45374,28 +45515,28 @@
               "typeString": "mapping(address => address)"
             },
             "typeName": {
-              "id": 2360,
+              "id": 2184,
               "keyType": {
-                "id": 2358,
+                "id": 2182,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3137:7:7",
+                "src": "3137:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3129:27:7",
+              "src": "3129:27:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                 "typeString": "mapping(address => address)"
               },
               "valueType": {
-                "id": 2359,
+                "id": 2183,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3148:7:7",
+                "src": "3148:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
@@ -45407,11 +45548,11 @@
           },
           {
             "constant": false,
-            "id": 2365,
+            "id": 2189,
             "name": "isMaster",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3172:33:7",
+            "scope": 5065,
+            "src": "3172:33:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45419,28 +45560,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 2364,
+              "id": 2188,
               "keyType": {
-                "id": 2362,
+                "id": 2186,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3180:7:7",
+                "src": "3180:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3172:24:7",
+              "src": "3172:24:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 2363,
+                "id": 2187,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "3191:4:7",
+                "src": "3191:4:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -45452,11 +45593,11 @@
           },
           {
             "constant": false,
-            "id": 2371,
+            "id": 2195,
             "name": "masterRequest",
             "nodeType": "VariableDeclaration",
-            "scope": 5229,
-            "src": "3212:58:7",
+            "scope": 5065,
+            "src": "3212:58:6",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -45464,46 +45605,46 @@
               "typeString": "mapping(address => mapping(address => bool))"
             },
             "typeName": {
-              "id": 2370,
+              "id": 2194,
               "keyType": {
-                "id": 2366,
+                "id": 2190,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "3220:7:7",
+                "src": "3220:7:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "3212:44:7",
+              "src": "3212:44:6",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(address => mapping(address => bool))"
               },
               "valueType": {
-                "id": 2369,
+                "id": 2193,
                 "keyType": {
-                  "id": 2367,
+                  "id": 2191,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3239:7:7",
+                  "src": "3239:7:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "3231:24:7",
+                "src": "3231:24:6",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 2368,
+                  "id": 2192,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "3250:4:7",
+                  "src": "3250:4:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -45516,28 +45657,28 @@
           },
           {
             "body": {
-              "id": 2418,
+              "id": 2242,
               "nodeType": "Block",
-              "src": "3438:253:7",
+              "src": "3523:253:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2390,
+                    "id": 2214,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2386,
+                      "id": 2210,
                       "name": "token",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2315,
-                      "src": "3448:5:7",
+                      "referencedDeclaration": 2139,
+                      "src": "3533:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$10080",
+                        "typeIdentifier": "t_contract$_SNM_$10926",
                         "typeString": "contract SNM"
                       }
                     },
@@ -45548,12 +45689,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2388,
+                          "id": 2212,
                           "name": "_token",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2373,
-                          "src": "3460:6:7",
+                          "referencedDeclaration": 2197,
+                          "src": "3545:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45567,18 +45708,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2387,
+                        "id": 2211,
                         "name": "SNM",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10080,
-                        "src": "3456:3:7",
+                        "referencedDeclaration": 10926,
+                        "src": "3541:3:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_SNM_$10080_$",
+                          "typeIdentifier": "t_type$_t_contract$_SNM_$10926_$",
                           "typeString": "type(contract SNM)"
                         }
                       },
-                      "id": 2389,
+                      "id": 2213,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45586,40 +45727,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3456:11:7",
+                      "src": "3541:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_SNM_$10080",
+                        "typeIdentifier": "t_contract$_SNM_$10926",
                         "typeString": "contract SNM"
                       }
                     },
-                    "src": "3448:19:7",
+                    "src": "3533:19:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_SNM_$10080",
+                      "typeIdentifier": "t_contract$_SNM_$10926",
                       "typeString": "contract SNM"
                     }
                   },
-                  "id": 2391,
+                  "id": 2215,
                   "nodeType": "ExpressionStatement",
-                  "src": "3448:19:7"
+                  "src": "3533:19:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2396,
+                    "id": 2220,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2392,
+                      "id": 2216,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2317,
-                      "src": "3477:2:7",
+                      "referencedDeclaration": 2141,
+                      "src": "3562:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -45630,12 +45771,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2394,
+                          "id": 2218,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2375,
-                          "src": "3492:10:7",
+                          "referencedDeclaration": 2199,
+                          "src": "3577:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45649,18 +45790,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2393,
+                        "id": 2217,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1161,
-                        "src": "3482:9:7",
+                        "referencedDeclaration": 985,
+                        "src": "3567:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$985_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 2395,
+                      "id": 2219,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45668,40 +45809,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3482:21:7",
+                      "src": "3567:21:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "3477:26:7",
+                    "src": "3562:26:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$1161",
+                      "typeIdentifier": "t_contract$_Blacklist_$985",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 2397,
+                  "id": 2221,
                   "nodeType": "ExpressionStatement",
-                  "src": "3477:26:7"
+                  "src": "3562:26:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2402,
+                    "id": 2226,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2398,
+                      "id": 2222,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2319,
-                      "src": "3513:6:7",
+                      "referencedDeclaration": 2143,
+                      "src": "3598:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -45712,12 +45853,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2400,
+                          "id": 2224,
                           "name": "_oracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2377,
-                          "src": "3532:7:7",
+                          "referencedDeclaration": 2201,
+                          "src": "3617:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45731,18 +45872,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2399,
+                        "id": 2223,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8677,
-                        "src": "3522:9:7",
+                        "referencedDeclaration": 9523,
+                        "src": "3607:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 2401,
+                      "id": 2225,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45750,40 +45891,40 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3522:18:7",
+                      "src": "3607:18:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "3513:27:7",
+                    "src": "3598:27:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                      "typeIdentifier": "t_contract$_OracleUSD_$9523",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 2403,
+                  "id": 2227,
                   "nodeType": "ExpressionStatement",
-                  "src": "3513:27:7"
+                  "src": "3598:27:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2408,
+                    "id": 2232,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2404,
+                      "id": 2228,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2321,
-                      "src": "3550:2:7",
+                      "referencedDeclaration": 2145,
+                      "src": "3635:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -45794,12 +45935,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2406,
+                          "id": 2230,
                           "name": "_profileRegistry",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2379,
-                          "src": "3571:16:7",
+                          "referencedDeclaration": 2203,
+                          "src": "3656:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -45813,18 +45954,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 2405,
+                        "id": 2229,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10035,
-                        "src": "3555:15:7",
+                        "referencedDeclaration": 10881,
+                        "src": "3640:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 2407,
+                      "id": 2231,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -45832,38 +45973,38 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "3555:33:7",
+                      "src": "3640:33:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "3550:38:7",
+                    "src": "3635:38:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 2409,
+                  "id": 2233,
                   "nodeType": "ExpressionStatement",
-                  "src": "3550:38:7"
+                  "src": "3635:38:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2412,
+                    "id": 2236,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2410,
+                      "id": 2234,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "3598:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "3683:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -45873,43 +46014,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 2411,
+                      "id": 2235,
                       "name": "_benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2381,
-                      "src": "3619:19:7",
+                      "referencedDeclaration": 2205,
+                      "src": "3704:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3598:40:7",
+                    "src": "3683:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2413,
+                  "id": 2237,
                   "nodeType": "ExpressionStatement",
-                  "src": "3598:40:7"
+                  "src": "3683:40:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2416,
+                    "id": 2240,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2414,
+                      "id": 2238,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "3648:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "3733:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -45919,31 +46060,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 2415,
+                      "id": 2239,
                       "name": "_netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2383,
-                      "src": "3667:17:7",
+                      "referencedDeclaration": 2207,
+                      "src": "3752:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3648:36:7",
+                    "src": "3733:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2417,
+                  "id": 2241,
                   "nodeType": "ExpressionStatement",
-                  "src": "3648:36:7"
+                  "src": "3733:36:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2419,
+            "id": 2243,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -45951,16 +46092,16 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2384,
+              "id": 2208,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2373,
+                  "id": 2197,
                   "name": "_token",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3302:14:7",
+                  "scope": 2243,
+                  "src": "3302:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -45968,10 +46109,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2372,
+                    "id": 2196,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3302:7:7",
+                    "src": "3302:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -45982,11 +46123,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2375,
+                  "id": 2199,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3318:18:7",
+                  "scope": 2243,
+                  "src": "3334:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -45994,10 +46135,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2374,
+                    "id": 2198,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3318:7:7",
+                    "src": "3334:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46008,11 +46149,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2377,
+                  "id": 2201,
                   "name": "_oracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3338:15:7",
+                  "scope": 2243,
+                  "src": "3370:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46020,10 +46161,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2376,
+                    "id": 2200,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3338:7:7",
+                    "src": "3370:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46034,11 +46175,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2379,
+                  "id": 2203,
                   "name": "_profileRegistry",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3355:24:7",
+                  "scope": 2243,
+                  "src": "3403:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46046,10 +46187,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2378,
+                    "id": 2202,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3355:7:7",
+                    "src": "3403:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -46060,11 +46201,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2381,
+                  "id": 2205,
                   "name": "_benchmarksQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3381:24:7",
+                  "scope": 2243,
+                  "src": "3445:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46072,10 +46213,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2380,
+                    "id": 2204,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3381:4:7",
+                    "src": "3445:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -46086,11 +46227,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2383,
+                  "id": 2207,
                   "name": "_netflagsQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2419,
-                  "src": "3407:22:7",
+                  "scope": 2243,
+                  "src": "3487:22:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -46098,10 +46239,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2382,
+                    "id": 2206,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3407:4:7",
+                    "src": "3487:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -46111,26 +46252,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3301:129:7"
+              "src": "3301:214:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2385,
+              "id": 2209,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3438:0:7"
+              "src": "3523:0:6"
             },
-            "scope": 5229,
-            "src": "3290:401:7",
+            "scope": 5065,
+            "src": "3290:486:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2580,
+              "id": 2404,
               "nodeType": "Block",
-              "src": "4068:1331:7",
+              "src": "4153:1331:6",
               "statements": [
                 {
                   "expression": {
@@ -46139,24 +46280,24 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2451,
+                        "id": 2275,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2447,
+                          "id": 2271,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2432,
-                          "src": "4087:14:7",
+                          "referencedDeclaration": 2256,
+                          "src": "4172:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -46168,32 +46309,32 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2448,
+                              "id": 2272,
                               "name": "ProfileRegistry",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 10035,
-                              "src": "4105:15:7",
+                              "referencedDeclaration": 10881,
+                              "src": "4190:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                                "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                                 "typeString": "type(contract ProfileRegistry)"
                               }
                             },
-                            "id": 2449,
+                            "id": 2273,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "IdentityLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9497,
-                            "src": "4105:29:7",
+                            "referencedDeclaration": 10343,
+                            "src": "4190:29:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2450,
+                          "id": 2274,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -46201,13 +46342,13 @@
                           "memberName": "ANONYMOUS",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4105:39:7",
+                          "src": "4190:39:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "4087:57:7",
+                        "src": "4172:57:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46221,21 +46362,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2446,
+                      "id": 2270,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4079:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4164:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2452,
+                    "id": 2276,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46243,15 +46384,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4079:66:7",
+                    "src": "4164:66:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2453,
+                  "id": 2277,
                   "nodeType": "ExpressionStatement",
-                  "src": "4079:66:7"
+                  "src": "4164:66:6"
                 },
                 {
                   "expression": {
@@ -46263,7 +46404,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2458,
+                        "id": 2282,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -46272,18 +46413,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2455,
+                            "id": 2279,
                             "name": "_netflags",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2430,
-                            "src": "4163:9:7",
+                            "referencedDeclaration": 2254,
+                            "src": "4248:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "id": 2456,
+                          "id": 2280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46291,7 +46432,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4163:16:7",
+                          "src": "4248:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46301,18 +46442,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2457,
+                          "id": 2281,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2334,
-                          "src": "4183:16:7",
+                          "referencedDeclaration": 2158,
+                          "src": "4268:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4163:36:7",
+                        "src": "4248:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46326,21 +46467,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2454,
+                      "id": 2278,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4155:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4240:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2459,
+                    "id": 2283,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46348,15 +46489,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4155:45:7",
+                    "src": "4240:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2460,
+                  "id": 2284,
                   "nodeType": "ExpressionStatement",
-                  "src": "4155:45:7"
+                  "src": "4240:45:6"
                 },
                 {
                   "expression": {
@@ -46368,7 +46509,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2465,
+                        "id": 2289,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -46377,18 +46518,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2462,
+                            "id": 2286,
                             "name": "_benchmarks",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2439,
-                            "src": "4218:11:7",
+                            "referencedDeclaration": 2263,
+                            "src": "4303:11:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "id": 2463,
+                          "id": 2287,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46396,7 +46537,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4218:18:7",
+                          "src": "4303:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46406,18 +46547,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2464,
+                          "id": 2288,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2332,
-                          "src": "4240:18:7",
+                          "referencedDeclaration": 2156,
+                          "src": "4325:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "4218:40:7",
+                        "src": "4303:40:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -46431,21 +46572,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2461,
+                      "id": 2285,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "4210:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "4295:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2466,
+                    "id": 2290,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -46453,21 +46594,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4210:49:7",
+                    "src": "4295:49:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2467,
+                  "id": 2291,
                   "nodeType": "ExpressionStatement",
-                  "src": "4210:49:7"
+                  "src": "4295:49:6"
                 },
                 {
                   "body": {
-                    "id": 2487,
+                    "id": 2311,
                     "nodeType": "Block",
-                    "src": "4316:71:7",
+                    "src": "4401:71:6",
                     "statements": [
                       {
                         "expression": {
@@ -46479,7 +46620,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 2484,
+                              "id": 2308,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -46488,26 +46629,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 2480,
+                                  "id": 2304,
                                   "name": "_benchmarks",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2439,
-                                  "src": "4338:11:7",
+                                  "referencedDeclaration": 2263,
+                                  "src": "4423:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 2482,
+                                "id": 2306,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 2481,
+                                  "id": 2305,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2469,
-                                  "src": "4350:1:7",
+                                  "referencedDeclaration": 2293,
+                                  "src": "4435:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -46518,7 +46659,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "4338:14:7",
+                                "src": "4423:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -46528,18 +46669,18 @@
                               "operator": "<",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 2483,
+                                "id": 2307,
                                 "name": "MAX_BENCHMARKS_VALUE",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2313,
-                                "src": "4355:20:7",
+                                "referencedDeclaration": 2137,
+                                "src": "4440:20:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "4338:37:7",
+                              "src": "4423:37:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -46553,21 +46694,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 2479,
+                            "id": 2303,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "4330:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "4415:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 2485,
+                          "id": 2309,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -46575,15 +46716,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4330:46:7",
+                          "src": "4415:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2486,
+                        "id": 2310,
                         "nodeType": "ExpressionStatement",
-                        "src": "4330:46:7"
+                        "src": "4415:46:6"
                       }
                     ]
                   },
@@ -46593,19 +46734,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 2475,
+                    "id": 2299,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2472,
+                      "id": 2296,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2469,
-                      "src": "4287:1:7",
+                      "referencedDeclaration": 2293,
+                      "src": "4372:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -46617,18 +46758,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2473,
+                        "id": 2297,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2439,
-                        "src": "4291:11:7",
+                        "referencedDeclaration": 2263,
+                        "src": "4376:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 2474,
+                      "id": 2298,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -46636,31 +46777,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4291:18:7",
+                      "src": "4376:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4287:22:7",
+                    "src": "4372:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 2488,
+                  "id": 2312,
                   "initializationExpression": {
                     "assignments": [
-                      2469
+                      2293
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 2469,
+                        "id": 2293,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 2581,
-                        "src": "4275:6:7",
+                        "scope": 2405,
+                        "src": "4360:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -46668,10 +46809,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 2468,
+                          "id": 2292,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4275:4:7",
+                          "src": "4360:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -46681,18 +46822,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 2471,
+                    "id": 2295,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 2470,
+                      "id": 2294,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4284:1:7",
+                      "src": "4369:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -46701,12 +46842,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4275:10:7"
+                    "src": "4360:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 2477,
+                      "id": 2301,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -46714,15 +46855,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4311:3:7",
+                      "src": "4396:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 2476,
+                        "id": 2300,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2469,
-                        "src": "4311:1:7",
+                        "referencedDeclaration": 2293,
+                        "src": "4396:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -46733,25 +46874,25 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 2478,
+                    "id": 2302,
                     "nodeType": "ExpressionStatement",
-                    "src": "4311:3:7"
+                    "src": "4396:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4270:117:7"
+                  "src": "4355:117:6"
                 },
                 {
                   "assignments": [
-                    2490
+                    2314
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2490,
+                      "id": 2314,
                       "name": "lockedSum",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2581,
-                      "src": "4397:14:7",
+                      "scope": 2405,
+                      "src": "4482:14:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -46759,10 +46900,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2489,
+                        "id": 2313,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4397:4:7",
+                        "src": "4482:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -46772,18 +46913,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2492,
+                  "id": 2316,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 2491,
+                    "id": 2315,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4414:1:7",
+                    "src": "4499:1:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -46792,30 +46933,30 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4397:18:7"
+                  "src": "4482:18:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 2496,
+                    "id": 2320,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2493,
+                      "id": 2317,
                       "name": "_orderType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2421,
-                      "src": "4430:10:7",
+                      "referencedDeclaration": 2245,
+                      "src": "4515:10:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -46825,18 +46966,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2494,
+                        "id": 2318,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "4444:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "4529:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 2495,
+                      "id": 2319,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -46844,26 +46985,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4444:19:7",
+                      "src": "4529:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "4430:33:7",
+                    "src": "4515:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2540,
+                  "id": 2364,
                   "nodeType": "IfStatement",
-                  "src": "4426:463:7",
+                  "src": "4511:463:6",
                   "trueBody": {
-                    "id": 2539,
+                    "id": 2363,
                     "nodeType": "Block",
-                    "src": "4465:424:7",
+                    "src": "4550:424:6",
                     "statements": [
                       {
                         "condition": {
@@ -46872,19 +47013,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 2499,
+                          "id": 2323,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 2497,
+                            "id": 2321,
                             "name": "_duration",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2425,
-                            "src": "4483:9:7",
+                            "referencedDeclaration": 2249,
+                            "src": "4568:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -46895,14 +47036,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2498,
+                            "id": 2322,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "4496:1:7",
+                            "src": "4581:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -46910,7 +47051,7 @@
                             },
                             "value": "0"
                           },
-                          "src": "4483:14:7",
+                          "src": "4568:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -46923,19 +47064,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 2510,
+                            "id": 2334,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 2508,
+                              "id": 2332,
                               "name": "_duration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2425,
-                              "src": "4587:9:7",
+                              "referencedDeclaration": 2249,
+                              "src": "4672:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -46946,14 +47087,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 2509,
+                              "id": 2333,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "4599:6:7",
+                              "src": "4684:6:6",
                               "subdenomination": "days",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_86400_by_1",
@@ -46961,33 +47102,33 @@
                               },
                               "value": "1"
                             },
-                            "src": "4587:18:7",
+                            "src": "4672:18:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 2526,
+                            "id": 2350,
                             "nodeType": "Block",
-                            "src": "4693:77:7",
+                            "src": "4778:77:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2524,
+                                  "id": 2348,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2519,
+                                    "id": 2343,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2490,
-                                    "src": "4711:9:7",
+                                    "referencedDeclaration": 2314,
+                                    "src": "4796:9:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -47000,12 +47141,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 2521,
+                                        "id": 2345,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2427,
-                                        "src": "4740:6:7",
+                                        "referencedDeclaration": 2251,
+                                        "src": "4825:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47014,14 +47155,14 @@
                                       {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 2522,
+                                        "id": 2346,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "4748:6:7",
+                                        "src": "4833:6:6",
                                         "subdenomination": "days",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_86400_by_1",
@@ -47041,18 +47182,18 @@
                                           "typeString": "int_const 86400"
                                         }
                                       ],
-                                      "id": 2520,
+                                      "id": 2344,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4870,
-                                      "src": "4723:16:7",
+                                      "referencedDeclaration": 4706,
+                                      "src": "4808:16:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 2523,
+                                    "id": 2347,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -47060,48 +47201,48 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4723:32:7",
+                                    "src": "4808:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4711:44:7",
+                                  "src": "4796:44:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2525,
+                                "id": 2349,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4711:44:7"
+                                "src": "4796:44:6"
                               }
                             ]
                           },
-                          "id": 2527,
+                          "id": 2351,
                           "nodeType": "IfStatement",
-                          "src": "4583:187:7",
+                          "src": "4668:187:6",
                           "trueBody": {
-                            "id": 2518,
+                            "id": 2342,
                             "nodeType": "Block",
-                            "src": "4607:80:7",
+                            "src": "4692:80:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2516,
+                                  "id": 2340,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "leftHandSide": {
                                     "argumentTypes": null,
-                                    "id": 2511,
+                                    "id": 2335,
                                     "name": "lockedSum",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2490,
-                                    "src": "4625:9:7",
+                                    "referencedDeclaration": 2314,
+                                    "src": "4710:9:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -47114,12 +47255,12 @@
                                     "arguments": [
                                       {
                                         "argumentTypes": null,
-                                        "id": 2513,
+                                        "id": 2337,
                                         "name": "_price",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2427,
-                                        "src": "4654:6:7",
+                                        "referencedDeclaration": 2251,
+                                        "src": "4739:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47127,12 +47268,12 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 2514,
+                                        "id": 2338,
                                         "name": "_duration",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2425,
-                                        "src": "4662:9:7",
+                                        "referencedDeclaration": 2249,
+                                        "src": "4747:9:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -47150,18 +47291,18 @@
                                           "typeString": "uint256"
                                         }
                                       ],
-                                      "id": 2512,
+                                      "id": 2336,
                                       "name": "CalculatePayment",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4870,
-                                      "src": "4637:16:7",
+                                      "referencedDeclaration": 4706,
+                                      "src": "4722:16:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                         "typeString": "function (uint256,uint256) view returns (uint256)"
                                       }
                                     },
-                                    "id": 2515,
+                                    "id": 2339,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -47169,49 +47310,49 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "4637:35:7",
+                                    "src": "4722:35:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "4625:47:7",
+                                  "src": "4710:47:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 2517,
+                                "id": 2341,
                                 "nodeType": "ExpressionStatement",
-                                "src": "4625:47:7"
+                                "src": "4710:47:6"
                               }
                             ]
                           }
                         },
-                        "id": 2528,
+                        "id": 2352,
                         "nodeType": "IfStatement",
-                        "src": "4479:291:7",
+                        "src": "4564:291:6",
                         "trueBody": {
-                          "id": 2507,
+                          "id": 2331,
                           "nodeType": "Block",
-                          "src": "4499:78:7",
+                          "src": "4584:78:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2505,
+                                "id": 2329,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 2500,
+                                  "id": 2324,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2490,
-                                  "src": "4517:9:7",
+                                  "referencedDeclaration": 2314,
+                                  "src": "4602:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -47224,12 +47365,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 2502,
+                                      "id": 2326,
                                       "name": "_price",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2427,
-                                      "src": "4546:6:7",
+                                      "referencedDeclaration": 2251,
+                                      "src": "4631:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -47238,14 +47379,14 @@
                                     {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 2503,
+                                      "id": 2327,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "4554:7:7",
+                                      "src": "4639:7:6",
                                       "subdenomination": "hours",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_3600_by_1",
@@ -47265,18 +47406,18 @@
                                         "typeString": "int_const 3600"
                                       }
                                     ],
-                                    "id": 2501,
+                                    "id": 2325,
                                     "name": "CalculatePayment",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4870,
-                                    "src": "4529:16:7",
+                                    "referencedDeclaration": 4706,
+                                    "src": "4614:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) view returns (uint256)"
                                     }
                                   },
-                                  "id": 2504,
+                                  "id": 2328,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -47284,21 +47425,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "4529:33:7",
+                                  "src": "4614:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "4517:45:7",
+                                "src": "4602:45:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 2506,
+                              "id": 2330,
                               "nodeType": "ExpressionStatement",
-                              "src": "4517:45:7"
+                              "src": "4602:45:6"
                             }
                           ]
                         }
@@ -47314,18 +47455,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2532,
+                                    "id": 2356,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "4849:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "4934:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 2533,
+                                  "id": 2357,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -47333,7 +47474,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "4849:10:7",
+                                  "src": "4934:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -47341,25 +47482,25 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 2534,
+                                  "id": 2358,
                                   "name": "this",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11366,
-                                  "src": "4861:4:7",
+                                  "referencedDeclaration": 11646,
+                                  "src": "4946:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Market_$5229",
+                                    "typeIdentifier": "t_contract$_Market_$5065",
                                     "typeString": "contract Market"
                                   }
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 2535,
+                                  "id": 2359,
                                   "name": "lockedSum",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2490,
-                                  "src": "4867:9:7",
+                                  "referencedDeclaration": 2314,
+                                  "src": "4952:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -47373,7 +47514,7 @@
                                     "typeString": "address"
                                   },
                                   {
-                                    "typeIdentifier": "t_contract$_Market_$5229",
+                                    "typeIdentifier": "t_contract$_Market_$5065",
                                     "typeString": "contract Market"
                                   },
                                   {
@@ -47383,32 +47524,32 @@
                                 ],
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2530,
+                                  "id": 2354,
                                   "name": "token",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2315,
-                                  "src": "4830:5:7",
+                                  "referencedDeclaration": 2139,
+                                  "src": "4915:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_SNM_$10080",
+                                    "typeIdentifier": "t_contract$_SNM_$10926",
                                     "typeString": "contract SNM"
                                   }
                                 },
-                                "id": 2531,
+                                "id": 2355,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "transferFrom",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 11153,
-                                "src": "4830:18:7",
+                                "referencedDeclaration": 11437,
+                                "src": "4915:18:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                   "typeString": "function (address,address,uint256) external returns (bool)"
                                 }
                               },
-                              "id": 2536,
+                              "id": 2360,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -47416,7 +47557,7 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "4830:47:7",
+                              "src": "4915:47:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -47430,21 +47571,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 2529,
+                            "id": 2353,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "4822:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "4907:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 2537,
+                          "id": 2361,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -47452,15 +47593,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "4822:56:7",
+                          "src": "4907:56:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 2538,
+                        "id": 2362,
                         "nodeType": "ExpressionStatement",
-                        "src": "4822:56:7"
+                        "src": "4907:56:6"
                       }
                     ]
                   }
@@ -47468,19 +47609,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2546,
+                    "id": 2370,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 2541,
+                      "id": 2365,
                       "name": "ordersAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2324,
-                      "src": "4899:12:7",
+                      "referencedDeclaration": 2148,
+                      "src": "4984:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -47494,14 +47635,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 2544,
+                          "id": 2368,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "4931:1:7",
+                          "src": "5016:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -47519,32 +47660,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2542,
+                          "id": 2366,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2324,
-                          "src": "4914:12:7",
+                          "referencedDeclaration": 2148,
+                          "src": "4999:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 2543,
+                        "id": 2367,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "4914:16:7",
+                        "referencedDeclaration": 11079,
+                        "src": "4999:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 2545,
+                      "id": 2369,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -47552,34 +47693,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4914:19:7",
+                      "src": "4999:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4899:34:7",
+                    "src": "4984:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2547,
+                  "id": 2371,
                   "nodeType": "ExpressionStatement",
-                  "src": "4899:34:7"
+                  "src": "4984:34:6"
                 },
                 {
                   "assignments": [
-                    2549
+                    2373
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2549,
+                      "id": 2373,
                       "name": "orderId",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2581,
-                      "src": "4943:15:7",
+                      "scope": 2405,
+                      "src": "5028:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -47587,10 +47728,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 2548,
+                        "id": 2372,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "4943:7:7",
+                        "src": "5028:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47600,27 +47741,27 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2551,
+                  "id": 2375,
                   "initialValue": {
                     "argumentTypes": null,
-                    "id": 2550,
+                    "id": 2374,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2324,
-                    "src": "4961:12:7",
+                    "referencedDeclaration": 2148,
+                    "src": "5046:12:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "4943:30:7"
+                  "src": "5028:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2572,
+                    "id": 2396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -47629,26 +47770,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 2552,
+                        "id": 2376,
                         "name": "orders",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2338,
-                        "src": "4984:6:7",
+                        "referencedDeclaration": 2162,
+                        "src": "5069:6:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                         }
                       },
-                      "id": 2554,
+                      "id": 2378,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 2553,
+                        "id": 2377,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "4991:7:7",
+                        "referencedDeclaration": 2373,
+                        "src": "5076:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47659,9 +47800,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4984:15:7",
+                      "src": "5069:15:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_storage",
+                        "typeIdentifier": "t_struct$_Order_$2065_storage",
                         "typeString": "struct Market.Order storage ref"
                       }
                     },
@@ -47672,14 +47813,14 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 2556,
+                          "id": 2380,
                           "name": "_orderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2421,
-                          "src": "5021:10:7",
+                          "referencedDeclaration": 2245,
+                          "src": "5106:10:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -47687,18 +47828,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2557,
+                            "id": 2381,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "5045:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "5130:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2558,
+                          "id": 2382,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -47706,9 +47847,9 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5045:24:7",
+                          "src": "5130:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -47716,18 +47857,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2559,
+                            "id": 2383,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "5083:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "5168:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2560,
+                          "id": 2384,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -47735,7 +47876,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5083:10:7",
+                          "src": "5168:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47743,12 +47884,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2561,
+                          "id": 2385,
                           "name": "_id_counterparty",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2423,
-                          "src": "5107:16:7",
+                          "referencedDeclaration": 2247,
+                          "src": "5192:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47756,12 +47897,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2562,
+                          "id": 2386,
                           "name": "_duration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2425,
-                          "src": "5137:9:7",
+                          "referencedDeclaration": 2249,
+                          "src": "5222:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47769,12 +47910,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2563,
+                          "id": 2387,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2427,
-                          "src": "5160:6:7",
+                          "referencedDeclaration": 2251,
+                          "src": "5245:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47782,12 +47923,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2564,
+                          "id": 2388,
                           "name": "_netflags",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2430,
-                          "src": "5180:9:7",
+                          "referencedDeclaration": 2254,
+                          "src": "5265:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                             "typeString": "bool[] memory"
@@ -47795,25 +47936,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2565,
+                          "id": 2389,
                           "name": "_identityLevel",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2432,
-                          "src": "5203:14:7",
+                          "referencedDeclaration": 2256,
+                          "src": "5288:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2566,
+                          "id": 2390,
                           "name": "_blacklist",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2434,
-                          "src": "5231:10:7",
+                          "referencedDeclaration": 2258,
+                          "src": "5316:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -47821,12 +47962,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2567,
+                          "id": 2391,
                           "name": "_tag",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2436,
-                          "src": "5255:4:7",
+                          "referencedDeclaration": 2260,
+                          "src": "5340:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes32",
                             "typeString": "bytes32"
@@ -47834,12 +47975,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2568,
+                          "id": 2392,
                           "name": "_benchmarks",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2439,
-                          "src": "5273:11:7",
+                          "referencedDeclaration": 2263,
+                          "src": "5358:11:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                             "typeString": "uint64[] memory"
@@ -47847,12 +47988,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 2569,
+                          "id": 2393,
                           "name": "lockedSum",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2490,
-                          "src": "5298:9:7",
+                          "referencedDeclaration": 2314,
+                          "src": "5383:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -47861,14 +48002,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 2570,
+                          "id": 2394,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "5321:1:7",
+                          "src": "5406:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -47880,11 +48021,11 @@
                       "expression": {
                         "argumentTypes": [
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
                           {
@@ -47908,7 +48049,7 @@
                             "typeString": "bool[] memory"
                           },
                           {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           },
                           {
@@ -47932,18 +48073,18 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 2555,
+                        "id": 2379,
                         "name": "Order",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2241,
-                        "src": "5002:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "5087:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Order_$2241_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Order_$2065_storage_ptr_$",
                           "typeString": "type(struct Market.Order storage pointer)"
                         }
                       },
-                      "id": 2571,
+                      "id": 2395,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -47951,21 +48092,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5002:330:7",
+                      "src": "5087:330:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "src": "4984:348:7",
+                    "src": "5069:348:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
-                  "id": 2573,
+                  "id": 2397,
                   "nodeType": "ExpressionStatement",
-                  "src": "4984:348:7"
+                  "src": "5069:348:6"
                 },
                 {
                   "eventCall": {
@@ -47973,12 +48114,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2575,
+                        "id": 2399,
                         "name": "orderId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2549,
-                        "src": "5360:7:7",
+                        "referencedDeclaration": 2373,
+                        "src": "5445:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -47992,18 +48133,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2574,
+                      "id": 2398,
                       "name": "OrderPlaced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2256,
-                      "src": "5348:11:7",
+                      "referencedDeclaration": 2080,
+                      "src": "5433:11:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 2576,
+                    "id": 2400,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48011,91 +48152,91 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5348:20:7",
+                    "src": "5433:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2577,
+                  "id": 2401,
                   "nodeType": "EmitStatement",
-                  "src": "5343:25:7"
+                  "src": "5428:25:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2578,
+                    "id": 2402,
                     "name": "orderId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2549,
-                    "src": "5385:7:7",
+                    "referencedDeclaration": 2373,
+                    "src": "5470:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 2445,
-                  "id": 2579,
+                  "functionReturnParameters": 2269,
+                  "id": 2403,
                   "nodeType": "Return",
-                  "src": "5378:14:7"
+                  "src": "5463:14:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2581,
+            "id": 2405,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2442,
+                "id": 2266,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2441,
+                  "id": 2265,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "4033:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "4125:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4033:13:7"
+                "src": "4125:13:6"
               }
             ],
             "name": "PlaceOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2440,
+              "id": 2264,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2421,
+                  "id": 2245,
                   "name": "_orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3767:20:7",
+                  "scope": 2405,
+                  "src": "3852:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2420,
+                    "id": 2244,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "3767:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "3852:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -48104,11 +48245,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2423,
+                  "id": 2247,
                   "name": "_id_counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3797:24:7",
+                  "scope": 2405,
+                  "src": "3882:24:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48116,10 +48257,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2422,
+                    "id": 2246,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3797:7:7",
+                    "src": "3882:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -48130,11 +48271,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2425,
+                  "id": 2249,
                   "name": "_duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3831:14:7",
+                  "scope": 2405,
+                  "src": "3916:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48142,10 +48283,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2424,
+                    "id": 2248,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3831:4:7",
+                    "src": "3916:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48156,11 +48297,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2427,
+                  "id": 2251,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3855:11:7",
+                  "scope": 2405,
+                  "src": "3940:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48168,10 +48309,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2426,
+                    "id": 2250,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3855:4:7",
+                    "src": "3940:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48182,11 +48323,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2430,
+                  "id": 2254,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3876:16:7",
+                  "scope": 2405,
+                  "src": "3961:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48195,19 +48336,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2428,
+                      "id": 2252,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "3876:4:7",
+                      "src": "3961:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 2429,
+                    "id": 2253,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "3876:6:7",
+                    "src": "3961:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -48218,26 +48359,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 2432,
+                  "id": 2256,
                   "name": "_identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3902:44:7",
+                  "scope": 2405,
+                  "src": "3987:44:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 2431,
+                    "id": 2255,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
-                    "src": "3902:29:7",
+                    "referencedDeclaration": 10343,
+                    "src": "3987:29:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -48246,11 +48387,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2434,
+                  "id": 2258,
                   "name": "_blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3956:18:7",
+                  "scope": 2405,
+                  "src": "4041:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48258,10 +48399,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 2433,
+                    "id": 2257,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3956:7:7",
+                    "src": "4041:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -48272,11 +48413,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2436,
+                  "id": 2260,
                   "name": "_tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "3984:12:7",
+                  "scope": 2405,
+                  "src": "4069:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48284,10 +48425,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 2435,
+                    "id": 2259,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3984:7:7",
+                    "src": "4069:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -48298,11 +48439,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2439,
+                  "id": 2263,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "4006:20:7",
+                  "scope": 2405,
+                  "src": "4091:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48311,19 +48452,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 2437,
+                      "id": 2261,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "4006:6:7",
+                      "src": "4091:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 2438,
+                    "id": 2262,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "4006:8:7",
+                    "src": "4091:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -48333,20 +48474,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3757:275:7"
+              "src": "3842:275:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2445,
+              "id": 2269,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2444,
+                  "id": 2268,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2581,
-                  "src": "4063:4:7",
+                  "scope": 2405,
+                  "src": "4148:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -48354,10 +48495,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2443,
+                    "id": 2267,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4063:4:7",
+                    "src": "4148:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -48367,19 +48508,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4062:6:7"
+              "src": "4147:6:6"
             },
-            "scope": 5229,
-            "src": "3738:1661:7",
+            "scope": 5065,
+            "src": "3823:1661:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2640,
+              "id": 2464,
               "nodeType": "Block",
-              "src": "5461:375:7",
+              "src": "5546:375:6",
               "statements": [
                 {
                   "expression": {
@@ -48391,19 +48532,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2591,
+                        "id": 2415,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 2589,
+                          "id": 2413,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2583,
-                          "src": "5479:7:7",
+                          "referencedDeclaration": 2407,
+                          "src": "5564:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -48413,18 +48554,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2590,
+                          "id": 2414,
                           "name": "ordersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2324,
-                          "src": "5490:12:7",
+                          "referencedDeclaration": 2148,
+                          "src": "5575:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "5479:23:7",
+                        "src": "5564:23:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48438,21 +48579,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2588,
+                      "id": 2412,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5471:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5556:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2592,
+                    "id": 2416,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48460,15 +48601,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5471:32:7",
+                    "src": "5556:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2593,
+                  "id": 2417,
                   "nodeType": "ExpressionStatement",
-                  "src": "5471:32:7"
+                  "src": "5556:32:6"
                 },
                 {
                   "expression": {
@@ -48477,10 +48618,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 2601,
+                        "id": 2425,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48491,26 +48632,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2595,
+                              "id": 2419,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2338,
-                              "src": "5521:6:7",
+                              "referencedDeclaration": 2162,
+                              "src": "5606:6:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 2597,
+                            "id": 2421,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2596,
+                              "id": 2420,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2583,
-                              "src": "5528:7:7",
+                              "referencedDeclaration": 2407,
+                              "src": "5613:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -48521,23 +48662,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5521:15:7",
+                            "src": "5606:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_storage",
+                              "typeIdentifier": "t_struct$_Order_$2065_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 2598,
+                          "id": 2422,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2216,
-                          "src": "5521:27:7",
+                          "referencedDeclaration": 2040,
+                          "src": "5606:27:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -48547,18 +48688,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2599,
+                            "id": 2423,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "5552:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "5637:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2600,
+                          "id": 2424,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -48566,13 +48707,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5552:24:7",
+                          "src": "5637:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "5521:55:7",
+                        "src": "5606:55:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48586,21 +48727,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2594,
+                      "id": 2418,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5513:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5598:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2602,
+                    "id": 2426,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48608,15 +48749,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5513:64:7",
+                    "src": "5598:64:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2603,
+                  "id": 2427,
                   "nodeType": "ExpressionStatement",
-                  "src": "5513:64:7"
+                  "src": "5598:64:6"
                 },
                 {
                   "expression": {
@@ -48628,7 +48769,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 2611,
+                        "id": 2435,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48639,26 +48780,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 2605,
+                              "id": 2429,
                               "name": "orders",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2338,
-                              "src": "5595:6:7",
+                              "referencedDeclaration": 2162,
+                              "src": "5680:6:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                               }
                             },
-                            "id": 2607,
+                            "id": 2431,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 2606,
+                              "id": 2430,
                               "name": "orderID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2583,
-                              "src": "5602:7:7",
+                              "referencedDeclaration": 2407,
+                              "src": "5687:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -48669,21 +48810,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "5595:15:7",
+                            "src": "5680:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_storage",
+                              "typeIdentifier": "t_struct$_Order_$2065_storage",
                               "typeString": "struct Market.Order storage ref"
                             }
                           },
-                          "id": 2608,
+                          "id": 2432,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "5595:22:7",
+                          "referencedDeclaration": 2042,
+                          "src": "5680:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -48695,18 +48836,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2609,
+                            "id": 2433,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "5621:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "5706:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 2610,
+                          "id": 2434,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -48714,13 +48855,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5621:10:7",
+                          "src": "5706:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "5595:36:7",
+                        "src": "5680:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48734,21 +48875,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2604,
+                      "id": 2428,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5587:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5672:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2612,
+                    "id": 2436,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48756,15 +48897,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5587:45:7",
+                    "src": "5672:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2613,
+                  "id": 2437,
                   "nodeType": "ExpressionStatement",
-                  "src": "5587:45:7"
+                  "src": "5672:45:6"
                 },
                 {
                   "expression": {
@@ -48777,18 +48918,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2617,
+                              "id": 2441,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "5666:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "5751:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 2618,
+                            "id": 2442,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -48796,7 +48937,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "5666:10:7",
+                            "src": "5751:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -48808,26 +48949,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 2619,
+                                "id": 2443,
                                 "name": "orders",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2338,
-                                "src": "5678:6:7",
+                                "referencedDeclaration": 2162,
+                                "src": "5763:6:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                                 }
                               },
-                              "id": 2621,
+                              "id": 2445,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 2620,
+                                "id": 2444,
                                 "name": "orderID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2583,
-                                "src": "5685:7:7",
+                                "referencedDeclaration": 2407,
+                                "src": "5770:7:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -48838,21 +48979,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "5678:15:7",
+                              "src": "5763:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_storage",
+                                "typeIdentifier": "t_struct$_Order_$2065_storage",
                                 "typeString": "struct Market.Order storage ref"
                               }
                             },
-                            "id": 2622,
+                            "id": 2446,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "frozenSum",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2238,
-                            "src": "5678:25:7",
+                            "referencedDeclaration": 2062,
+                            "src": "5763:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -48872,32 +49013,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2615,
+                            "id": 2439,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "5651:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "5736:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 2616,
+                          "id": 2440,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10965,
-                          "src": "5651:14:7",
+                          "referencedDeclaration": 11249,
+                          "src": "5736:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 2623,
+                        "id": 2447,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -48905,7 +49046,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "5651:53:7",
+                        "src": "5736:53:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -48919,21 +49060,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2614,
+                      "id": 2438,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5643:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "5728:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2624,
+                    "id": 2448,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48941,20 +49082,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5643:62:7",
+                    "src": "5728:62:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2625,
+                  "id": 2449,
                   "nodeType": "ExpressionStatement",
-                  "src": "5643:62:7"
+                  "src": "5728:62:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 2632,
+                    "id": 2456,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -48965,26 +49106,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 2626,
+                          "id": 2450,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "5715:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "5800:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 2628,
+                        "id": 2452,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 2627,
+                          "id": 2451,
                           "name": "orderID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2583,
-                          "src": "5722:7:7",
+                          "referencedDeclaration": 2407,
+                          "src": "5807:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -48995,23 +49136,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5715:15:7",
+                        "src": "5800:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 2629,
+                      "id": 2453,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "5715:27:7",
+                      "referencedDeclaration": 2040,
+                      "src": "5800:27:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -49021,18 +49162,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 2630,
+                        "id": 2454,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "5745:11:7",
+                        "referencedDeclaration": 1996,
+                        "src": "5830:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 2631,
+                      "id": 2455,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -49040,21 +49181,21 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "5745:26:7",
+                      "src": "5830:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "5715:56:7",
+                    "src": "5800:56:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 2633,
+                  "id": 2457,
                   "nodeType": "ExpressionStatement",
-                  "src": "5715:56:7"
+                  "src": "5800:56:6"
                 },
                 {
                   "eventCall": {
@@ -49062,12 +49203,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2635,
+                        "id": 2459,
                         "name": "orderID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2583,
-                        "src": "5800:7:7",
+                        "referencedDeclaration": 2407,
+                        "src": "5885:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -49081,18 +49222,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2634,
+                      "id": 2458,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "5787:12:7",
+                      "referencedDeclaration": 2084,
+                      "src": "5872:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 2636,
+                    "id": 2460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49100,28 +49241,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5787:21:7",
+                    "src": "5872:21:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2637,
+                  "id": 2461,
                   "nodeType": "EmitStatement",
-                  "src": "5782:26:7"
+                  "src": "5867:26:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 2638,
+                    "id": 2462,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "5825:4:7",
+                    "src": "5910:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -49129,15 +49270,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 2587,
-                  "id": 2639,
+                  "functionReturnParameters": 2411,
+                  "id": 2463,
                   "nodeType": "Return",
-                  "src": "5818:11:7"
+                  "src": "5903:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2641,
+            "id": 2465,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -49145,16 +49286,16 @@
             "name": "CancelOrder",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2584,
+              "id": 2408,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2583,
+                  "id": 2407,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "5426:12:7",
+                  "scope": 2465,
+                  "src": "5511:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -49162,10 +49303,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2582,
+                    "id": 2406,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5426:4:7",
+                    "src": "5511:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -49175,20 +49316,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5425:14:7"
+              "src": "5510:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2587,
+              "id": 2411,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2586,
+                  "id": 2410,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2641,
-                  "src": "5456:4:7",
+                  "scope": 2465,
+                  "src": "5541:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -49196,10 +49337,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 2585,
+                    "id": 2409,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5456:4:7",
+                    "src": "5541:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -49209,47 +49350,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5455:6:7"
+              "src": "5540:6:6"
             },
-            "scope": 5229,
-            "src": "5405:431:7",
+            "scope": 5065,
+            "src": "5490:431:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 2757,
+              "id": 2581,
               "nodeType": "Block",
-              "src": "5914:806:7",
+              "src": "5999:806:6",
               "statements": [
                 {
                   "assignments": [
-                    2651
+                    2475
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2651,
+                      "id": 2475,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 2758,
-                      "src": "5924:16:7",
+                      "scope": 2582,
+                      "src": "6009:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2650,
+                        "id": 2474,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "5924:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6009:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -49257,31 +49398,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2655,
+                  "id": 2479,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2652,
+                      "id": 2476,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "5943:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6028:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2654,
+                    "id": 2478,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2653,
+                      "id": 2477,
                       "name": "askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2643,
-                      "src": "5950:5:7",
+                      "referencedDeclaration": 2467,
+                      "src": "6035:5:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -49292,14 +49433,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "5943:13:7",
+                    "src": "6028:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "5924:32:7"
+                  "src": "6009:32:6"
                 },
                 {
                   "expression": {
@@ -49308,10 +49449,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2661,
+                        "id": 2485,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49320,28 +49461,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2657,
+                            "id": 2481,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "5974:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6059:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2658,
+                          "id": 2482,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "5974:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "6059:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -49351,18 +49492,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2659,
+                            "id": 2483,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "5991:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "6076:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2660,
+                          "id": 2484,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -49370,13 +49511,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "5991:19:7",
+                          "src": "6076:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "5974:36:7",
+                        "src": "6059:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49390,21 +49531,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2656,
+                      "id": 2480,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "5966:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6051:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2662,
+                    "id": 2486,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49412,15 +49553,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5966:45:7",
+                    "src": "6051:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2663,
+                  "id": 2487,
                   "nodeType": "ExpressionStatement",
-                  "src": "5966:45:7"
+                  "src": "6051:45:6"
                 },
                 {
                   "expression": {
@@ -49429,10 +49570,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         },
-                        "id": 2669,
+                        "id": 2493,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49441,28 +49582,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2665,
+                            "id": 2489,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6029:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6114:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2666,
+                          "id": 2490,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderStatus",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2216,
-                          "src": "6029:15:7",
+                          "referencedDeclaration": 2040,
+                          "src": "6114:15:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
@@ -49472,18 +49613,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2667,
+                            "id": 2491,
                             "name": "OrderStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2172,
-                            "src": "6048:11:7",
+                            "referencedDeclaration": 1996,
+                            "src": "6133:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                               "typeString": "type(enum Market.OrderStatus)"
                             }
                           },
-                          "id": 2668,
+                          "id": 2492,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -49491,13 +49632,13 @@
                           "memberName": "ORDER_ACTIVE",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "6048:24:7",
+                          "src": "6133:24:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           }
                         },
-                        "src": "6029:43:7",
+                        "src": "6114:43:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49511,21 +49652,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2664,
+                      "id": 2488,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6021:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6106:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2670,
+                    "id": 2494,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49533,15 +49674,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6021:52:7",
+                    "src": "6106:52:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2671,
+                  "id": 2495,
                   "nodeType": "ExpressionStatement",
-                  "src": "6021:52:7"
+                  "src": "6106:52:6"
                 },
                 {
                   "expression": {
@@ -49553,7 +49694,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2676,
+                        "id": 2500,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49562,26 +49703,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2673,
+                            "id": 2497,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6092:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6177:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2674,
+                          "id": 2498,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "6092:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "6177:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -49591,18 +49732,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 2675,
+                          "id": 2499,
                           "name": "buyoutDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2645,
-                          "src": "6108:14:7",
+                          "referencedDeclaration": 2469,
+                          "src": "6193:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "6092:30:7",
+                        "src": "6177:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49616,21 +49757,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2672,
+                      "id": 2496,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6084:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6169:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2677,
+                    "id": 2501,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49638,15 +49779,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6084:39:7",
+                    "src": "6169:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2678,
+                  "id": 2502,
                   "nodeType": "ExpressionStatement",
-                  "src": "6084:39:7"
+                  "src": "6169:39:6"
                 },
                 {
                   "expression": {
@@ -49655,10 +49796,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2687,
+                        "id": 2511,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49670,18 +49811,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2682,
+                                "id": 2506,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "6160:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "6245:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2683,
+                              "id": 2507,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -49689,7 +49830,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6160:10:7",
+                              "src": "6245:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -49705,32 +49846,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2680,
+                              "id": 2504,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "6141:2:7",
+                              "referencedDeclaration": 2145,
+                              "src": "6226:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 2681,
+                            "id": 2505,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "6141:18:7",
+                            "referencedDeclaration": 10834,
+                            "src": "6226:18:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2684,
+                          "id": 2508,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -49738,9 +49879,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6141:30:7",
+                          "src": "6226:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -49750,32 +49891,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2685,
+                            "id": 2509,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2651,
-                            "src": "6175:3:7",
+                            "referencedDeclaration": 2475,
+                            "src": "6260:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2686,
+                          "id": 2510,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "6175:17:7",
+                          "referencedDeclaration": 2053,
+                          "src": "6260:17:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "6141:51:7",
+                        "src": "6226:51:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -49789,21 +49930,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2679,
+                      "id": 2503,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6133:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6218:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2688,
+                    "id": 2512,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -49811,15 +49952,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6133:60:7",
+                    "src": "6218:60:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2689,
+                  "id": 2513,
                   "nodeType": "ExpressionStatement",
-                  "src": "6133:60:7"
+                  "src": "6218:60:6"
                 },
                 {
                   "expression": {
@@ -49831,7 +49972,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2711,
+                        "id": 2535,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -49842,7 +49983,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2701,
+                          "id": 2525,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -49854,18 +49995,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2693,
+                                  "id": 2517,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "6220:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "6305:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 2694,
+                                "id": 2518,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -49873,7 +50014,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6220:10:7",
+                                "src": "6305:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -49886,26 +50027,26 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 2696,
+                                      "id": 2520,
                                       "name": "ask",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2651,
-                                      "src": "6242:3:7",
+                                      "referencedDeclaration": 2475,
+                                      "src": "6327:3:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 2697,
+                                    "id": 2521,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "author",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2218,
-                                    "src": "6242:10:7",
+                                    "referencedDeclaration": 2042,
+                                    "src": "6327:10:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -49919,18 +50060,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 2695,
+                                  "id": 2519,
                                   "name": "GetMaster",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4298,
-                                  "src": "6232:9:7",
+                                  "referencedDeclaration": 4134,
+                                  "src": "6317:9:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                     "typeString": "function (address) view returns (address)"
                                   }
                                 },
-                                "id": 2698,
+                                "id": 2522,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -49938,7 +50079,7 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "6232:21:7",
+                                "src": "6317:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -49958,32 +50099,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2691,
+                                "id": 2515,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "6211:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "6296:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 2692,
+                              "id": 2516,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "6211:8:7",
+                              "referencedDeclaration": 853,
+                              "src": "6296:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 2699,
+                            "id": 2523,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -49991,7 +50132,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6211:43:7",
+                            "src": "6296:43:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -50002,14 +50143,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 2700,
+                            "id": 2524,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6258:5:7",
+                            "src": "6343:5:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -50017,7 +50158,7 @@
                             },
                             "value": "false"
                           },
-                          "src": "6211:52:7",
+                          "src": "6296:52:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -50031,7 +50172,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 2710,
+                          "id": 2534,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -50043,26 +50184,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2704,
+                                  "id": 2528,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2651,
-                                  "src": "6276:3:7",
+                                  "referencedDeclaration": 2475,
+                                  "src": "6361:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 2705,
+                                "id": 2529,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "author",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "6276:10:7",
+                                "referencedDeclaration": 2042,
+                                "src": "6361:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -50072,18 +50213,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2706,
+                                  "id": 2530,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "6288:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "6373:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 2707,
+                                "id": 2531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -50091,7 +50232,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "6288:10:7",
+                                "src": "6373:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -50111,32 +50252,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2702,
+                                "id": 2526,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "6267:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "6352:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 2703,
+                              "id": 2527,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Check",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "6267:8:7",
+                              "referencedDeclaration": 853,
+                              "src": "6352:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) view external returns (bool)"
                               }
                             },
-                            "id": 2708,
+                            "id": 2532,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -50144,7 +50285,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6267:32:7",
+                            "src": "6352:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -50155,14 +50296,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "66616c7365",
-                            "id": 2709,
+                            "id": 2533,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6303:5:7",
+                            "src": "6388:5:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -50170,13 +50311,13 @@
                             },
                             "value": "false"
                           },
-                          "src": "6267:41:7",
+                          "src": "6352:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6211:97:7",
+                        "src": "6296:97:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -50190,21 +50331,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2690,
+                      "id": 2514,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6203:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6288:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2712,
+                    "id": 2536,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50212,15 +50353,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6203:106:7",
+                    "src": "6288:106:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2713,
+                  "id": 2537,
                   "nodeType": "ExpressionStatement",
-                  "src": "6203:106:7"
+                  "src": "6288:106:6"
                 },
                 {
                   "expression": {
@@ -50232,7 +50373,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2723,
+                        "id": 2547,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50244,26 +50385,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2717,
+                                "id": 2541,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2651,
-                                "src": "6336:3:7",
+                                "referencedDeclaration": 2475,
+                                "src": "6421:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2718,
+                              "id": 2542,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blacklist",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2231,
-                              "src": "6336:13:7",
+                              "referencedDeclaration": 2055,
+                              "src": "6421:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -50273,18 +50414,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2719,
+                                "id": 2543,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "6351:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "6436:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 2720,
+                              "id": 2544,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -50292,7 +50433,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6351:10:7",
+                              "src": "6436:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -50312,32 +50453,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2715,
+                              "id": 2539,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2317,
-                              "src": "6327:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "6412:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2716,
+                            "id": 2540,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Check",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 1029,
-                            "src": "6327:8:7",
+                            "referencedDeclaration": 853,
+                            "src": "6412:8:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "id": 2721,
+                          "id": 2545,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -50345,7 +50486,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6327:35:7",
+                          "src": "6412:35:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -50356,14 +50497,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 2722,
+                          "id": 2546,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "6366:5:7",
+                          "src": "6451:5:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -50371,7 +50512,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "6327:44:7",
+                        "src": "6412:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -50385,21 +50526,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2714,
+                      "id": 2538,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6319:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6404:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2724,
+                    "id": 2548,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50407,15 +50548,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6319:53:7",
+                    "src": "6404:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2725,
+                  "id": 2549,
                   "nodeType": "ExpressionStatement",
-                  "src": "6319:53:7"
+                  "src": "6404:53:6"
                 },
                 {
                   "expression": {
@@ -50425,18 +50566,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2727,
+                          "id": 2551,
                           "name": "OrderType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2168,
-                          "src": "6407:9:7",
+                          "referencedDeclaration": 1992,
+                          "src": "6492:9:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                            "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                             "typeString": "type(enum Market.OrderType)"
                           }
                         },
-                        "id": 2728,
+                        "id": 2552,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50444,9 +50585,9 @@
                         "memberName": "ORDER_BID",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6407:19:7",
+                        "src": "6492:19:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -50457,26 +50598,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2730,
+                              "id": 2554,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2651,
-                              "src": "6450:3:7",
+                              "referencedDeclaration": 2475,
+                              "src": "6535:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2731,
+                            "id": 2555,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "author",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2218,
-                            "src": "6450:10:7",
+                            "referencedDeclaration": 2042,
+                            "src": "6535:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -50490,18 +50631,18 @@
                               "typeString": "address"
                             }
                           ],
-                          "id": 2729,
+                          "id": 2553,
                           "name": "GetMaster",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4298,
-                          "src": "6440:9:7",
+                          "referencedDeclaration": 4134,
+                          "src": "6525:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                             "typeString": "function (address) view returns (address)"
                           }
                         },
-                        "id": 2732,
+                        "id": 2556,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50509,7 +50650,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6440:21:7",
+                        "src": "6525:21:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -50517,12 +50658,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 2733,
+                        "id": 2557,
                         "name": "buyoutDuration",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2645,
-                        "src": "6475:14:7",
+                        "referencedDeclaration": 2469,
+                        "src": "6560:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50532,26 +50673,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2734,
+                          "id": 2558,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6503:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6588:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2735,
+                        "id": 2559,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2224,
-                        "src": "6503:9:7",
+                        "referencedDeclaration": 2048,
+                        "src": "6588:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50561,26 +50702,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2736,
+                          "id": 2560,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6526:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6611:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2737,
+                        "id": 2561,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "6526:12:7",
+                        "referencedDeclaration": 2051,
+                        "src": "6611:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -50592,32 +50733,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2738,
+                            "id": 2562,
                             "name": "ProfileRegistry",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10035,
-                            "src": "6552:15:7",
+                            "referencedDeclaration": 10881,
+                            "src": "6637:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                              "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                               "typeString": "type(contract ProfileRegistry)"
                             }
                           },
-                          "id": 2739,
+                          "id": 2563,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "IdentityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9497,
-                          "src": "6552:29:7",
+                          "referencedDeclaration": 10343,
+                          "src": "6637:29:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                            "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                             "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                           }
                         },
-                        "id": 2740,
+                        "id": 2564,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50625,9 +50766,9 @@
                         "memberName": "ANONYMOUS",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6552:39:7",
+                        "src": "6637:39:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -50637,14 +50778,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2742,
+                            "id": 2566,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6613:1:7",
+                            "src": "6698:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -50660,20 +50801,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 2741,
+                          "id": 2565,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6605:7:7",
+                          "src": "6690:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_address_$",
                             "typeString": "type(address)"
                           },
                           "typeName": "address"
                         },
-                        "id": 2743,
+                        "id": 2567,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50681,7 +50822,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6605:10:7",
+                        "src": "6690:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -50693,14 +50834,14 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 2745,
+                            "id": 2569,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6637:1:7",
+                            "src": "6722:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -50716,20 +50857,20 @@
                               "typeString": "int_const 0"
                             }
                           ],
-                          "id": 2744,
+                          "id": 2568,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "lValueRequested": false,
                           "nodeType": "ElementaryTypeNameExpression",
-                          "src": "6629:7:7",
+                          "src": "6714:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_type$_t_bytes32_$",
                             "typeString": "type(bytes32)"
                           },
                           "typeName": "bytes32"
                         },
-                        "id": 2746,
+                        "id": 2570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -50737,7 +50878,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6629:10:7",
+                        "src": "6714:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -50747,26 +50888,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2747,
+                          "id": 2571,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2651,
-                          "src": "6653:3:7",
+                          "referencedDeclaration": 2475,
+                          "src": "6738:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2748,
+                        "id": 2572,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "6653:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "6738:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -50776,7 +50917,7 @@
                     "expression": {
                       "argumentTypes": [
                         {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
                         {
@@ -50796,7 +50937,7 @@
                           "typeString": "bool[] memory"
                         },
                         {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
                         {
@@ -50812,18 +50953,18 @@
                           "typeString": "uint64[] memory"
                         }
                       ],
-                      "id": 2726,
+                      "id": 2550,
                       "name": "PlaceOrder",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2581,
-                      "src": "6383:10:7",
+                      "referencedDeclaration": 2405,
+                      "src": "6468:10:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$2168_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_enum$_OrderType_$1992_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_ptr_$_t_enum$_IdentityLevel_$10343_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_uint256_$",
                         "typeString": "function (enum Market.OrderType,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory) returns (uint256)"
                       }
                     },
-                    "id": 2749,
+                    "id": 2573,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50831,15 +50972,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6383:285:7",
+                    "src": "6468:285:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 2750,
+                  "id": 2574,
                   "nodeType": "ExpressionStatement",
-                  "src": "6383:285:7"
+                  "src": "6468:285:6"
                 },
                 {
                   "expression": {
@@ -50847,12 +50988,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 2752,
+                        "id": 2576,
                         "name": "askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2643,
-                        "src": "6688:5:7",
+                        "referencedDeclaration": 2467,
+                        "src": "6773:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50863,18 +51004,18 @@
                         "arguments": [],
                         "expression": {
                           "argumentTypes": [],
-                          "id": 2753,
+                          "id": 2577,
                           "name": "GetOrdersAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4352,
-                          "src": "6695:15:7",
+                          "referencedDeclaration": 4188,
+                          "src": "6780:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$__$returns$_t_uint256_$",
                             "typeString": "function () view returns (uint256)"
                           }
                         },
-                        "id": 2754,
+                        "id": 2578,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -50882,7 +51023,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "6695:17:7",
+                        "src": "6780:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -50900,18 +51041,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 2751,
+                      "id": 2575,
                       "name": "OpenDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3185,
-                      "src": "6679:8:7",
+                      "referencedDeclaration": 3021,
+                      "src": "6764:8:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 2755,
+                    "id": 2579,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -50919,57 +51060,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6679:34:7",
+                    "src": "6764:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2756,
+                  "id": 2580,
                   "nodeType": "ExpressionStatement",
-                  "src": "6679:34:7"
+                  "src": "6764:34:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 2758,
+            "id": 2582,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2648,
+                "id": 2472,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2647,
+                  "id": 2471,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "5900:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "5985:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5900:13:7"
+                "src": "5985:13:6"
               }
             ],
             "name": "QuickBuy",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2646,
+              "id": 2470,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2643,
+                  "id": 2467,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2758,
-                  "src": "5860:10:7",
+                  "scope": 2582,
+                  "src": "5945:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -50977,10 +51118,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2642,
+                    "id": 2466,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5860:4:7",
+                    "src": "5945:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -50991,11 +51132,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2645,
+                  "id": 2469,
                   "name": "buyoutDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 2758,
-                  "src": "5872:19:7",
+                  "scope": 2582,
+                  "src": "5957:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -51003,10 +51144,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2644,
+                    "id": 2468,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5872:4:7",
+                    "src": "5957:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -51016,54 +51157,54 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5859:33:7"
+              "src": "5944:33:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2649,
+              "id": 2473,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5914:0:7"
+              "src": "5999:0:6"
             },
-            "scope": 5229,
-            "src": "5842:878:7",
+            "scope": 5065,
+            "src": "5927:878:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3184,
+              "id": 3020,
               "nodeType": "Block",
-              "src": "6814:2981:7",
+              "src": "6899:3175:6",
               "statements": [
                 {
                   "assignments": [
-                    2768
+                    2592
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2768,
+                      "id": 2592,
                       "name": "ask",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "6824:16:7",
+                      "scope": 3021,
+                      "src": "6909:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2767,
+                        "id": 2591,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "6824:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6909:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -51071,31 +51212,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2772,
+                  "id": 2596,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2769,
+                      "id": 2593,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "6843:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6928:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2771,
+                    "id": 2595,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2770,
+                      "id": 2594,
                       "name": "_askID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2760,
-                      "src": "6850:6:7",
+                      "referencedDeclaration": 2584,
+                      "src": "6935:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -51106,42 +51247,42 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6843:14:7",
+                    "src": "6928:14:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6824:33:7"
+                  "src": "6909:33:6"
                 },
                 {
                   "assignments": [
-                    2774
+                    2598
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 2774,
+                      "id": 2598,
                       "name": "bid",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "6867:16:7",
+                      "scope": 3021,
+                      "src": "6952:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 2773,
+                        "id": 2597,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "6867:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "6952:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -51149,31 +51290,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 2778,
+                  "id": 2602,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 2775,
+                      "id": 2599,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "6886:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "6971:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 2777,
+                    "id": 2601,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 2776,
+                      "id": 2600,
                       "name": "_bidID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2762,
-                      "src": "6893:6:7",
+                      "referencedDeclaration": 2586,
+                      "src": "6978:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -51184,14 +51325,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "6886:14:7",
+                    "src": "6971:14:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "6867:33:7"
+                  "src": "6952:33:6"
                 },
                 {
                   "expression": {
@@ -51203,7 +51344,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2790,
+                        "id": 2614,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -51211,10 +51352,10 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 2784,
+                          "id": 2608,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -51223,28 +51364,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2780,
+                              "id": 2604,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "6919:3:7",
+                              "referencedDeclaration": 2592,
+                              "src": "7004:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2781,
+                            "id": 2605,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2216,
-                            "src": "6919:15:7",
+                            "referencedDeclaration": 2040,
+                            "src": "7004:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -51254,18 +51395,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2782,
+                              "id": 2606,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2172,
-                              "src": "6938:11:7",
+                              "referencedDeclaration": 1996,
+                              "src": "7023:11:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 2783,
+                            "id": 2607,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -51273,13 +51414,13 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6938:24:7",
+                            "src": "7023:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6919:43:7",
+                          "src": "7004:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -51290,10 +51431,10 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                            "typeIdentifier": "t_enum$_OrderStatus_$1996",
                             "typeString": "enum Market.OrderStatus"
                           },
-                          "id": 2789,
+                          "id": 2613,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -51302,28 +51443,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2785,
+                              "id": 2609,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "6966:3:7",
+                              "referencedDeclaration": 2598,
+                              "src": "7051:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2786,
+                            "id": 2610,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "orderStatus",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2216,
-                            "src": "6966:15:7",
+                            "referencedDeclaration": 2040,
+                            "src": "7051:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
@@ -51333,18 +51474,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2787,
+                              "id": 2611,
                               "name": "OrderStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2172,
-                              "src": "6985:11:7",
+                              "referencedDeclaration": 1996,
+                              "src": "7070:11:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                                 "typeString": "type(enum Market.OrderStatus)"
                               }
                             },
-                            "id": 2788,
+                            "id": 2612,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -51352,19 +51493,19 @@
                             "memberName": "ORDER_ACTIVE",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "6985:24:7",
+                            "src": "7070:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                              "typeIdentifier": "t_enum$_OrderStatus_$1996",
                               "typeString": "enum Market.OrderStatus"
                             }
                           },
-                          "src": "6966:43:7",
+                          "src": "7051:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "6919:90:7",
+                        "src": "7004:90:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51378,21 +51519,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2779,
+                      "id": 2603,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "6911:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "6996:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2791,
+                    "id": 2615,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -51400,15 +51541,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6911:99:7",
+                    "src": "6996:99:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2792,
+                  "id": 2616,
                   "nodeType": "ExpressionStatement",
-                  "src": "6911:99:7"
+                  "src": "6996:99:6"
                 },
                 {
                   "expression": {
@@ -51420,444 +51561,435 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2820,
+                        "id": 2629,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "components": [
-                            {
-                              "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 2805,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2797,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2794,
-                                    "name": "ask",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "7029:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2795,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7029:16:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "307830",
-                                  "id": 2796,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "number",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7049:3:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_rational_0_by_1",
-                                    "typeString": "int_const 0"
-                                  },
-                                  "value": "0x0"
-                                },
-                                "src": "7029:23:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "||",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2804,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2798,
-                                    "name": "ask",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "7056:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2799,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7056:16:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2801,
-                                        "name": "bid",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2774,
-                                        "src": "7086:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2802,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7086:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2800,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7076:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2803,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7076:21:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "src": "7056:41:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                }
-                              },
-                              "src": "7029:68:7",
-                              "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              }
-                            }
-                          ],
-                          "id": 2806,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2621,
                           "isConstant": false,
-                          "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
-                          "nodeType": "TupleExpression",
-                          "src": "7028:70:7",
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2618,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "7113:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2619,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7113:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "307830",
+                            "id": 2620,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "7133:3:6",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0x0"
+                          },
+                          "src": "7113:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": "&&",
+                        "operator": "||",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "components": [
-                            {
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2628,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
                               "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
-                              },
-                              "id": 2818,
-                              "isConstant": false,
-                              "isLValue": false,
-                              "isPure": false,
-                              "lValueRequested": false,
-                              "leftExpression": {
+                              "id": 2622,
+                              "name": "ask",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2592,
+                              "src": "7140:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2623,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7140:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
                                 "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                "id": 2810,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
+                                "expression": {
                                   "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2807,
-                                    "name": "bid",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7103:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2808,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7103:16:7",
+                                  "id": 2625,
+                                  "name": "bid",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2598,
+                                  "src": "7170:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "307830",
-                                  "id": 2809,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "number",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7123:3:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_rational_0_by_1",
-                                    "typeString": "int_const 0"
-                                  },
-                                  "value": "0x0"
-                                },
-                                "src": "7103:23:7",
+                                "id": 2626,
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "author",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2042,
+                                "src": "7170:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
                                 }
-                              },
-                              "nodeType": "BinaryOperation",
-                              "operator": "||",
-                              "rightExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
-                                },
-                                "id": 2817,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "expression": {
-                                    "argumentTypes": null,
-                                    "id": 2811,
-                                    "name": "bid",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7130:3:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                      "typeString": "struct Market.Order memory"
-                                    }
-                                  },
-                                  "id": 2812,
-                                  "isConstant": false,
-                                  "isLValue": true,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "memberName": "counterparty",
-                                  "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2220,
-                                  "src": "7130:16:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
+                                }
+                              ],
+                              "id": 2624,
+                              "name": "GetMaster",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4134,
+                              "src": "7160:9:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                "typeString": "function (address) view returns (address)"
+                              }
+                            },
+                            "id": 2627,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "7160:21:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "src": "7140:41:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "src": "7113:68:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2617,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7105:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2630,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7105:77:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2631,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7105:77:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2644,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2636,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2633,
+                              "name": "bid",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2598,
+                              "src": "7200:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2634,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7200:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "hexValue": "307830",
+                            "id": 2635,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": true,
+                            "kind": "number",
+                            "lValueRequested": false,
+                            "nodeType": "Literal",
+                            "src": "7220:3:6",
+                            "subdenomination": null,
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_rational_0_by_1",
+                              "typeString": "int_const 0"
+                            },
+                            "value": "0x0"
+                          },
+                          "src": "7200:23:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "||",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "commonType": {
+                            "typeIdentifier": "t_address",
+                            "typeString": "address"
+                          },
+                          "id": 2643,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "lValueRequested": false,
+                          "leftExpression": {
+                            "argumentTypes": null,
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2637,
+                              "name": "bid",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2598,
+                              "src": "7227:3:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                "typeString": "struct Market.Order memory"
+                              }
+                            },
+                            "id": 2638,
+                            "isConstant": false,
+                            "isLValue": true,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "counterparty",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 2044,
+                            "src": "7227:16:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
+                            }
+                          },
+                          "nodeType": "BinaryOperation",
+                          "operator": "==",
+                          "rightExpression": {
+                            "argumentTypes": null,
+                            "arguments": [
+                              {
+                                "argumentTypes": null,
+                                "expression": {
                                   "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2814,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7160:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2815,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7160:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2813,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7150:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2816,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7150:21:7",
+                                  "id": 2640,
+                                  "name": "ask",
+                                  "nodeType": "Identifier",
+                                  "overloadedDeclarations": [],
+                                  "referencedDeclaration": 2592,
+                                  "src": "7257:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                    "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "src": "7130:41:7",
+                                "id": 2641,
+                                "isConstant": false,
+                                "isLValue": true,
+                                "isPure": false,
+                                "lValueRequested": false,
+                                "memberName": "author",
+                                "nodeType": "MemberAccess",
+                                "referencedDeclaration": 2042,
+                                "src": "7257:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
                                 }
-                              },
-                              "src": "7103:68:7",
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": [
+                                {
+                                  "typeIdentifier": "t_address",
+                                  "typeString": "address"
+                                }
+                              ],
+                              "id": 2639,
+                              "name": "GetMaster",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 4134,
+                              "src": "7247:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                "typeString": "function (address) view returns (address)"
                               }
+                            },
+                            "id": 2642,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "kind": "functionCall",
+                            "lValueRequested": false,
+                            "names": [],
+                            "nodeType": "FunctionCall",
+                            "src": "7247:21:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_address",
+                              "typeString": "address"
                             }
-                          ],
-                          "id": 2819,
-                          "isConstant": false,
-                          "isInlineArray": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "nodeType": "TupleExpression",
-                          "src": "7102:70:7",
+                          },
+                          "src": "7227:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7028:144:7",
+                        "src": "7200:68:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51871,21 +52003,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2793,
+                      "id": 2632,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7020:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7192:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2821,
+                    "id": 2645,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -51893,15 +52025,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7020:153:7",
+                    "src": "7192:77:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2822,
+                  "id": 2646,
                   "nodeType": "ExpressionStatement",
-                  "src": "7020:153:7"
+                  "src": "7192:77:6"
                 },
                 {
                   "expression": {
@@ -51910,10 +52042,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2828,
+                        "id": 2652,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -51922,28 +52054,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2824,
+                            "id": 2648,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7191:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "7287:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2825,
+                          "id": 2649,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "7191:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "7287:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -51953,18 +52085,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2826,
+                            "id": 2650,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "7208:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "7304:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2827,
+                          "id": 2651,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -51972,13 +52104,13 @@
                           "memberName": "ORDER_ASK",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7208:19:7",
+                          "src": "7304:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7191:36:7",
+                        "src": "7287:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -51992,21 +52124,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2823,
+                      "id": 2647,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7183:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7279:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2829,
+                    "id": 2653,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -52014,15 +52146,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7183:45:7",
+                    "src": "7279:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2830,
+                  "id": 2654,
                   "nodeType": "ExpressionStatement",
-                  "src": "7183:45:7"
+                  "src": "7279:45:6"
                 },
                 {
                   "expression": {
@@ -52031,10 +52163,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         },
-                        "id": 2836,
+                        "id": 2660,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -52043,28 +52175,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2832,
+                            "id": 2656,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7246:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "7342:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2833,
+                          "id": 2657,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "orderType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2214,
-                          "src": "7246:13:7",
+                          "referencedDeclaration": 2038,
+                          "src": "7342:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
@@ -52074,18 +52206,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2834,
+                            "id": 2658,
                             "name": "OrderType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2168,
-                            "src": "7263:9:7",
+                            "referencedDeclaration": 1992,
+                            "src": "7359:9:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                              "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                               "typeString": "type(enum Market.OrderType)"
                             }
                           },
-                          "id": 2835,
+                          "id": 2659,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -52093,13 +52225,13 @@
                           "memberName": "ORDER_BID",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "7263:19:7",
+                          "src": "7359:19:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "src": "7246:36:7",
+                        "src": "7342:36:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -52113,21 +52245,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2831,
+                      "id": 2655,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7238:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7334:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2837,
+                    "id": 2661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -52135,15 +52267,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7238:45:7",
+                    "src": "7334:45:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2838,
+                  "id": 2662,
                   "nodeType": "ExpressionStatement",
-                  "src": "7238:45:7"
+                  "src": "7334:45:6"
                 },
                 {
                   "expression": {
@@ -52155,1030 +52287,1088 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 2914,
+                        "id": 2674,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "commonType": {
-                            "typeIdentifier": "t_bool",
-                            "typeString": "bool"
-                          },
-                          "id": 2904,
-                          "isConstant": false,
-                          "isLValue": false,
-                          "isPure": false,
-                          "lValueRequested": false,
-                          "leftExpression": {
-                            "argumentTypes": null,
-                            "commonType": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            },
-                            "id": 2892,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": false,
-                            "lValueRequested": false,
-                            "leftExpression": {
+                          "arguments": [
+                            {
                               "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2666,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7406:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
                               },
-                              "id": 2882,
+                              "id": 2667,
                               "isConstant": false,
-                              "isLValue": false,
+                              "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "id": 2872,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7406:13:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
                                   "argumentTypes": null,
-                                  "commonType": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "id": 2860,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "lValueRequested": false,
-                                  "leftExpression": {
+                                  "expression": {
                                     "argumentTypes": null,
-                                    "commonType": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "id": 2850,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "leftExpression": {
-                                      "argumentTypes": null,
-                                      "arguments": [
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2842,
-                                            "name": "bid",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2774,
-                                            "src": "7323:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2843,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "blacklist",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2231,
-                                          "src": "7323:13:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        },
-                                        {
-                                          "argumentTypes": null,
-                                          "arguments": [
-                                            {
-                                              "argumentTypes": null,
-                                              "expression": {
-                                                "argumentTypes": null,
-                                                "id": 2845,
-                                                "name": "ask",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 2768,
-                                                "src": "7348:3:7",
-                                                "typeDescriptions": {
-                                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                                  "typeString": "struct Market.Order memory"
-                                                }
-                                              },
-                                              "id": 2846,
-                                              "isConstant": false,
-                                              "isLValue": true,
-                                              "isPure": false,
-                                              "lValueRequested": false,
-                                              "memberName": "author",
-                                              "nodeType": "MemberAccess",
-                                              "referencedDeclaration": 2218,
-                                              "src": "7348:10:7",
-                                              "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                              }
-                                            }
-                                          ],
-                                          "expression": {
-                                            "argumentTypes": [
-                                              {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                              }
-                                            ],
-                                            "id": 2844,
-                                            "name": "GetMaster",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4298,
-                                            "src": "7338:9:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                              "typeString": "function (address) view returns (address)"
-                                            }
-                                          },
-                                          "id": 2847,
-                                          "isConstant": false,
-                                          "isLValue": false,
-                                          "isPure": false,
-                                          "kind": "functionCall",
-                                          "lValueRequested": false,
-                                          "names": [],
-                                          "nodeType": "FunctionCall",
-                                          "src": "7338:21:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": [
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          },
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2840,
-                                          "name": "bl",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2317,
-                                          "src": "7314:2:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                            "typeString": "contract Blacklist"
-                                          }
-                                        },
-                                        "id": 2841,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "Check",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 1029,
-                                        "src": "7314:8:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                          "typeString": "function (address,address) view external returns (bool)"
-                                        }
-                                      },
-                                      "id": 2848,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "kind": "functionCall",
-                                      "lValueRequested": false,
-                                      "names": [],
-                                      "nodeType": "FunctionCall",
-                                      "src": "7314:46:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      }
-                                    },
-                                    "nodeType": "BinaryOperation",
-                                    "operator": "==",
-                                    "rightExpression": {
-                                      "argumentTypes": null,
-                                      "hexValue": "66616c7365",
-                                      "id": 2849,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": true,
-                                      "kind": "bool",
-                                      "lValueRequested": false,
-                                      "nodeType": "Literal",
-                                      "src": "7364:5:7",
-                                      "subdenomination": null,
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      },
-                                      "value": "false"
-                                    },
-                                    "src": "7314:55:7",
+                                    "id": 2669,
+                                    "name": "ask",
+                                    "nodeType": "Identifier",
+                                    "overloadedDeclarations": [],
+                                    "referencedDeclaration": 2592,
+                                    "src": "7431:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "nodeType": "BinaryOperation",
-                                  "operator": "&&",
-                                  "rightExpression": {
-                                    "argumentTypes": null,
-                                    "commonType": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "id": 2859,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "leftExpression": {
-                                      "argumentTypes": null,
-                                      "arguments": [
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2853,
-                                            "name": "bid",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2774,
-                                            "src": "7394:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2854,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "blacklist",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2231,
-                                          "src": "7394:13:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        },
-                                        {
-                                          "argumentTypes": null,
-                                          "expression": {
-                                            "argumentTypes": null,
-                                            "id": 2855,
-                                            "name": "ask",
-                                            "nodeType": "Identifier",
-                                            "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2768,
-                                            "src": "7409:3:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                              "typeString": "struct Market.Order memory"
-                                            }
-                                          },
-                                          "id": 2856,
-                                          "isConstant": false,
-                                          "isLValue": true,
-                                          "isPure": false,
-                                          "lValueRequested": false,
-                                          "memberName": "author",
-                                          "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2218,
-                                          "src": "7409:10:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": [
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          },
-                                          {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2851,
-                                          "name": "bl",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2317,
-                                          "src": "7385:2:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                            "typeString": "contract Blacklist"
-                                          }
-                                        },
-                                        "id": 2852,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "Check",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 1029,
-                                        "src": "7385:8:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                          "typeString": "function (address,address) view external returns (bool)"
-                                        }
-                                      },
-                                      "id": 2857,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "kind": "functionCall",
-                                      "lValueRequested": false,
-                                      "names": [],
-                                      "nodeType": "FunctionCall",
-                                      "src": "7385:35:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      }
-                                    },
-                                    "nodeType": "BinaryOperation",
-                                    "operator": "==",
-                                    "rightExpression": {
-                                      "argumentTypes": null,
-                                      "hexValue": "66616c7365",
-                                      "id": 2858,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": true,
-                                      "kind": "bool",
-                                      "lValueRequested": false,
-                                      "nodeType": "Literal",
-                                      "src": "7424:5:7",
-                                      "subdenomination": null,
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_bool",
-                                        "typeString": "bool"
-                                      },
-                                      "value": "false"
-                                    },
-                                    "src": "7385:44:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    }
-                                  },
-                                  "src": "7314:115:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "&&",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "commonType": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "id": 2871,
+                                  "id": 2670,
                                   "isConstant": false,
-                                  "isLValue": false,
+                                  "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
-                                  "leftExpression": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                      {
-                                        "argumentTypes": null,
-                                        "expression": {
-                                          "argumentTypes": null,
-                                          "id": 2863,
-                                          "name": "bid",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2774,
-                                          "src": "7454:3:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                            "typeString": "struct Market.Order memory"
-                                          }
-                                        },
-                                        "id": 2864,
-                                        "isConstant": false,
-                                        "isLValue": true,
-                                        "isPure": false,
-                                        "lValueRequested": false,
-                                        "memberName": "author",
-                                        "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2218,
-                                        "src": "7454:10:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      },
-                                      {
-                                        "argumentTypes": null,
-                                        "arguments": [
-                                          {
-                                            "argumentTypes": null,
-                                            "expression": {
-                                              "argumentTypes": null,
-                                              "id": 2866,
-                                              "name": "ask",
-                                              "nodeType": "Identifier",
-                                              "overloadedDeclarations": [],
-                                              "referencedDeclaration": 2768,
-                                              "src": "7476:3:7",
-                                              "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                                "typeString": "struct Market.Order memory"
-                                              }
-                                            },
-                                            "id": 2867,
-                                            "isConstant": false,
-                                            "isLValue": true,
-                                            "isPure": false,
-                                            "lValueRequested": false,
-                                            "memberName": "author",
-                                            "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 2218,
-                                            "src": "7476:10:7",
-                                            "typeDescriptions": {
-                                              "typeIdentifier": "t_address",
-                                              "typeString": "address"
-                                            }
-                                          }
-                                        ],
-                                        "expression": {
-                                          "argumentTypes": [
-                                            {
-                                              "typeIdentifier": "t_address",
-                                              "typeString": "address"
-                                            }
-                                          ],
-                                          "id": 2865,
-                                          "name": "GetMaster",
-                                          "nodeType": "Identifier",
-                                          "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4298,
-                                          "src": "7466:9:7",
-                                          "typeDescriptions": {
-                                            "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                            "typeString": "function (address) view returns (address)"
-                                          }
-                                        },
-                                        "id": 2868,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": false,
-                                        "kind": "functionCall",
-                                        "lValueRequested": false,
-                                        "names": [],
-                                        "nodeType": "FunctionCall",
-                                        "src": "7466:21:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      }
-                                    ],
-                                    "expression": {
-                                      "argumentTypes": [
-                                        {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        },
-                                        {
-                                          "typeIdentifier": "t_address",
-                                          "typeString": "address"
-                                        }
-                                      ],
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2861,
-                                        "name": "bl",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2317,
-                                        "src": "7445:2:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                          "typeString": "contract Blacklist"
-                                        }
-                                      },
-                                      "id": 2862,
-                                      "isConstant": false,
-                                      "isLValue": false,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "Check",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 1029,
-                                      "src": "7445:8:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                        "typeString": "function (address,address) view external returns (bool)"
-                                      }
-                                    },
-                                    "id": 2869,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "kind": "functionCall",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "7445:43:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    }
-                                  },
-                                  "nodeType": "BinaryOperation",
-                                  "operator": "==",
-                                  "rightExpression": {
-                                    "argumentTypes": null,
-                                    "hexValue": "66616c7365",
-                                    "id": 2870,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "bool",
-                                    "lValueRequested": false,
-                                    "nodeType": "Literal",
-                                    "src": "7492:5:7",
-                                    "subdenomination": null,
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_bool",
-                                      "typeString": "bool"
-                                    },
-                                    "value": "false"
-                                  },
-                                  "src": "7445:52:7",
+                                  "memberName": "author",
+                                  "nodeType": "MemberAccess",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7431:10:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
                                   }
-                                },
-                                "src": "7314:183:7",
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 2668,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7421:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
                                 }
                               },
-                              "nodeType": "BinaryOperation",
-                              "operator": "&&",
-                              "rightExpression": {
+                              "id": 2671,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "7421:21:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2664,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7397:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
+                            },
+                            "id": 2665,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7397:8:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
+                            }
+                          },
+                          "id": 2672,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7397:46:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2673,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7447:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7397:55:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2663,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7389:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2675,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7389:64:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2676,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7389:64:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2686,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
                                 "argumentTypes": null,
-                                "commonType": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "id": 2881,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "leftExpression": {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2875,
-                                        "name": "bid",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2774,
-                                        "src": "7522:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2876,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7522:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    },
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2877,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7534:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2878,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7534:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      },
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2873,
-                                      "name": "bl",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2317,
-                                      "src": "7513:2:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                        "typeString": "contract Blacklist"
-                                      }
-                                    },
-                                    "id": 2874,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "Check",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 1029,
-                                    "src": "7513:8:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                      "typeString": "function (address,address) view external returns (bool)"
-                                    }
-                                  },
-                                  "id": 2879,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7513:32:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  }
-                                },
-                                "nodeType": "BinaryOperation",
-                                "operator": "==",
-                                "rightExpression": {
-                                  "argumentTypes": null,
-                                  "hexValue": "66616c7365",
-                                  "id": 2880,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": true,
-                                  "kind": "bool",
-                                  "lValueRequested": false,
-                                  "nodeType": "Literal",
-                                  "src": "7549:5:7",
-                                  "subdenomination": null,
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                  },
-                                  "value": "false"
-                                },
-                                "src": "7513:41:7",
+                                "id": 2680,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7480:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "src": "7314:240:7",
+                              "id": 2681,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7480:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             },
-                            "nodeType": "BinaryOperation",
-                            "operator": "&&",
-                            "rightExpression": {
+                            {
                               "argumentTypes": null,
-                              "commonType": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2682,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7495:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
                               },
-                              "id": 2891,
+                              "id": 2683,
                               "isConstant": false,
-                              "isLValue": false,
+                              "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
-                              "leftExpression": {
-                                "argumentTypes": null,
-                                "arguments": [
-                                  {
-                                    "argumentTypes": null,
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2885,
-                                      "name": "ask",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2768,
-                                      "src": "7579:3:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                        "typeString": "struct Market.Order memory"
-                                      }
-                                    },
-                                    "id": 2886,
-                                    "isConstant": false,
-                                    "isLValue": true,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "blacklist",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2231,
-                                    "src": "7579:13:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  },
-                                  {
-                                    "argumentTypes": null,
-                                    "expression": {
-                                      "argumentTypes": null,
-                                      "id": 2887,
-                                      "name": "bid",
-                                      "nodeType": "Identifier",
-                                      "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2774,
-                                      "src": "7594:3:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                        "typeString": "struct Market.Order memory"
-                                      }
-                                    },
-                                    "id": 2888,
-                                    "isConstant": false,
-                                    "isLValue": true,
-                                    "isPure": false,
-                                    "lValueRequested": false,
-                                    "memberName": "author",
-                                    "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2218,
-                                    "src": "7594:10:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  }
-                                ],
-                                "expression": {
-                                  "argumentTypes": [
-                                    {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    },
-                                    {
-                                      "typeIdentifier": "t_address",
-                                      "typeString": "address"
-                                    }
-                                  ],
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7495:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2678,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7471:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
+                            },
+                            "id": 2679,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7471:8:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
+                            }
+                          },
+                          "id": 2684,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7471:35:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2685,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7510:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7471:44:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2677,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7463:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2687,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7463:53:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2688,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7463:53:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2700,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2692,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7543:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2693,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7543:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "arguments": [
+                                {
+                                  "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2883,
-                                    "name": "bl",
+                                    "id": 2695,
+                                    "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2317,
-                                    "src": "7570:2:7",
+                                    "referencedDeclaration": 2592,
+                                    "src": "7565:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                      "typeString": "contract Blacklist"
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                      "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 2884,
+                                  "id": 2696,
                                   "isConstant": false,
-                                  "isLValue": false,
+                                  "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
-                                  "memberName": "Check",
+                                  "memberName": "author",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 1029,
-                                  "src": "7570:8:7",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7565:10:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                    "typeString": "function (address,address) view external returns (bool)"
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
                                   }
-                                },
-                                "id": 2889,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "kind": "functionCall",
-                                "lValueRequested": false,
-                                "names": [],
-                                "nodeType": "FunctionCall",
-                                "src": "7570:35:7",
+                                }
+                              ],
+                              "expression": {
+                                "argumentTypes": [
+                                  {
+                                    "typeIdentifier": "t_address",
+                                    "typeString": "address"
+                                  }
+                                ],
+                                "id": 2694,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7555:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
                                 }
                               },
-                              "nodeType": "BinaryOperation",
-                              "operator": "==",
-                              "rightExpression": {
+                              "id": 2697,
+                              "isConstant": false,
+                              "isLValue": false,
+                              "isPure": false,
+                              "kind": "functionCall",
+                              "lValueRequested": false,
+                              "names": [],
+                              "nodeType": "FunctionCall",
+                              "src": "7555:21:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2690,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7534:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
+                            },
+                            "id": 2691,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7534:8:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
+                            }
+                          },
+                          "id": 2698,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7534:43:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2699,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7581:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7534:52:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2689,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7526:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2701,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7526:61:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2702,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7526:61:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2712,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
                                 "argumentTypes": null,
-                                "hexValue": "66616c7365",
-                                "id": 2890,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": true,
-                                "kind": "bool",
-                                "lValueRequested": false,
-                                "nodeType": "Literal",
-                                "src": "7609:5:7",
-                                "subdenomination": null,
+                                "id": 2706,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7614:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_bool",
-                                  "typeString": "bool"
-                                },
-                                "value": "false"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
                               },
-                              "src": "7570:44:7",
+                              "id": 2707,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7614:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2708,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7626:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2709,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7626:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2704,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7605:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "src": "7314:300:7",
+                            "id": 2705,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7605:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "nodeType": "BinaryOperation",
-                          "operator": "&&",
-                          "rightExpression": {
-                            "argumentTypes": null,
-                            "commonType": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
+                          "id": 2710,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7605:32:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2711,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7641:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7605:41:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2703,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7597:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2713,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7597:50:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2714,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7597:50:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2724,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2718,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7674:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2719,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "blacklist",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2055,
+                              "src": "7674:13:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            },
+                            {
+                              "argumentTypes": null,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2720,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7689:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2721,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7689:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2716,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7665:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
                             },
-                            "id": 2903,
+                            "id": 2717,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
-                            "leftExpression": {
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7665:8:6",
+                            "typeDescriptions": {
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
+                            }
+                          },
+                          "id": 2722,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7665:35:6",
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          }
+                        },
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2723,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7704:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7665:44:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2715,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7657:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2725,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7657:53:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2726,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7657:53:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2738,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
                               "argumentTypes": null,
                               "arguments": [
-                                {
-                                  "argumentTypes": null,
-                                  "arguments": [
-                                    {
-                                      "argumentTypes": null,
-                                      "expression": {
-                                        "argumentTypes": null,
-                                        "id": 2896,
-                                        "name": "ask",
-                                        "nodeType": "Identifier",
-                                        "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2768,
-                                        "src": "7649:3:7",
-                                        "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                          "typeString": "struct Market.Order memory"
-                                        }
-                                      },
-                                      "id": 2897,
-                                      "isConstant": false,
-                                      "isLValue": true,
-                                      "isPure": false,
-                                      "lValueRequested": false,
-                                      "memberName": "author",
-                                      "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2218,
-                                      "src": "7649:10:7",
-                                      "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    }
-                                  ],
-                                  "expression": {
-                                    "argumentTypes": [
-                                      {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                      }
-                                    ],
-                                    "id": 2895,
-                                    "name": "GetMaster",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4298,
-                                    "src": "7639:9:7",
-                                    "typeDescriptions": {
-                                      "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
-                                      "typeString": "function (address) view returns (address)"
-                                    }
-                                  },
-                                  "id": 2898,
-                                  "isConstant": false,
-                                  "isLValue": false,
-                                  "isPure": false,
-                                  "kind": "functionCall",
-                                  "lValueRequested": false,
-                                  "names": [],
-                                  "nodeType": "FunctionCall",
-                                  "src": "7639:21:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  }
-                                },
                                 {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 2899,
-                                    "name": "bid",
+                                    "id": 2731,
+                                    "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "7662:3:7",
+                                    "referencedDeclaration": 2592,
+                                    "src": "7747:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 2900,
+                                  "id": 2732,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "author",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2218,
-                                  "src": "7662:10:7",
+                                  "referencedDeclaration": 2042,
+                                  "src": "7747:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -53187,43 +53377,23 @@
                               ],
                               "expression": {
                                 "argumentTypes": [
-                                  {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                  },
                                   {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 ],
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2893,
-                                  "name": "bl",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2317,
-                                  "src": "7630:2:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                    "typeString": "contract Blacklist"
-                                  }
-                                },
-                                "id": 2894,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "Check",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 1029,
-                                "src": "7630:8:7",
+                                "id": 2730,
+                                "name": "GetMaster",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 4134,
+                                "src": "7737:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                  "typeString": "function (address,address) view external returns (bool)"
+                                  "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
+                                  "typeString": "function (address) view returns (address)"
                                 }
                               },
-                              "id": 2901,
+                              "id": 2733,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -53231,198 +53401,310 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "7630:43:7",
+                              "src": "7737:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
                             },
-                            "nodeType": "BinaryOperation",
-                            "operator": "==",
-                            "rightExpression": {
+                            {
                               "argumentTypes": null,
-                              "hexValue": "66616c7365",
-                              "id": 2902,
+                              "expression": {
+                                "argumentTypes": null,
+                                "id": 2734,
+                                "name": "bid",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2598,
+                                "src": "7760:3:6",
+                                "typeDescriptions": {
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
+                                }
+                              },
+                              "id": 2735,
                               "isConstant": false,
-                              "isLValue": false,
-                              "isPure": true,
-                              "kind": "bool",
+                              "isLValue": true,
+                              "isPure": false,
                               "lValueRequested": false,
-                              "nodeType": "Literal",
-                              "src": "7677:5:7",
-                              "subdenomination": null,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7760:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_bool",
-                                "typeString": "bool"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               },
-                              "value": "false"
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2728,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7728:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
+                              }
                             },
-                            "src": "7630:52:7",
+                            "id": 2729,
+                            "isConstant": false,
+                            "isLValue": false,
+                            "isPure": false,
+                            "lValueRequested": false,
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7728:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "src": "7314:368:7",
+                          "id": 2736,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7728:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "nodeType": "BinaryOperation",
-                        "operator": "&&",
+                        "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "commonType": {
-                            "typeIdentifier": "t_bool",
-                            "typeString": "bool"
-                          },
-                          "id": 2913,
+                          "hexValue": "66616c7365",
+                          "id": 2737,
                           "isConstant": false,
                           "isLValue": false,
-                          "isPure": false,
+                          "isPure": true,
+                          "kind": "bool",
                           "lValueRequested": false,
-                          "leftExpression": {
-                            "argumentTypes": null,
-                            "arguments": [
-                              {
+                          "nodeType": "Literal",
+                          "src": "7775:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7728:52:6",
+                        "typeDescriptions": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      }
+                    ],
+                    "expression": {
+                      "argumentTypes": [
+                        {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        }
+                      ],
+                      "id": 2727,
+                      "name": "require",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [
+                        11602,
+                        11603
+                      ],
+                      "referencedDeclaration": 11602,
+                      "src": "7720:7:6",
+                      "typeDescriptions": {
+                        "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
+                        "typeString": "function (bool) pure"
+                      }
+                    },
+                    "id": 2739,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "7720:61:6",
+                    "typeDescriptions": {
+                      "typeIdentifier": "t_tuple$__$",
+                      "typeString": "tuple()"
+                    }
+                  },
+                  "id": 2740,
+                  "nodeType": "ExpressionStatement",
+                  "src": "7720:61:6"
+                },
+                {
+                  "expression": {
+                    "argumentTypes": null,
+                    "arguments": [
+                      {
+                        "argumentTypes": null,
+                        "commonType": {
+                          "typeIdentifier": "t_bool",
+                          "typeString": "bool"
+                        },
+                        "id": 2750,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "leftExpression": {
+                          "argumentTypes": null,
+                          "arguments": [
+                            {
+                              "argumentTypes": null,
+                              "expression": {
                                 "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2907,
-                                  "name": "ask",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "7707:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2908,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "author",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "7707:10:7",
+                                "id": 2744,
+                                "name": "ask",
+                                "nodeType": "Identifier",
+                                "overloadedDeclarations": [],
+                                "referencedDeclaration": 2592,
+                                "src": "7808:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
                                 }
                               },
-                              {
-                                "argumentTypes": null,
-                                "expression": {
-                                  "argumentTypes": null,
-                                  "id": 2909,
-                                  "name": "bid",
-                                  "nodeType": "Identifier",
-                                  "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "7719:3:7",
-                                  "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
-                                    "typeString": "struct Market.Order memory"
-                                  }
-                                },
-                                "id": 2910,
-                                "isConstant": false,
-                                "isLValue": true,
-                                "isPure": false,
-                                "lValueRequested": false,
-                                "memberName": "author",
-                                "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2218,
-                                "src": "7719:10:7",
-                                "typeDescriptions": {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                }
+                              "id": 2745,
+                              "isConstant": false,
+                              "isLValue": true,
+                              "isPure": false,
+                              "lValueRequested": false,
+                              "memberName": "author",
+                              "nodeType": "MemberAccess",
+                              "referencedDeclaration": 2042,
+                              "src": "7808:10:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
                               }
-                            ],
-                            "expression": {
-                              "argumentTypes": [
-                                {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                },
-                                {
-                                  "typeIdentifier": "t_address",
-                                  "typeString": "address"
-                                }
-                              ],
+                            },
+                            {
+                              "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2905,
-                                "name": "bl",
+                                "id": 2746,
+                                "name": "bid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "7698:2:7",
+                                "referencedDeclaration": 2598,
+                                "src": "7820:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
-                                  "typeString": "contract Blacklist"
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
+                                  "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2906,
+                              "id": 2747,
                               "isConstant": false,
-                              "isLValue": false,
+                              "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
-                              "memberName": "Check",
+                              "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1029,
-                              "src": "7698:8:7",
+                              "referencedDeclaration": 2042,
+                              "src": "7820:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
-                                "typeString": "function (address,address) view external returns (bool)"
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            }
+                          ],
+                          "expression": {
+                            "argumentTypes": [
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              },
+                              {
+                                "typeIdentifier": "t_address",
+                                "typeString": "address"
+                              }
+                            ],
+                            "expression": {
+                              "argumentTypes": null,
+                              "id": 2742,
+                              "name": "bl",
+                              "nodeType": "Identifier",
+                              "overloadedDeclarations": [],
+                              "referencedDeclaration": 2141,
+                              "src": "7799:2:6",
+                              "typeDescriptions": {
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
+                                "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 2911,
+                            "id": 2743,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
-                            "kind": "functionCall",
                             "lValueRequested": false,
-                            "names": [],
-                            "nodeType": "FunctionCall",
-                            "src": "7698:32:7",
+                            "memberName": "Check",
+                            "nodeType": "MemberAccess",
+                            "referencedDeclaration": 853,
+                            "src": "7799:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
+                              "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$returns$_t_bool_$",
+                              "typeString": "function (address,address) view external returns (bool)"
                             }
                           },
-                          "nodeType": "BinaryOperation",
-                          "operator": "==",
-                          "rightExpression": {
-                            "argumentTypes": null,
-                            "hexValue": "66616c7365",
-                            "id": 2912,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": true,
-                            "kind": "bool",
-                            "lValueRequested": false,
-                            "nodeType": "Literal",
-                            "src": "7734:5:7",
-                            "subdenomination": null,
-                            "typeDescriptions": {
-                              "typeIdentifier": "t_bool",
-                              "typeString": "bool"
-                            },
-                            "value": "false"
-                          },
-                          "src": "7698:41:7",
+                          "id": 2748,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": false,
+                          "kind": "functionCall",
+                          "lValueRequested": false,
+                          "names": [],
+                          "nodeType": "FunctionCall",
+                          "src": "7799:32:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "7314:425:7",
+                        "nodeType": "BinaryOperation",
+                        "operator": "==",
+                        "rightExpression": {
+                          "argumentTypes": null,
+                          "hexValue": "66616c7365",
+                          "id": 2749,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "bool",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "7835:5:6",
+                          "subdenomination": null,
+                          "typeDescriptions": {
+                            "typeIdentifier": "t_bool",
+                            "typeString": "bool"
+                          },
+                          "value": "false"
+                        },
+                        "src": "7799:41:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53436,21 +53718,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2839,
+                      "id": 2741,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7293:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7791:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2915,
+                    "id": 2751,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53458,15 +53740,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7293:447:7",
+                    "src": "7791:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2916,
+                  "id": 2752,
                   "nodeType": "ExpressionStatement",
-                  "src": "7293:447:7"
+                  "src": "7791:50:6"
                 },
                 {
                   "expression": {
@@ -53478,7 +53760,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2922,
+                        "id": 2758,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53487,26 +53769,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2918,
+                            "id": 2754,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7758:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "7859:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2919,
+                          "id": 2755,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "7758:9:7",
+                          "referencedDeclaration": 2048,
+                          "src": "7859:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -53518,32 +53800,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2920,
+                            "id": 2756,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7771:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "7872:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2921,
+                          "id": 2757,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "7771:9:7",
+                          "referencedDeclaration": 2048,
+                          "src": "7872:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7758:22:7",
+                        "src": "7859:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53557,21 +53839,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2917,
+                      "id": 2753,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7750:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7851:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2923,
+                    "id": 2759,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53579,15 +53861,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7750:31:7",
+                    "src": "7851:31:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2924,
+                  "id": 2760,
                   "nodeType": "ExpressionStatement",
-                  "src": "7750:31:7"
+                  "src": "7851:31:6"
                 },
                 {
                   "expression": {
@@ -53599,7 +53881,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 2930,
+                        "id": 2766,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53608,26 +53890,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2926,
+                            "id": 2762,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7799:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "7900:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2927,
+                          "id": 2763,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "7799:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "7900:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -53639,32 +53921,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2928,
+                            "id": 2764,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7815:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "7916:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2929,
+                          "id": 2765,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "7815:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "7916:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "7799:28:7",
+                        "src": "7900:28:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53678,21 +53960,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2925,
+                      "id": 2761,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7791:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7892:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2931,
+                    "id": 2767,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53700,15 +53982,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7791:37:7",
+                    "src": "7892:37:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2932,
+                  "id": 2768,
                   "nodeType": "ExpressionStatement",
-                  "src": "7791:37:7"
+                  "src": "7892:37:6"
                 },
                 {
                   "expression": {
@@ -53717,10 +53999,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2941,
+                        "id": 2777,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53732,26 +54014,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2936,
+                                "id": 2772,
                                 "name": "bid",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2774,
-                                "src": "7896:3:7",
+                                "referencedDeclaration": 2598,
+                                "src": "7997:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2937,
+                              "id": 2773,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2218,
-                              "src": "7896:10:7",
+                              "referencedDeclaration": 2042,
+                              "src": "7997:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -53767,32 +54049,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2934,
+                              "id": 2770,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "7877:2:7",
+                              "referencedDeclaration": 2145,
+                              "src": "7978:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 2935,
+                            "id": 2771,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "7877:18:7",
+                            "referencedDeclaration": 10834,
+                            "src": "7978:18:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2938,
+                          "id": 2774,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -53800,9 +54082,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7877:30:7",
+                          "src": "7978:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -53812,32 +54094,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2939,
+                            "id": 2775,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "7911:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "8012:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2940,
+                          "id": 2776,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "7911:17:7",
+                          "referencedDeclaration": 2053,
+                          "src": "8012:17:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7877:51:7",
+                        "src": "7978:51:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -53851,21 +54133,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2933,
+                      "id": 2769,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7869:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "7970:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2942,
+                    "id": 2778,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -53873,15 +54155,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7869:60:7",
+                    "src": "7970:60:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2943,
+                  "id": 2779,
                   "nodeType": "ExpressionStatement",
-                  "src": "7869:60:7"
+                  "src": "7970:60:6"
                 },
                 {
                   "expression": {
@@ -53890,10 +54172,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         },
-                        "id": 2952,
+                        "id": 2788,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -53905,26 +54187,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 2947,
+                                "id": 2783,
                                 "name": "ask",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2768,
-                                "src": "7966:3:7",
+                                "referencedDeclaration": 2592,
+                                "src": "8067:3:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                   "typeString": "struct Market.Order memory"
                                 }
                               },
-                              "id": 2948,
+                              "id": 2784,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "author",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2218,
-                              "src": "7966:10:7",
+                              "referencedDeclaration": 2042,
+                              "src": "8067:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -53940,32 +54222,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2945,
+                              "id": 2781,
                               "name": "pr",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2321,
-                              "src": "7947:2:7",
+                              "referencedDeclaration": 2145,
+                              "src": "8048:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                                "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                                 "typeString": "contract ProfileRegistry"
                               }
                             },
-                            "id": 2946,
+                            "id": 2782,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "GetProfileLevel",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9988,
-                            "src": "7947:18:7",
+                            "referencedDeclaration": 10834,
+                            "src": "8048:18:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "function (address) view external returns (enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 2949,
+                          "id": 2785,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -53973,9 +54255,9 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "7947:30:7",
+                          "src": "8048:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
@@ -53985,32 +54267,32 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 2950,
+                            "id": 2786,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "7981:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "8082:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 2951,
+                          "id": 2787,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "identityLevel",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2229,
-                          "src": "7981:17:7",
+                          "referencedDeclaration": 2053,
+                          "src": "8082:17:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "src": "7947:51:7",
+                        "src": "8048:51:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -54024,21 +54306,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 2944,
+                      "id": 2780,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "7939:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "8040:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 2953,
+                    "id": 2789,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54046,15 +54328,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "7939:60:7",
+                    "src": "8040:60:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 2954,
+                  "id": 2790,
                   "nodeType": "ExpressionStatement",
-                  "src": "7939:60:7"
+                  "src": "8040:60:6"
                 },
                 {
                   "condition": {
@@ -54063,7 +54345,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 2959,
+                    "id": 2795,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54074,32 +54356,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2955,
+                          "id": 2791,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8014:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8115:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2956,
+                        "id": 2792,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8014:12:7",
+                        "referencedDeclaration": 2051,
+                        "src": "8115:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 2957,
+                      "id": 2793,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54107,7 +54389,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8014:19:7",
+                      "src": "8115:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54117,36 +54399,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 2958,
+                      "id": 2794,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "8036:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "8137:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8014:38:7",
+                    "src": "8115:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2970,
+                  "id": 2806,
                   "nodeType": "IfStatement",
-                  "src": "8010:112:7",
+                  "src": "8111:112:6",
                   "trueBody": {
-                    "id": 2969,
+                    "id": 2805,
                     "nodeType": "Block",
-                    "src": "8054:68:7",
+                    "src": "8155:68:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2967,
+                          "id": 2803,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54155,26 +54437,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2960,
+                              "id": 2796,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "8068:3:7",
+                              "referencedDeclaration": 2592,
+                              "src": "8169:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2962,
+                            "id": 2798,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2227,
-                            "src": "8068:12:7",
+                            "referencedDeclaration": 2051,
+                            "src": "8169:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -54189,26 +54471,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2964,
+                                  "id": 2800,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8098:3:7",
+                                  "referencedDeclaration": 2592,
+                                  "src": "8199:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 2965,
+                                "id": 2801,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2227,
-                                "src": "8098:12:7",
+                                "referencedDeclaration": 2051,
+                                "src": "8199:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -54222,18 +54504,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 2963,
+                              "id": 2799,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5090,
-                              "src": "8083:14:7",
+                              "referencedDeclaration": 4926,
+                              "src": "8184:14:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 2966,
+                            "id": 2802,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -54241,21 +54523,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8083:28:7",
+                            "src": "8184:28:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8068:43:7",
+                          "src": "8169:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 2968,
+                        "id": 2804,
                         "nodeType": "ExpressionStatement",
-                        "src": "8068:43:7"
+                        "src": "8169:43:6"
                       }
                     ]
                   }
@@ -54267,7 +54549,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 2975,
+                    "id": 2811,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54278,32 +54560,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2971,
+                          "id": 2807,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2774,
-                          "src": "8136:3:7",
+                          "referencedDeclaration": 2598,
+                          "src": "8237:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2972,
+                        "id": 2808,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8136:12:7",
+                        "referencedDeclaration": 2051,
+                        "src": "8237:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 2973,
+                      "id": 2809,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54311,7 +54593,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8136:19:7",
+                      "src": "8237:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54321,36 +54603,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 2974,
+                      "id": 2810,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "8158:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "8259:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8136:38:7",
+                    "src": "8237:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 2986,
+                  "id": 2822,
                   "nodeType": "IfStatement",
-                  "src": "8132:112:7",
+                  "src": "8233:112:6",
                   "trueBody": {
-                    "id": 2985,
+                    "id": 2821,
                     "nodeType": "Block",
-                    "src": "8176:68:7",
+                    "src": "8277:68:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2983,
+                          "id": 2819,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54359,26 +54641,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 2976,
+                              "id": 2812,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "8190:3:7",
+                              "referencedDeclaration": 2598,
+                              "src": "8291:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 2978,
+                            "id": 2814,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "netflags",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2227,
-                            "src": "8190:12:7",
+                            "referencedDeclaration": 2051,
+                            "src": "8291:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                               "typeString": "bool[] memory"
@@ -54393,26 +54675,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 2980,
+                                  "id": 2816,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8220:3:7",
+                                  "referencedDeclaration": 2592,
+                                  "src": "8321:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 2981,
+                                "id": 2817,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "netflags",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2227,
-                                "src": "8220:12:7",
+                                "referencedDeclaration": 2051,
+                                "src": "8321:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                   "typeString": "bool[] memory"
@@ -54426,18 +54708,18 @@
                                   "typeString": "bool[] memory"
                                 }
                               ],
-                              "id": 2979,
+                              "id": 2815,
                               "name": "ResizeNetflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5090,
-                              "src": "8205:14:7",
+                              "referencedDeclaration": 4926,
+                              "src": "8306:14:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_bool_$dyn_memory_ptr_$returns$_t_array$_t_bool_$dyn_memory_ptr_$",
                                 "typeString": "function (bool[] memory) view returns (bool[] memory)"
                               }
                             },
-                            "id": 2982,
+                            "id": 2818,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -54445,30 +54727,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8205:28:7",
+                            "src": "8306:28:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                               "typeString": "bool[] memory"
                             }
                           },
-                          "src": "8190:43:7",
+                          "src": "8291:43:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                             "typeString": "bool[] memory"
                           }
                         },
-                        "id": 2984,
+                        "id": 2820,
                         "nodeType": "ExpressionStatement",
-                        "src": "8190:43:7"
+                        "src": "8291:43:6"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 3012,
+                    "id": 2848,
                     "nodeType": "Block",
-                    "src": "8301:207:7",
+                    "src": "8402:207:6",
                     "statements": [
                       {
                         "expression": {
@@ -54480,14 +54762,14 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 3009,
+                              "id": 2845,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 3004,
+                                "id": 2840,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -54495,47 +54777,47 @@
                                 "nodeType": "UnaryOperation",
                                 "operator": "!",
                                 "prefix": true,
-                                "src": "8461:16:7",
+                                "src": "8562:16:6",
                                 "subExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3000,
+                                      "id": 2836,
                                       "name": "bid",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2774,
-                                      "src": "8462:3:7",
+                                      "referencedDeclaration": 2598,
+                                      "src": "8563:3:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                         "typeString": "struct Market.Order memory"
                                       }
                                     },
-                                    "id": 3001,
+                                    "id": 2837,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "netflags",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2227,
-                                    "src": "8462:12:7",
+                                    "referencedDeclaration": 2051,
+                                    "src": "8563:12:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                       "typeString": "bool[] memory"
                                     }
                                   },
-                                  "id": 3003,
+                                  "id": 2839,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3002,
+                                    "id": 2838,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2988,
-                                    "src": "8475:1:7",
+                                    "referencedDeclaration": 2824,
+                                    "src": "8576:1:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -54546,7 +54828,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "8462:15:7",
+                                  "src": "8563:15:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -54565,40 +54847,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3005,
+                                    "id": 2841,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "8481:3:7",
+                                    "referencedDeclaration": 2592,
+                                    "src": "8582:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 3006,
+                                  "id": 2842,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "netflags",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2227,
-                                  "src": "8481:12:7",
+                                  "referencedDeclaration": 2051,
+                                  "src": "8582:12:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                                     "typeString": "bool[] memory"
                                   }
                                 },
-                                "id": 3008,
+                                "id": 2844,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3007,
+                                  "id": 2843,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8494:1:7",
+                                  "referencedDeclaration": 2824,
+                                  "src": "8595:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -54609,13 +54891,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8481:15:7",
+                                "src": "8582:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "8461:35:7",
+                              "src": "8562:35:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -54629,21 +54911,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 2999,
+                            "id": 2835,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "8453:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "8554:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3010,
+                          "id": 2846,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54651,15 +54933,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8453:44:7",
+                          "src": "8554:44:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3011,
+                        "id": 2847,
                         "nodeType": "ExpressionStatement",
-                        "src": "8453:44:7"
+                        "src": "8554:44:6"
                       }
                     ]
                   },
@@ -54669,19 +54951,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 2995,
+                    "id": 2831,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 2991,
+                      "id": 2827,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2988,
-                      "src": "8271:1:7",
+                      "referencedDeclaration": 2824,
+                      "src": "8372:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54695,32 +54977,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 2992,
+                          "id": 2828,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8275:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8376:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 2993,
+                        "id": 2829,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "8275:12:7",
+                        "referencedDeclaration": 2051,
+                        "src": "8376:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 2994,
+                      "id": 2830,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54728,31 +55010,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8275:19:7",
+                      "src": "8376:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8271:23:7",
+                    "src": "8372:23:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3013,
+                  "id": 2849,
                   "initializationExpression": {
                     "assignments": [
-                      2988
+                      2824
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 2988,
+                        "id": 2824,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 3185,
-                        "src": "8259:6:7",
+                        "scope": 3021,
+                        "src": "8360:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -54760,10 +55042,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 2987,
+                          "id": 2823,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "8259:4:7",
+                          "src": "8360:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -54773,18 +55055,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 2990,
+                    "id": 2826,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 2989,
+                      "id": 2825,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "8268:1:7",
+                      "src": "8369:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -54793,12 +55075,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "8259:10:7"
+                    "src": "8360:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 2997,
+                      "id": 2833,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54806,15 +55088,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8296:3:7",
+                      "src": "8397:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 2996,
+                        "id": 2832,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8296:1:7",
+                        "referencedDeclaration": 2824,
+                        "src": "8397:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -54825,12 +55107,12 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 2998,
+                    "id": 2834,
                     "nodeType": "ExpressionStatement",
-                    "src": "8296:3:7"
+                    "src": "8397:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8254:254:7"
+                  "src": "8355:254:6"
                 },
                 {
                   "condition": {
@@ -54839,7 +55121,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3018,
+                    "id": 2854,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -54850,32 +55132,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3014,
+                          "id": 2850,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8522:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8623:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3015,
+                        "id": 2851,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8522:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "8623:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3016,
+                      "id": 2852,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -54883,7 +55165,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8522:21:7",
+                      "src": "8623:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -54893,36 +55175,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 3017,
+                      "id": 2853,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "8546:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "8647:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8522:42:7",
+                    "src": "8623:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3029,
+                  "id": 2865,
                   "nodeType": "IfStatement",
-                  "src": "8518:122:7",
+                  "src": "8619:122:6",
                   "trueBody": {
-                    "id": 3028,
+                    "id": 2864,
                     "nodeType": "Block",
-                    "src": "8566:74:7",
+                    "src": "8667:74:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3026,
+                          "id": 2862,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -54931,26 +55213,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3019,
+                              "id": 2855,
                               "name": "ask",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2768,
-                              "src": "8580:3:7",
+                              "referencedDeclaration": 2592,
+                              "src": "8681:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 3021,
+                            "id": 2857,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2236,
-                            "src": "8580:14:7",
+                            "referencedDeclaration": 2060,
+                            "src": "8681:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -54965,26 +55247,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3023,
+                                  "id": 2859,
                                   "name": "ask",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2768,
-                                  "src": "8614:3:7",
+                                  "referencedDeclaration": 2592,
+                                  "src": "8715:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3024,
+                                "id": 2860,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2236,
-                                "src": "8614:14:7",
+                                "referencedDeclaration": 2060,
+                                "src": "8715:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -54998,18 +55280,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 3022,
+                              "id": 2858,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5047,
-                              "src": "8597:16:7",
+                              "referencedDeclaration": 4883,
+                              "src": "8698:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 3025,
+                            "id": 2861,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -55017,21 +55299,21 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8597:32:7",
+                            "src": "8698:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8580:49:7",
+                          "src": "8681:49:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 3027,
+                        "id": 2863,
                         "nodeType": "ExpressionStatement",
-                        "src": "8580:49:7"
+                        "src": "8681:49:6"
                       }
                     ]
                   }
@@ -55043,7 +55325,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3034,
+                    "id": 2870,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55054,32 +55336,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3030,
+                          "id": 2866,
                           "name": "bid",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2774,
-                          "src": "8654:3:7",
+                          "referencedDeclaration": 2598,
+                          "src": "8755:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3031,
+                        "id": 2867,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8654:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "8755:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3032,
+                      "id": 2868,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55087,7 +55369,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8654:21:7",
+                      "src": "8755:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55097,36 +55379,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 3033,
+                      "id": 2869,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "8678:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "8779:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8654:42:7",
+                    "src": "8755:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3045,
+                  "id": 2881,
                   "nodeType": "IfStatement",
-                  "src": "8650:122:7",
+                  "src": "8751:122:6",
                   "trueBody": {
-                    "id": 3044,
+                    "id": 2880,
                     "nodeType": "Block",
-                    "src": "8698:74:7",
+                    "src": "8799:74:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3042,
+                          "id": 2878,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -55135,26 +55417,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3035,
+                              "id": 2871,
                               "name": "bid",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2774,
-                              "src": "8712:3:7",
+                              "referencedDeclaration": 2598,
+                              "src": "8813:3:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                 "typeString": "struct Market.Order memory"
                               }
                             },
-                            "id": 3037,
+                            "id": 2873,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "benchmarks",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2236,
-                            "src": "8712:14:7",
+                            "referencedDeclaration": 2060,
+                            "src": "8813:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                               "typeString": "uint64[] memory"
@@ -55169,26 +55451,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3039,
+                                  "id": 2875,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "8746:3:7",
+                                  "referencedDeclaration": 2598,
+                                  "src": "8847:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3040,
+                                "id": 2876,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "benchmarks",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2236,
-                                "src": "8746:14:7",
+                                "referencedDeclaration": 2060,
+                                "src": "8847:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                   "typeString": "uint64[] memory"
@@ -55202,18 +55484,18 @@
                                   "typeString": "uint64[] memory"
                                 }
                               ],
-                              "id": 3038,
+                              "id": 2874,
                               "name": "ResizeBenchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5047,
-                              "src": "8729:16:7",
+                              "referencedDeclaration": 4883,
+                              "src": "8830:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_array$_t_uint64_$dyn_memory_ptr_$returns$_t_array$_t_uint64_$dyn_memory_ptr_$",
                                 "typeString": "function (uint64[] memory) view returns (uint64[] memory)"
                               }
                             },
-                            "id": 3041,
+                            "id": 2877,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -55221,30 +55503,30 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "8729:32:7",
+                            "src": "8830:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                               "typeString": "uint64[] memory"
                             }
                           },
-                          "src": "8712:49:7",
+                          "src": "8813:49:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
                           }
                         },
-                        "id": 3043,
+                        "id": 2879,
                         "nodeType": "ExpressionStatement",
-                        "src": "8712:49:7"
+                        "src": "8813:49:6"
                       }
                     ]
                   }
                 },
                 {
                   "body": {
-                    "id": 3070,
+                    "id": 2906,
                     "nodeType": "Block",
-                    "src": "8826:72:7",
+                    "src": "8927:72:6",
                     "statements": [
                       {
                         "expression": {
@@ -55256,7 +55538,7 @@
                                 "typeIdentifier": "t_uint64",
                                 "typeString": "uint64"
                               },
-                              "id": 3067,
+                              "id": 2903,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -55267,40 +55549,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3059,
+                                    "id": 2895,
                                     "name": "ask",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2768,
-                                    "src": "8848:3:7",
+                                    "referencedDeclaration": 2592,
+                                    "src": "8949:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 3060,
+                                  "id": 2896,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2236,
-                                  "src": "8848:14:7",
+                                  "referencedDeclaration": 2060,
+                                  "src": "8949:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 3062,
+                                "id": 2898,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3061,
+                                  "id": 2897,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8863:1:7",
+                                  "referencedDeclaration": 2824,
+                                  "src": "8964:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -55311,7 +55593,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8848:17:7",
+                                "src": "8949:17:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
@@ -55325,40 +55607,40 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3063,
+                                    "id": 2899,
                                     "name": "bid",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2774,
-                                    "src": "8869:3:7",
+                                    "referencedDeclaration": 2598,
+                                    "src": "8970:3:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                       "typeString": "struct Market.Order memory"
                                     }
                                   },
-                                  "id": 3064,
+                                  "id": 2900,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "benchmarks",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2236,
-                                  "src": "8869:14:7",
+                                  "referencedDeclaration": 2060,
+                                  "src": "8970:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                                     "typeString": "uint64[] memory"
                                   }
                                 },
-                                "id": 3066,
+                                "id": 2902,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3065,
+                                  "id": 2901,
                                   "name": "i",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2988,
-                                  "src": "8884:1:7",
+                                  "referencedDeclaration": 2824,
+                                  "src": "8985:1:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -55369,13 +55651,13 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "8869:17:7",
+                                "src": "8970:17:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint64",
                                   "typeString": "uint64"
                                 }
                               },
-                              "src": "8848:38:7",
+                              "src": "8949:38:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -55389,21 +55671,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3058,
+                            "id": 2894,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "8840:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "8941:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3068,
+                          "id": 2904,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -55411,15 +55693,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "8840:47:7",
+                          "src": "8941:47:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3069,
+                        "id": 2905,
                         "nodeType": "ExpressionStatement",
-                        "src": "8840:47:7"
+                        "src": "8941:47:6"
                       }
                     ]
                   },
@@ -55429,19 +55711,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3054,
+                    "id": 2890,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3050,
+                      "id": 2886,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2988,
-                      "src": "8794:1:7",
+                      "referencedDeclaration": 2824,
+                      "src": "8895:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55455,32 +55737,32 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3051,
+                          "id": 2887,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8798:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "8899:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3052,
+                        "id": 2888,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "8798:14:7",
+                        "referencedDeclaration": 2060,
+                        "src": "8899:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 3053,
+                      "id": 2889,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55488,35 +55770,35 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8798:21:7",
+                      "src": "8899:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8794:25:7",
+                    "src": "8895:25:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3071,
+                  "id": 2907,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3048,
+                      "id": 2884,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 3046,
+                        "id": 2882,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8787:1:7",
+                        "referencedDeclaration": 2824,
+                        "src": "8888:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -55527,14 +55809,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 3047,
+                        "id": 2883,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "8791:1:7",
+                        "src": "8892:1:6",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -55542,20 +55824,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "8787:5:7",
+                      "src": "8888:5:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3049,
+                    "id": 2885,
                     "nodeType": "ExpressionStatement",
-                    "src": "8787:5:7"
+                    "src": "8888:5:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3056,
+                      "id": 2892,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55563,15 +55845,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8821:3:7",
+                      "src": "8922:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 3055,
+                        "id": 2891,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2988,
-                        "src": "8821:1:7",
+                        "referencedDeclaration": 2824,
+                        "src": "8922:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -55582,29 +55864,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 3057,
+                    "id": 2893,
                     "nodeType": "ExpressionStatement",
-                    "src": "8821:3:7"
+                    "src": "8922:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8782:116:7"
+                  "src": "8883:116:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3077,
+                    "id": 2913,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3072,
+                      "id": 2908,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "8908:10:7",
+                      "referencedDeclaration": 2151,
+                      "src": "9009:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -55618,14 +55900,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 3075,
+                          "id": 2911,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "8936:1:7",
+                          "src": "9037:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -55643,32 +55925,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3073,
+                          "id": 2909,
                           "name": "dealAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2327,
-                          "src": "8921:10:7",
+                          "referencedDeclaration": 2151,
+                          "src": "9022:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3074,
+                        "id": 2910,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "8921:14:7",
+                        "referencedDeclaration": 11079,
+                        "src": "9022:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3076,
+                      "id": 2912,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -55676,34 +55958,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "8921:17:7",
+                      "src": "9022:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8908:30:7",
+                    "src": "9009:30:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3078,
+                  "id": 2914,
                   "nodeType": "ExpressionStatement",
-                  "src": "8908:30:7"
+                  "src": "9009:30:6"
                 },
                 {
                   "assignments": [
-                    3080
+                    2916
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3080,
+                      "id": 2916,
                       "name": "master",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "8948:14:7",
+                      "scope": 3021,
+                      "src": "9049:14:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -55711,10 +55993,10 @@
                         "typeString": "address"
                       },
                       "typeName": {
-                        "id": 3079,
+                        "id": 2915,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "8948:7:7",
+                        "src": "9049:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -55724,7 +56006,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3085,
+                  "id": 2921,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
@@ -55732,26 +56014,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3082,
+                          "id": 2918,
                           "name": "ask",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2768,
-                          "src": "8975:3:7",
+                          "referencedDeclaration": 2592,
+                          "src": "9076:3:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 3083,
+                        "id": 2919,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2218,
-                        "src": "8975:10:7",
+                        "referencedDeclaration": 2042,
+                        "src": "9076:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -55765,18 +56047,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 3081,
+                      "id": 2917,
                       "name": "GetMaster",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4298,
-                      "src": "8965:9:7",
+                      "referencedDeclaration": 4134,
+                      "src": "9066:9:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                         "typeString": "function (address) view returns (address)"
                       }
                     },
-                    "id": 3084,
+                    "id": 2920,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55784,19 +56066,19 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "8965:21:7",
+                    "src": "9066:21:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "8948:38:7"
+                  "src": "9049:38:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3092,
+                    "id": 2928,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55807,26 +56089,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3086,
+                          "id": 2922,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "8996:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "9097:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 3088,
+                        "id": 2924,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3087,
+                          "id": 2923,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9003:6:7",
+                          "referencedDeclaration": 2584,
+                          "src": "9104:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -55837,23 +56119,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "8996:14:7",
+                        "src": "9097:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 3089,
+                      "id": 2925,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "8996:26:7",
+                      "referencedDeclaration": 2040,
+                      "src": "9097:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -55863,18 +56145,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3090,
+                        "id": 2926,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "9025:11:7",
+                        "referencedDeclaration": 1996,
+                        "src": "9126:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 3091,
+                      "id": 2927,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -55882,26 +56164,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9025:26:7",
+                      "src": "9126:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "8996:55:7",
+                    "src": "9097:55:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 3093,
+                  "id": 2929,
                   "nodeType": "ExpressionStatement",
-                  "src": "8996:55:7"
+                  "src": "9097:55:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3100,
+                    "id": 2936,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -55912,26 +56194,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3094,
+                          "id": 2930,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9061:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "9162:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 3096,
+                        "id": 2932,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3095,
+                          "id": 2931,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9068:6:7",
+                          "referencedDeclaration": 2586,
+                          "src": "9169:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -55942,23 +56224,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9061:14:7",
+                        "src": "9162:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 3097,
+                      "id": 2933,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "orderStatus",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2216,
-                      "src": "9061:26:7",
+                      "referencedDeclaration": 2040,
+                      "src": "9162:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
@@ -55968,18 +56250,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3098,
+                        "id": 2934,
                         "name": "OrderStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2172,
-                        "src": "9090:11:7",
+                        "referencedDeclaration": 1996,
+                        "src": "9191:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$2172_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderStatus_$1996_$",
                           "typeString": "type(enum Market.OrderStatus)"
                         }
                       },
-                      "id": 3099,
+                      "id": 2935,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -55987,26 +56269,26 @@
                       "memberName": "ORDER_INACTIVE",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9090:26:7",
+                      "src": "9191:26:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                        "typeIdentifier": "t_enum$_OrderStatus_$1996",
                         "typeString": "enum Market.OrderStatus"
                       }
                     },
-                    "src": "9061:55:7",
+                    "src": "9162:55:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
-                  "id": 3101,
+                  "id": 2937,
                   "nodeType": "ExpressionStatement",
-                  "src": "9061:55:7"
+                  "src": "9162:55:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3107,
+                    "id": 2943,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56017,26 +56299,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3102,
+                          "id": 2938,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9126:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "9227:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 3104,
+                        "id": 2940,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3103,
+                          "id": 2939,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9133:6:7",
+                          "referencedDeclaration": 2584,
+                          "src": "9234:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56047,21 +56329,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9126:14:7",
+                        "src": "9227:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 3105,
+                      "id": 2941,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2240,
-                      "src": "9126:21:7",
+                      "referencedDeclaration": 2064,
+                      "src": "9227:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56071,31 +56353,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3106,
+                      "id": 2942,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "9150:10:7",
+                      "referencedDeclaration": 2151,
+                      "src": "9251:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9126:34:7",
+                    "src": "9227:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3108,
+                  "id": 2944,
                   "nodeType": "ExpressionStatement",
-                  "src": "9126:34:7"
+                  "src": "9227:34:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3114,
+                    "id": 2950,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56106,26 +56388,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3109,
+                          "id": 2945,
                           "name": "orders",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2338,
-                          "src": "9170:6:7",
+                          "referencedDeclaration": 2162,
+                          "src": "9271:6:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                           }
                         },
-                        "id": 3111,
+                        "id": 2947,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3110,
+                          "id": 2946,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9177:6:7",
+                          "referencedDeclaration": 2586,
+                          "src": "9278:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56136,21 +56418,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9170:14:7",
+                        "src": "9271:14:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage",
                           "typeString": "struct Market.Order storage ref"
                         }
                       },
-                      "id": 3112,
+                      "id": 2948,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "dealID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2240,
-                      "src": "9170:21:7",
+                      "referencedDeclaration": 2064,
+                      "src": "9271:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56160,26 +56442,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 3113,
+                      "id": 2949,
                       "name": "dealAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2327,
-                      "src": "9194:10:7",
+                      "referencedDeclaration": 2151,
+                      "src": "9295:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9170:34:7",
+                    "src": "9271:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3115,
+                  "id": 2951,
                   "nodeType": "ExpressionStatement",
-                  "src": "9170:34:7"
+                  "src": "9271:34:6"
                 },
                 {
                   "eventCall": {
@@ -56187,12 +56469,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3117,
+                        "id": 2953,
                         "name": "_askID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2760,
-                        "src": "9233:6:7",
+                        "referencedDeclaration": 2584,
+                        "src": "9334:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56206,18 +56488,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3116,
+                      "id": 2952,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "9220:12:7",
+                      "referencedDeclaration": 2084,
+                      "src": "9321:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3118,
+                    "id": 2954,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56225,15 +56507,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9220:20:7",
+                    "src": "9321:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3119,
+                  "id": 2955,
                   "nodeType": "EmitStatement",
-                  "src": "9215:25:7"
+                  "src": "9316:25:6"
                 },
                 {
                   "eventCall": {
@@ -56241,12 +56523,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3121,
+                        "id": 2957,
                         "name": "_bidID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2762,
-                        "src": "9268:6:7",
+                        "referencedDeclaration": 2586,
+                        "src": "9369:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56260,18 +56542,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3120,
+                      "id": 2956,
                       "name": "OrderUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2260,
-                      "src": "9255:12:7",
+                      "referencedDeclaration": 2084,
+                      "src": "9356:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3122,
+                    "id": 2958,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56279,28 +56561,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9255:20:7",
+                    "src": "9356:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3123,
+                  "id": 2959,
                   "nodeType": "EmitStatement",
-                  "src": "9250:25:7"
+                  "src": "9351:25:6"
                 },
                 {
                   "assignments": [
-                    3125
+                    2961
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3125,
+                      "id": 2961,
                       "name": "startTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9286:14:7",
+                      "scope": 3021,
+                      "src": "9387:14:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56308,10 +56590,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3124,
+                        "id": 2960,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9286:4:7",
+                        "src": "9387:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56321,23 +56603,23 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3128,
+                  "id": 2964,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3126,
+                      "id": 2962,
                       "name": "block",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11305,
-                      "src": "9303:5:7",
+                      "referencedDeclaration": 11589,
+                      "src": "9404:5:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_block",
                         "typeString": "block"
                       }
                     },
-                    "id": 3127,
+                    "id": 2963,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56345,27 +56627,27 @@
                     "memberName": "timestamp",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "9303:15:7",
+                    "src": "9404:15:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9286:32:7"
+                  "src": "9387:32:6"
                 },
                 {
                   "assignments": [
-                    3130
+                    2966
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3130,
+                      "id": 2966,
                       "name": "endTime",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9328:12:7",
+                      "scope": 3021,
+                      "src": "9429:12:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56373,10 +56655,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3129,
+                        "id": 2965,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9328:4:7",
+                        "src": "9429:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56386,18 +56668,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3132,
+                  "id": 2968,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 3131,
+                    "id": 2967,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "9343:1:7",
+                    "src": "9444:1:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -56406,7 +56688,7 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9328:16:7"
+                  "src": "9429:16:6"
                 },
                 {
                   "condition": {
@@ -56415,7 +56697,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3136,
+                    "id": 2972,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56424,26 +56706,26 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3133,
+                        "id": 2969,
                         "name": "ask",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2768,
-                        "src": "9419:3:7",
+                        "referencedDeclaration": 2592,
+                        "src": "9520:3:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                           "typeString": "struct Market.Order memory"
                         }
                       },
-                      "id": 3134,
+                      "id": 2970,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2222,
-                      "src": "9419:12:7",
+                      "referencedDeclaration": 2046,
+                      "src": "9520:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -56454,14 +56736,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 3135,
+                      "id": 2971,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9435:1:7",
+                      "src": "9536:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -56469,37 +56751,37 @@
                       },
                       "value": "0"
                     },
-                    "src": "9419:17:7",
+                    "src": "9520:17:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3146,
+                  "id": 2982,
                   "nodeType": "IfStatement",
-                  "src": "9415:85:7",
+                  "src": "9516:85:6",
                   "trueBody": {
-                    "id": 3145,
+                    "id": 2981,
                     "nodeType": "Block",
-                    "src": "9438:62:7",
+                    "src": "9539:62:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3143,
+                          "id": 2979,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3137,
+                            "id": 2973,
                             "name": "endTime",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3130,
-                            "src": "9452:7:7",
+                            "referencedDeclaration": 2966,
+                            "src": "9553:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -56514,26 +56796,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3140,
+                                  "id": 2976,
                                   "name": "bid",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2774,
-                                  "src": "9476:3:7",
+                                  "referencedDeclaration": 2598,
+                                  "src": "9577:3:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                                     "typeString": "struct Market.Order memory"
                                   }
                                 },
-                                "id": 3141,
+                                "id": 2977,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "duration",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2222,
-                                "src": "9476:12:7",
+                                "referencedDeclaration": 2046,
+                                "src": "9577:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -56549,32 +56831,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3138,
+                                "id": 2974,
                                 "name": "startTime",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3125,
-                                "src": "9462:9:7",
+                                "referencedDeclaration": 2961,
+                                "src": "9563:9:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3139,
+                              "id": 2975,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10795,
-                              "src": "9462:13:7",
+                              "referencedDeclaration": 11079,
+                              "src": "9563:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 3142,
+                            "id": 2978,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -56582,37 +56864,37 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "9462:27:7",
+                            "src": "9563:27:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "9452:37:7",
+                          "src": "9553:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3144,
+                        "id": 2980,
                         "nodeType": "ExpressionStatement",
-                        "src": "9452:37:7"
+                        "src": "9553:37:6"
                       }
                     ]
                   }
                 },
                 {
                   "assignments": [
-                    3148
+                    2984
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3148,
+                      "id": 2984,
                       "name": "blockedBalance",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3185,
-                      "src": "9509:19:7",
+                      "scope": 3021,
+                      "src": "9610:19:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -56620,10 +56902,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 3147,
+                        "id": 2983,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "9509:4:7",
+                        "src": "9610:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56633,43 +56915,43 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3151,
+                  "id": 2987,
                   "initialValue": {
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 3149,
+                      "id": 2985,
                       "name": "bid",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2774,
-                      "src": "9531:3:7",
+                      "referencedDeclaration": 2598,
+                      "src": "9632:3:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order memory"
                       }
                     },
-                    "id": 3150,
+                    "id": 2986,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
                     "lValueRequested": false,
                     "memberName": "frozenSum",
                     "nodeType": "MemberAccess",
-                    "referencedDeclaration": 2238,
-                    "src": "9531:13:7",
+                    "referencedDeclaration": 2062,
+                    "src": "9632:13:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "9509:35:7"
+                  "src": "9610:35:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3178,
+                    "id": 3014,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -56678,26 +56960,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 3152,
+                        "id": 2988,
                         "name": "deals",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2342,
-                        "src": "9554:5:7",
+                        "referencedDeclaration": 2166,
+                        "src": "9655:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                         }
                       },
-                      "id": 3154,
+                      "id": 2990,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 3153,
+                        "id": 2989,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2327,
-                        "src": "9560:10:7",
+                        "referencedDeclaration": 2151,
+                        "src": "9661:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -56708,9 +56990,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9554:17:7",
+                      "src": "9655:17:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                         "typeString": "struct Market.Deal storage ref"
                       }
                     },
@@ -56723,26 +57005,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3156,
+                            "id": 2992,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9579:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9693:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3157,
+                          "id": 2993,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "benchmarks",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2236,
-                          "src": "9579:14:7",
+                          "referencedDeclaration": 2060,
+                          "src": "9693:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                             "typeString": "uint64[] memory"
@@ -56752,26 +57034,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3158,
+                            "id": 2994,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9595:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9721:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3159,
+                          "id": 2995,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "9595:10:7",
+                          "referencedDeclaration": 2042,
+                          "src": "9721:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56781,26 +57063,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3160,
+                            "id": 2996,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "9607:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "9745:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3161,
+                          "id": 2997,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "author",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2218,
-                          "src": "9607:10:7",
+                          "referencedDeclaration": 2042,
+                          "src": "9745:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56808,12 +57090,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3162,
+                          "id": 2998,
                           "name": "master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3080,
-                          "src": "9619:6:7",
+                          "referencedDeclaration": 2916,
+                          "src": "9769:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -56821,12 +57103,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3163,
+                          "id": 2999,
                           "name": "_askID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2760,
-                          "src": "9627:6:7",
+                          "referencedDeclaration": 2584,
+                          "src": "9789:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56834,12 +57116,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3164,
+                          "id": 3000,
                           "name": "_bidID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2762,
-                          "src": "9635:6:7",
+                          "referencedDeclaration": 2586,
+                          "src": "9809:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56849,26 +57131,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3165,
+                            "id": 3001,
                             "name": "bid",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2774,
-                            "src": "9643:3:7",
+                            "referencedDeclaration": 2598,
+                            "src": "9829:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3166,
+                          "id": 3002,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2222,
-                          "src": "9643:12:7",
+                          "referencedDeclaration": 2046,
+                          "src": "9829:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56878,26 +57160,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3167,
+                            "id": 3003,
                             "name": "ask",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2768,
-                            "src": "9657:3:7",
+                            "referencedDeclaration": 2592,
+                            "src": "9855:3:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                              "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                               "typeString": "struct Market.Order memory"
                             }
                           },
-                          "id": 3168,
+                          "id": 3004,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2224,
-                          "src": "9657:9:7",
+                          "referencedDeclaration": 2048,
+                          "src": "9855:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56905,12 +57187,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3169,
+                          "id": 3005,
                           "name": "startTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3125,
-                          "src": "9668:9:7",
+                          "referencedDeclaration": 2961,
+                          "src": "9878:9:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56918,12 +57200,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3170,
+                          "id": 3006,
                           "name": "endTime",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3130,
-                          "src": "9679:7:7",
+                          "referencedDeclaration": 2966,
+                          "src": "9901:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56933,18 +57215,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3171,
+                            "id": 3007,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "9688:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "9922:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 3172,
+                          "id": 3008,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -56952,20 +57234,20 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9688:26:7",
+                          "src": "9922:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3173,
+                          "id": 3009,
                           "name": "blockedBalance",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3148,
-                          "src": "9716:14:7",
+                          "referencedDeclaration": 2984,
+                          "src": "9962:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -56974,14 +57256,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3174,
+                          "id": 3010,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9732:1:7",
+                          "src": "9990:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -56993,18 +57275,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3175,
+                            "id": 3011,
                             "name": "block",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11305,
-                            "src": "9735:5:7",
+                            "referencedDeclaration": 11589,
+                            "src": "10005:5:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_block",
                               "typeString": "block"
                             }
                           },
-                          "id": 3176,
+                          "id": 3012,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57012,7 +57294,7 @@
                           "memberName": "timestamp",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "9735:15:7",
+                          "src": "10005:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -57062,7 +57344,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           },
                           {
@@ -57078,18 +57360,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 3155,
+                        "id": 2991,
                         "name": "Deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2212,
-                        "src": "9574:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "9675:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Deal_$2212_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Deal_$2036_storage_ptr_$",
                           "typeString": "type(struct Market.Deal storage pointer)"
                         }
                       },
-                      "id": 3177,
+                      "id": 3013,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -57097,21 +57379,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "9574:177:7",
+                      "src": "9675:355:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory",
                         "typeString": "struct Market.Deal memory"
                       }
                     },
-                    "src": "9554:197:7",
+                    "src": "9655:375:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
-                  "id": 3179,
+                  "id": 3015,
                   "nodeType": "ExpressionStatement",
-                  "src": "9554:197:7"
+                  "src": "9655:375:6"
                 },
                 {
                   "eventCall": {
@@ -57119,12 +57401,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3181,
+                        "id": 3017,
                         "name": "dealAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2327,
-                        "src": "9777:10:7",
+                        "referencedDeclaration": 2151,
+                        "src": "10056:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -57138,18 +57420,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3180,
+                      "id": 3016,
                       "name": "DealOpened",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2264,
-                      "src": "9766:10:7",
+                      "referencedDeclaration": 2088,
+                      "src": "10045:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3182,
+                    "id": 3018,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57157,57 +57439,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9766:22:7",
+                    "src": "10045:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3183,
+                  "id": 3019,
                   "nodeType": "EmitStatement",
-                  "src": "9761:27:7"
+                  "src": "10040:27:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3185,
+            "id": 3021,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 2765,
+                "id": 2589,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 2764,
+                  "id": 2588,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "6793:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "6885:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6793:13:7"
+                "src": "6885:13:6"
               }
             ],
             "name": "OpenDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 2763,
+              "id": 2587,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 2760,
+                  "id": 2584,
                   "name": "_askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3185,
-                  "src": "6767:11:7",
+                  "scope": 3021,
+                  "src": "6852:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -57215,10 +57497,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2759,
+                    "id": 2583,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6767:4:7",
+                    "src": "6852:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -57229,11 +57511,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 2762,
+                  "id": 2586,
                   "name": "_bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3185,
-                  "src": "6780:11:7",
+                  "scope": 3021,
+                  "src": "6865:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -57241,10 +57523,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 2761,
+                    "id": 2585,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6780:4:7",
+                    "src": "6865:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -57254,26 +57536,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6766:26:7"
+              "src": "6851:26:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 2766,
+              "id": 2590,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6814:0:7"
+              "src": "6899:0:6"
             },
-            "scope": 5229,
-            "src": "6749:3046:7",
+            "scope": 5065,
+            "src": "6834:3240:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3275,
+              "id": 3111,
               "nodeType": "Block",
-              "src": "9883:573:7",
+              "src": "10162:573:6",
               "statements": [
                 {
                   "expression": {
@@ -57285,10 +57567,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 3201,
+                            "id": 3037,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57299,26 +57581,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3195,
+                                  "id": 3031,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "9902:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10181:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3197,
+                                "id": 3033,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3196,
+                                  "id": 3032,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "9908:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10187:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57329,23 +57611,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9902:13:7",
+                                "src": "10181:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3198,
+                              "id": 3034,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2205,
-                              "src": "9902:20:7",
+                              "referencedDeclaration": 2029,
+                              "src": "10181:20:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -57355,18 +57637,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3199,
+                                "id": 3035,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2164,
-                                "src": "9926:10:7",
+                                "referencedDeclaration": 1988,
+                                "src": "10205:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 3200,
+                              "id": 3036,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -57374,27 +57656,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9926:26:7",
+                              "src": "10205:26:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "9902:50:7",
+                            "src": "10181:50:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 3202,
+                        "id": 3038,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "9901:52:7",
+                        "src": "10180:52:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -57408,21 +57690,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3194,
+                      "id": 3030,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "9893:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "10172:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3203,
+                    "id": 3039,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57430,15 +57712,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9893:61:7",
+                    "src": "10172:61:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3204,
+                  "id": 3040,
                   "nodeType": "ExpressionStatement",
-                  "src": "9893:61:7"
+                  "src": "10172:61:6"
                 },
                 {
                   "expression": {
@@ -57450,7 +57732,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3228,
+                        "id": 3064,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -57461,7 +57743,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3220,
+                          "id": 3056,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57472,7 +57754,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3212,
+                            "id": 3048,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57481,18 +57763,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3206,
+                                "id": 3042,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "9972:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "10251:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3207,
+                              "id": 3043,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -57500,7 +57782,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "9972:10:7",
+                              "src": "10251:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -57514,26 +57796,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3208,
+                                  "id": 3044,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "9986:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10265:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3210,
+                                "id": 3046,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3209,
+                                  "id": 3045,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "9992:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10271:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57544,27 +57826,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "9986:13:7",
+                                "src": "10265:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3211,
+                              "id": 3047,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "9986:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "10265:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "9972:38:7",
+                            "src": "10251:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -57578,7 +57860,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3219,
+                            "id": 3055,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57587,18 +57869,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3213,
+                                "id": 3049,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10014:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "10293:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3214,
+                              "id": 3050,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -57606,7 +57888,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10014:10:7",
+                              "src": "10293:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -57620,26 +57902,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3215,
+                                  "id": 3051,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10028:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "10307:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3217,
+                                "id": 3053,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3216,
+                                  "id": 3052,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3187,
-                                  "src": "10034:6:7",
+                                  "referencedDeclaration": 3023,
+                                  "src": "10313:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -57650,33 +57932,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10028:13:7",
+                                "src": "10307:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3218,
+                              "id": 3054,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "10028:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "10307:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10014:38:7",
+                            "src": "10293:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "9972:80:7",
+                          "src": "10251:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -57690,7 +57972,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3227,
+                          "id": 3063,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -57699,18 +57981,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3221,
+                              "id": 3057,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "10056:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "10335:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3222,
+                            "id": 3058,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -57718,7 +58000,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10056:10:7",
+                            "src": "10335:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -57732,26 +58014,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3223,
+                                "id": 3059,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "10070:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "10349:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3225,
+                              "id": 3061,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3224,
+                                "id": 3060,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3187,
-                                "src": "10076:6:7",
+                                "referencedDeclaration": 3023,
+                                "src": "10355:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -57762,33 +58044,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10070:13:7",
+                              "src": "10349:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3226,
+                            "id": 3062,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "10070:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "10349:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10056:36:7",
+                          "src": "10335:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "9972:120:7",
+                        "src": "10251:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -57802,21 +58084,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3205,
+                      "id": 3041,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "9964:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "10243:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3229,
+                    "id": 3065,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57824,15 +58106,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9964:129:7",
+                    "src": "10243:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3230,
+                  "id": 3066,
                   "nodeType": "ExpressionStatement",
-                  "src": "9964:129:7"
+                  "src": "10243:129:6"
                 },
                 {
                   "condition": {
@@ -57841,7 +58123,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 3243,
+                    "id": 3079,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -57850,18 +58132,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3231,
+                        "id": 3067,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "10108:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "10387:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 3232,
+                      "id": 3068,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -57869,7 +58151,7 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "10108:15:7",
+                      "src": "10387:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -57886,26 +58168,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3238,
+                              "id": 3074,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10155:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "10434:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3240,
+                            "id": 3076,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3239,
+                              "id": 3075,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3187,
-                              "src": "10161:6:7",
+                              "referencedDeclaration": 3023,
+                              "src": "10440:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -57916,21 +58198,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10155:13:7",
+                            "src": "10434:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3241,
+                          "id": 3077,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2197,
-                          "src": "10155:22:7",
+                          "referencedDeclaration": 2021,
+                          "src": "10434:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -57950,26 +58232,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3233,
+                              "id": 3069,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10127:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "10406:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3235,
+                            "id": 3071,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3234,
+                              "id": 3070,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3187,
-                              "src": "10133:6:7",
+                              "referencedDeclaration": 3023,
+                              "src": "10412:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -57980,41 +58262,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10127:13:7",
+                            "src": "10406:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3236,
+                          "id": 3072,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2201,
-                          "src": "10127:23:7",
+                          "referencedDeclaration": 2025,
+                          "src": "10406:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3237,
+                        "id": 3073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "10127:27:7",
+                        "referencedDeclaration": 11079,
+                        "src": "10406:27:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3242,
+                      "id": 3078,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -58022,26 +58304,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "10127:51:7",
+                      "src": "10406:51:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10108:70:7",
+                    "src": "10387:70:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3255,
+                  "id": 3091,
                   "nodeType": "IfStatement",
-                  "src": "10104:177:7",
+                  "src": "10383:177:6",
                   "trueBody": {
-                    "id": 3254,
+                    "id": 3090,
                     "nodeType": "Block",
-                    "src": "10180:101:7",
+                    "src": "10459:101:6",
                     "statements": [
                       {
                         "expression": {
@@ -58053,7 +58335,7 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 3251,
+                              "id": 3087,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58064,26 +58346,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3245,
+                                    "id": 3081,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "10231:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "10510:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 3247,
+                                  "id": 3083,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3246,
+                                    "id": 3082,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3187,
-                                    "src": "10237:6:7",
+                                    "referencedDeclaration": 3023,
+                                    "src": "10516:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -58094,21 +58376,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "10231:13:7",
+                                  "src": "10510:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 3248,
+                                "id": 3084,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "10231:24:7",
+                                "referencedDeclaration": 2013,
+                                "src": "10510:24:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -58120,18 +58402,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3249,
+                                  "id": 3085,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "10259:3:7",
+                                  "referencedDeclaration": 11599,
+                                  "src": "10538:3:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 3250,
+                                "id": 3086,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -58139,13 +58421,13 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "10259:10:7",
+                                "src": "10538:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 }
                               },
-                              "src": "10231:38:7",
+                              "src": "10510:38:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -58159,21 +58441,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3244,
+                            "id": 3080,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "10223:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "10502:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3252,
+                          "id": 3088,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -58181,15 +58463,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10223:47:7",
+                          "src": "10502:47:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3253,
+                        "id": 3089,
                         "nodeType": "ExpressionStatement",
-                        "src": "10223:47:7"
+                        "src": "10502:47:6"
                       }
                     ]
                   }
@@ -58200,12 +58482,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3257,
+                        "id": 3093,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10305:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10584:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58213,14 +58495,14 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3258,
+                        "id": 3094,
                         "name": "blacklisted",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3189,
-                        "src": "10313:11:7",
+                        "referencedDeclaration": 3025,
+                        "src": "10592:11:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       }
@@ -58232,22 +58514,22 @@
                           "typeString": "uint256"
                         },
                         {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       ],
-                      "id": 3256,
+                      "id": 3092,
                       "name": "AddToBlacklist",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4931,
-                      "src": "10290:14:7",
+                      "referencedDeclaration": 4767,
+                      "src": "10569:14:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2182_$returns$__$",
+                        "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_enum$_BlacklistPerson_$2006_$returns$__$",
                         "typeString": "function (uint256,enum Market.BlacklistPerson)"
                       }
                     },
-                    "id": 3259,
+                    "id": 3095,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58255,15 +58537,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10290:35:7",
+                    "src": "10569:35:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3260,
+                  "id": 3096,
                   "nodeType": "ExpressionStatement",
-                  "src": "10290:35:7"
+                  "src": "10569:35:6"
                 },
                 {
                   "expression": {
@@ -58271,12 +58553,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3262,
+                        "id": 3098,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10348:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10627:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58290,18 +58572,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3261,
+                      "id": 3097,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4642,
-                      "src": "10335:12:7",
+                      "referencedDeclaration": 4478,
+                      "src": "10614:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3263,
+                    "id": 3099,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58309,15 +58591,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10335:20:7",
+                    "src": "10614:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3264,
+                  "id": 3100,
                   "nodeType": "ExpressionStatement",
-                  "src": "10335:20:7"
+                  "src": "10614:20:6"
                 },
                 {
                   "expression": {
@@ -58325,12 +58607,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3266,
+                        "id": 3102,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10383:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10662:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58344,18 +58626,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3265,
+                      "id": 3101,
                       "name": "InternalCloseDeal",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5004,
-                      "src": "10365:17:7",
+                      "referencedDeclaration": 4840,
+                      "src": "10644:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3267,
+                    "id": 3103,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58363,15 +58645,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10365:25:7",
+                    "src": "10644:25:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3268,
+                  "id": 3104,
                   "nodeType": "ExpressionStatement",
-                  "src": "10365:25:7"
+                  "src": "10644:25:6"
                 },
                 {
                   "expression": {
@@ -58379,12 +58661,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3270,
+                        "id": 3106,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3187,
-                        "src": "10421:6:7",
+                        "referencedDeclaration": 3023,
+                        "src": "10700:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58398,18 +58680,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3269,
+                      "id": 3105,
                       "name": "RefundRemainingFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4828,
-                      "src": "10400:20:7",
+                      "referencedDeclaration": 4664,
+                      "src": "10679:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3271,
+                    "id": 3107,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58417,28 +58699,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10400:28:7",
+                    "src": "10679:28:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3272,
+                  "id": 3108,
                   "nodeType": "ExpressionStatement",
-                  "src": "10400:28:7"
+                  "src": "10679:28:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3273,
+                    "id": 3109,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10445:4:7",
+                    "src": "10724:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -58446,15 +58728,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3193,
-                  "id": 3274,
+                  "functionReturnParameters": 3029,
+                  "id": 3110,
                   "nodeType": "Return",
-                  "src": "10438:11:7"
+                  "src": "10717:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3276,
+            "id": 3112,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -58462,16 +58744,16 @@
             "name": "CloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3190,
+              "id": 3026,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3187,
+                  "id": 3023,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9820:11:7",
+                  "scope": 3112,
+                  "src": "10099:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58479,10 +58761,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3186,
+                    "id": 3022,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9820:4:7",
+                    "src": "10099:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -58493,26 +58775,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 3189,
+                  "id": 3025,
                   "name": "blacklisted",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9833:27:7",
+                  "scope": 3112,
+                  "src": "10112:27:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 3188,
+                    "id": 3024,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2182,
-                    "src": "9833:15:7",
+                    "referencedDeclaration": 2006,
+                    "src": "10112:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -58520,20 +58802,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9819:42:7"
+              "src": "10098:42:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3193,
+              "id": 3029,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3192,
+                  "id": 3028,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3276,
-                  "src": "9878:4:7",
+                  "scope": 3112,
+                  "src": "10157:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58541,10 +58823,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3191,
+                    "id": 3027,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9878:4:7",
+                    "src": "10157:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -58554,19 +58836,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9877:6:7"
+              "src": "10156:6:6"
             },
-            "scope": 5229,
-            "src": "9801:655:7",
+            "scope": 5065,
+            "src": "10080:655:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3293,
+              "id": 3129,
               "nodeType": "Block",
-              "src": "10510:98:7",
+              "src": "10789:98:6",
               "statements": [
                 {
                   "expression": {
@@ -58574,12 +58856,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3284,
+                        "id": 3120,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3278,
-                        "src": "10533:6:7",
+                        "referencedDeclaration": 3114,
+                        "src": "10812:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58593,18 +58875,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3283,
+                      "id": 3119,
                       "name": "InternalBill",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4642,
-                      "src": "10520:12:7",
+                      "referencedDeclaration": 4478,
+                      "src": "10799:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3285,
+                    "id": 3121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58612,15 +58894,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10520:20:7",
+                    "src": "10799:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3286,
+                  "id": 3122,
                   "nodeType": "ExpressionStatement",
-                  "src": "10520:20:7"
+                  "src": "10799:20:6"
                 },
                 {
                   "expression": {
@@ -58628,12 +58910,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3288,
+                        "id": 3124,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3278,
-                        "src": "10573:6:7",
+                        "referencedDeclaration": 3114,
+                        "src": "10852:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -58647,18 +58929,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3287,
+                      "id": 3123,
                       "name": "ReserveNextPeriodFunds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4790,
-                      "src": "10550:22:7",
+                      "referencedDeclaration": 4626,
+                      "src": "10829:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) returns (bool)"
                       }
                     },
-                    "id": 3289,
+                    "id": 3125,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -58666,28 +58948,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10550:30:7",
+                    "src": "10829:30:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3290,
+                  "id": 3126,
                   "nodeType": "ExpressionStatement",
-                  "src": "10550:30:7"
+                  "src": "10829:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3291,
+                    "id": 3127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "10597:4:7",
+                    "src": "10876:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -58695,15 +58977,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3282,
-                  "id": 3292,
+                  "functionReturnParameters": 3118,
+                  "id": 3128,
                   "nodeType": "Return",
-                  "src": "10590:11:7"
+                  "src": "10869:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3294,
+            "id": 3130,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -58711,16 +58993,16 @@
             "name": "Bill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3279,
+              "id": 3115,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3278,
+                  "id": 3114,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3294,
-                  "src": "10476:11:7",
+                  "scope": 3130,
+                  "src": "10755:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58728,10 +59010,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3277,
+                    "id": 3113,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10476:4:7",
+                    "src": "10755:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -58741,20 +59023,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10475:13:7"
+              "src": "10754:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3282,
+              "id": 3118,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3281,
+                  "id": 3117,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3294,
-                  "src": "10505:4:7",
+                  "scope": 3130,
+                  "src": "10784:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -58762,10 +59044,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3280,
+                    "id": 3116,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10505:4:7",
+                    "src": "10784:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -58775,19 +59057,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10504:6:7"
+              "src": "10783:6:6"
             },
-            "scope": 5229,
-            "src": "10462:146:7",
+            "scope": 5065,
+            "src": "10741:146:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3787,
+              "id": 3623,
               "nodeType": "Block",
-              "src": "10727:3974:7",
+              "src": "11006:3974:6",
               "statements": [
                 {
                   "expression": {
@@ -58799,7 +59081,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3328,
+                        "id": 3164,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -58810,7 +59092,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3320,
+                          "id": 3156,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -58821,7 +59103,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3312,
+                            "id": 3148,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -58830,18 +59112,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3306,
+                                "id": 3142,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10745:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "11024:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3307,
+                              "id": 3143,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58849,7 +59131,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10745:10:7",
+                              "src": "11024:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -58863,26 +59145,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3308,
+                                  "id": 3144,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10759:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "11038:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3310,
+                                "id": 3146,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3309,
+                                  "id": 3145,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "10765:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11044:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -58893,27 +59175,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10759:13:7",
+                                "src": "11038:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3311,
+                              "id": 3147,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "10759:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "11038:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10745:38:7",
+                            "src": "11024:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -58927,7 +59209,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3319,
+                            "id": 3155,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -58936,18 +59218,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3313,
+                                "id": 3149,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "10787:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "11066:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3314,
+                              "id": 3150,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -58955,7 +59237,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "10787:10:7",
+                              "src": "11066:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -58969,26 +59251,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3315,
+                                  "id": 3151,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "10801:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "11080:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3317,
+                                "id": 3153,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3316,
+                                  "id": 3152,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "10807:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11086:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -58999,33 +59281,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "10801:13:7",
+                                "src": "11080:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3318,
+                              "id": 3154,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2191,
-                              "src": "10801:22:7",
+                              "referencedDeclaration": 2015,
+                              "src": "11080:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "10787:36:7",
+                            "src": "11066:36:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "10745:78:7",
+                          "src": "11024:78:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -59039,7 +59321,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3327,
+                          "id": 3163,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -59048,18 +59330,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3321,
+                              "id": 3157,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "10827:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "11106:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3322,
+                            "id": 3158,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -59067,7 +59349,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "10827:10:7",
+                            "src": "11106:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -59081,26 +59363,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3323,
+                                "id": 3159,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "10841:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "11120:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3325,
+                              "id": 3161,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3324,
+                                "id": 3160,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "10847:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "11126:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -59111,33 +59393,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10841:13:7",
+                              "src": "11120:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3326,
+                            "id": 3162,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "supplierID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2187,
-                            "src": "10841:24:7",
+                            "referencedDeclaration": 2011,
+                            "src": "11120:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "10827:38:7",
+                          "src": "11106:38:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10745:120:7",
+                        "src": "11024:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -59151,21 +59433,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3305,
+                      "id": 3141,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "10737:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "11016:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3329,
+                    "id": 3165,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59173,15 +59455,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10737:129:7",
+                    "src": "11016:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3330,
+                  "id": 3166,
                   "nodeType": "ExpressionStatement",
-                  "src": "10737:129:7"
+                  "src": "11016:129:6"
                 },
                 {
                   "expression": {
@@ -59190,10 +59472,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 3338,
+                        "id": 3174,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -59204,26 +59486,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3332,
+                              "id": 3168,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "10884:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "11163:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3334,
+                            "id": 3170,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3333,
+                              "id": 3169,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "10890:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "11169:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -59234,23 +59516,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10884:13:7",
+                            "src": "11163:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3335,
+                          "id": 3171,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2205,
-                          "src": "10884:20:7",
+                          "referencedDeclaration": 2029,
+                          "src": "11163:20:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -59260,18 +59542,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3336,
+                            "id": 3172,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "10908:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "11187:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 3337,
+                          "id": 3173,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -59279,13 +59561,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "10908:26:7",
+                          "src": "11187:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "10884:50:7",
+                        "src": "11163:50:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -59299,21 +59581,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3331,
+                      "id": 3167,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "10876:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "11155:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3339,
+                    "id": 3175,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59321,15 +59603,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10876:59:7",
+                    "src": "11155:59:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3340,
+                  "id": 3176,
                   "nodeType": "ExpressionStatement",
-                  "src": "10876:59:7"
+                  "src": "11155:59:6"
                 },
                 {
                   "condition": {
@@ -59337,12 +59619,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3342,
+                        "id": 3178,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3296,
-                        "src": "10957:6:7",
+                        "referencedDeclaration": 3132,
+                        "src": "11236:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -59356,18 +59638,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3341,
+                      "id": 3177,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4843,
-                      "src": "10950:6:7",
+                      "referencedDeclaration": 4679,
+                      "src": "11229:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 3343,
+                    "id": 3179,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59375,20 +59657,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "10950:14:7",
+                    "src": "11229:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3351,
+                  "id": 3187,
                   "nodeType": "IfStatement",
-                  "src": "10946:70:7",
+                  "src": "11225:70:6",
                   "trueBody": {
-                    "id": 3350,
+                    "id": 3186,
                     "nodeType": "Block",
-                    "src": "10966:50:7",
+                    "src": "11245:50:6",
                     "statements": [
                       {
                         "expression": {
@@ -59400,19 +59682,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3347,
+                              "id": 3183,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 3345,
+                                "id": 3181,
                                 "name": "newDuration",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3300,
-                                "src": "10988:11:7",
+                                "referencedDeclaration": 3136,
+                                "src": "11267:11:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -59423,14 +59705,14 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 3346,
+                                "id": 3182,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11003:1:7",
+                                "src": "11282:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -59438,7 +59720,7 @@
                                 },
                                 "value": "0"
                               },
-                              "src": "10988:16:7",
+                              "src": "11267:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -59452,21 +59734,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 3344,
+                            "id": 3180,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
-                            "src": "10980:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "11259:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 3348,
+                          "id": 3184,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -59474,15 +59756,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "10980:25:7",
+                          "src": "11259:25:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3349,
+                        "id": 3185,
                         "nodeType": "ExpressionStatement",
-                        "src": "10980:25:7"
+                        "src": "11259:25:6"
                       }
                     ]
                   }
@@ -59490,19 +59772,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3357,
+                    "id": 3193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 3352,
+                      "id": 3188,
                       "name": "requestsAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2330,
-                      "src": "11026:14:7",
+                      "referencedDeclaration": 2154,
+                      "src": "11305:14:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -59516,14 +59798,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "31",
-                          "id": 3355,
+                          "id": 3191,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "11062:1:7",
+                          "src": "11341:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_1_by_1",
@@ -59541,32 +59823,32 @@
                         ],
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3353,
+                          "id": 3189,
                           "name": "requestsAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2330,
-                          "src": "11043:14:7",
+                          "referencedDeclaration": 2154,
+                          "src": "11322:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3354,
+                        "id": 3190,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "11043:18:7",
+                        "referencedDeclaration": 11079,
+                        "src": "11322:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3356,
+                      "id": 3192,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -59574,47 +59856,47 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11043:21:7",
+                      "src": "11322:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11026:38:7",
+                    "src": "11305:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3358,
+                  "id": 3194,
                   "nodeType": "ExpressionStatement",
-                  "src": "11026:38:7"
+                  "src": "11305:38:6"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3360,
+                      "id": 3196,
                       "name": "requestType",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3788,
-                      "src": "11075:21:7",
+                      "scope": 3624,
+                      "src": "11354:21:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3359,
+                        "id": 3195,
                         "name": "OrderType",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2168,
-                        "src": "11075:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "11354:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -59622,10 +59904,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3361,
+                  "id": 3197,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11075:21:7"
+                  "src": "11354:21:6"
                 },
                 {
                   "condition": {
@@ -59634,7 +59916,7 @@
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     },
-                    "id": 3368,
+                    "id": 3204,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59643,18 +59925,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3362,
+                        "id": 3198,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "11111:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "11390:3:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 3363,
+                      "id": 3199,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -59662,7 +59944,7 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11111:10:7",
+                      "src": "11390:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -59676,26 +59958,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3364,
+                          "id": 3200,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "11125:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "11404:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3366,
+                        "id": 3202,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3365,
+                          "id": 3201,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "11131:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "11410:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59706,55 +59988,55 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11125:13:7",
+                        "src": "11404:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3367,
+                      "id": 3203,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "consumerID",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2189,
-                      "src": "11125:24:7",
+                      "referencedDeclaration": 2013,
+                      "src": "11404:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "11111:38:7",
+                    "src": "11390:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 3380,
+                    "id": 3216,
                     "nodeType": "Block",
-                    "src": "11215:58:7",
+                    "src": "11494:58:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3378,
+                          "id": 3214,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3375,
+                            "id": 3211,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3360,
-                            "src": "11229:11:7",
+                            "referencedDeclaration": 3196,
+                            "src": "11508:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -59764,18 +60046,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3376,
+                              "id": 3212,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2168,
-                              "src": "11243:9:7",
+                              "referencedDeclaration": 1992,
+                              "src": "11522:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 3377,
+                            "id": 3213,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -59783,50 +60065,50 @@
                             "memberName": "ORDER_ASK",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11243:19:7",
+                            "src": "11522:19:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11229:33:7",
+                          "src": "11508:33:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 3379,
+                        "id": 3215,
                         "nodeType": "ExpressionStatement",
-                        "src": "11229:33:7"
+                        "src": "11508:33:6"
                       }
                     ]
                   },
-                  "id": 3381,
+                  "id": 3217,
                   "nodeType": "IfStatement",
-                  "src": "11107:166:7",
+                  "src": "11386:166:6",
                   "trueBody": {
-                    "id": 3374,
+                    "id": 3210,
                     "nodeType": "Block",
-                    "src": "11151:58:7",
+                    "src": "11430:58:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3372,
+                          "id": 3208,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3369,
+                            "id": 3205,
                             "name": "requestType",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3360,
-                            "src": "11165:11:7",
+                            "referencedDeclaration": 3196,
+                            "src": "11444:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
@@ -59836,18 +60118,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3370,
+                              "id": 3206,
                               "name": "OrderType",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2168,
-                              "src": "11179:9:7",
+                              "referencedDeclaration": 1992,
+                              "src": "11458:9:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                                "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                                 "typeString": "type(enum Market.OrderType)"
                               }
                             },
-                            "id": 3371,
+                            "id": 3207,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -59855,21 +60137,21 @@
                             "memberName": "ORDER_BID",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11179:19:7",
+                            "src": "11458:19:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_OrderType_$2168",
+                              "typeIdentifier": "t_enum$_OrderType_$1992",
                               "typeString": "enum Market.OrderType"
                             }
                           },
-                          "src": "11165:33:7",
+                          "src": "11444:33:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
-                        "id": 3373,
+                        "id": 3209,
                         "nodeType": "ExpressionStatement",
-                        "src": "11165:33:7"
+                        "src": "11444:33:6"
                       }
                     ]
                   }
@@ -59877,7 +60159,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3393,
+                    "id": 3229,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -59886,26 +60168,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 3382,
+                        "id": 3218,
                         "name": "requests",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2351,
-                        "src": "11283:8:7",
+                        "referencedDeclaration": 2175,
+                        "src": "11562:8:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                         }
                       },
-                      "id": 3384,
+                      "id": 3220,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 3383,
+                        "id": 3219,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2330,
-                        "src": "11292:14:7",
+                        "referencedDeclaration": 2154,
+                        "src": "11571:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -59916,9 +60198,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "11283:24:7",
+                      "src": "11562:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                         "typeString": "struct Market.ChangeRequest storage ref"
                       }
                     },
@@ -59929,12 +60211,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 3386,
+                          "id": 3222,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "11324:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "11603:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59942,25 +60224,25 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3387,
+                          "id": 3223,
                           "name": "requestType",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3360,
-                          "src": "11332:11:7",
+                          "referencedDeclaration": 3196,
+                          "src": "11611:11:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           }
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3388,
+                          "id": 3224,
                           "name": "newPrice",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3298,
-                          "src": "11345:8:7",
+                          "referencedDeclaration": 3134,
+                          "src": "11624:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59968,12 +60250,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 3389,
+                          "id": 3225,
                           "name": "newDuration",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3300,
-                          "src": "11355:11:7",
+                          "referencedDeclaration": 3136,
+                          "src": "11634:11:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -59983,18 +60265,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3390,
+                            "id": 3226,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2178,
-                            "src": "11368:13:7",
+                            "referencedDeclaration": 2002,
+                            "src": "11647:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 3391,
+                          "id": 3227,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -60002,9 +60284,9 @@
                           "memberName": "REQUEST_CREATED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "11368:29:7",
+                          "src": "11647:29:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         }
@@ -60016,7 +60298,7 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_OrderType_$2168",
+                            "typeIdentifier": "t_enum$_OrderType_$1992",
                             "typeString": "enum Market.OrderType"
                           },
                           {
@@ -60028,22 +60310,22 @@
                             "typeString": "uint256"
                           },
                           {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         ],
-                        "id": 3385,
+                        "id": 3221,
                         "name": "ChangeRequest",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2252,
-                        "src": "11310:13:7",
+                        "referencedDeclaration": 2076,
+                        "src": "11589:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2252_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_ChangeRequest_$2076_storage_ptr_$",
                           "typeString": "type(struct Market.ChangeRequest storage pointer)"
                         }
                       },
-                      "id": 3392,
+                      "id": 3228,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -60051,21 +60333,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11310:88:7",
+                      "src": "11589:88:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory",
                         "typeString": "struct Market.ChangeRequest memory"
                       }
                     },
-                    "src": "11283:115:7",
+                    "src": "11562:115:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
-                  "id": 3394,
+                  "id": 3230,
                   "nodeType": "ExpressionStatement",
-                  "src": "11283:115:7"
+                  "src": "11562:115:6"
                 },
                 {
                   "eventCall": {
@@ -60073,12 +60355,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3396,
+                        "id": 3232,
                         "name": "requestsAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2330,
-                        "src": "11434:14:7",
+                        "referencedDeclaration": 2154,
+                        "src": "11713:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -60092,18 +60374,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 3395,
+                      "id": 3231,
                       "name": "DealChangeRequestSet",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2278,
-                      "src": "11413:20:7",
+                      "referencedDeclaration": 2102,
+                      "src": "11692:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 3397,
+                    "id": 3233,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -60111,38 +60393,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11413:36:7",
+                    "src": "11692:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3398,
+                  "id": 3234,
                   "nodeType": "EmitStatement",
-                  "src": "11408:41:7"
+                  "src": "11687:41:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3402,
+                    "id": 3238,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3399,
+                      "id": 3235,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3360,
-                      "src": "11464:11:7",
+                      "referencedDeclaration": 3196,
+                      "src": "11743:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -60152,18 +60434,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3400,
+                        "id": 3236,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "11479:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "11758:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3401,
+                      "id": 3237,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -60171,26 +60453,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11479:19:7",
+                      "src": "11758:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "11464:34:7",
+                    "src": "11743:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3603,
+                  "id": 3439,
                   "nodeType": "IfStatement",
-                  "src": "11460:1719:7",
+                  "src": "11739:1719:6",
                   "trueBody": {
-                    "id": 3602,
+                    "id": 3438,
                     "nodeType": "Block",
-                    "src": "11500:1679:7",
+                    "src": "11779:1679:6",
                     "statements": [
                       {
                         "eventCall": {
@@ -60202,26 +60484,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3404,
+                                  "id": 3240,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "11544:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "11823:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3406,
+                                "id": 3242,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3405,
+                                  "id": 3241,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11559:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "11838:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60232,24 +60514,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11544:22:7",
+                                "src": "11823:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3408,
+                              "id": 3244,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3407,
+                                "id": 3243,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "11567:1:7",
+                                "src": "11846:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -60262,7 +60544,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11544:25:7",
+                              "src": "11823:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60276,18 +60558,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3403,
+                            "id": 3239,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "11519:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "11798:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3409,
+                          "id": 3245,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60295,20 +60577,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "11519:51:7",
+                          "src": "11798:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3410,
+                        "id": 3246,
                         "nodeType": "EmitStatement",
-                        "src": "11514:56:7"
+                        "src": "11793:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3421,
+                          "id": 3257,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60319,44 +60601,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3411,
+                                "id": 3247,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "11584:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "11863:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3417,
+                              "id": 3253,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3412,
+                                    "id": 3248,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "11593:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "11872:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3414,
+                                  "id": 3250,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3413,
+                                    "id": 3249,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "11608:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "11887:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -60367,24 +60649,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "11593:22:7",
+                                  "src": "11872:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3416,
+                                "id": 3252,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3415,
+                                  "id": 3251,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "11616:1:7",
+                                  "src": "11895:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -60397,7 +60679,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11593:25:7",
+                                "src": "11872:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60408,23 +60690,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11584:35:7",
+                              "src": "11863:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3418,
+                            "id": 3254,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "11584:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "11863:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -60434,18 +60716,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3419,
+                              "id": 3255,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "11629:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "11908:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3420,
+                            "id": 3256,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -60453,26 +60735,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "11629:30:7",
+                            "src": "11908:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "11584:75:7",
+                          "src": "11863:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3422,
+                        "id": 3258,
                         "nodeType": "ExpressionStatement",
-                        "src": "11584:75:7"
+                        "src": "11863:75:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3429,
+                          "id": 3265,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60483,26 +60765,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3423,
+                                "id": 3259,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "11673:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "11952:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3426,
+                              "id": 3262,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3424,
+                                "id": 3260,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "11688:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "11967:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60513,24 +60795,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11673:22:7",
+                              "src": "11952:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3427,
+                            "id": 3263,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3425,
+                              "id": 3261,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11696:1:7",
+                              "src": "11975:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -60543,7 +60825,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "11673:25:7",
+                            "src": "11952:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -60553,54 +60835,54 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3428,
+                            "id": 3264,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "11701:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "11980:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "11673:42:7",
+                          "src": "11952:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3430,
+                        "id": 3266,
                         "nodeType": "ExpressionStatement",
-                        "src": "11673:42:7"
+                        "src": "11952:42:6"
                       },
                       {
                         "assignments": [
-                          3432
+                          3268
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 3432,
+                            "id": 3268,
                             "name": "matchingRequest",
                             "nodeType": "VariableDeclaration",
-                            "scope": 3788,
-                            "src": "11729:36:7",
+                            "scope": 3624,
+                            "src": "12008:36:6",
                             "stateVariable": false,
                             "storageLocation": "memory",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 3431,
+                              "id": 3267,
                               "name": "ChangeRequest",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 2252,
-                              "src": "11729:13:7",
+                              "referencedDeclaration": 2076,
+                              "src": "12008:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                                 "typeString": "struct Market.ChangeRequest"
                               }
                             },
@@ -60608,49 +60890,49 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 3440,
+                        "id": 3276,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3433,
+                            "id": 3269,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "11768:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "12047:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 3439,
+                          "id": 3275,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3434,
+                                "id": 3270,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "11777:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "12056:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3436,
+                              "id": 3272,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3435,
+                                "id": 3271,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "11792:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "12071:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -60661,24 +60943,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11777:22:7",
+                              "src": "12056:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3438,
+                            "id": 3274,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3437,
+                              "id": 3273,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11800:1:7",
+                              "src": "12079:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -60691,7 +60973,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "11777:25:7",
+                            "src": "12056:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -60702,14 +60984,14 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "11768:35:7",
+                          "src": "12047:35:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "11729:74:7"
+                        "src": "12008:74:6"
                       },
                       {
                         "condition": {
@@ -60718,7 +61000,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3453,
+                          "id": 3289,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -60729,19 +61011,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3446,
+                            "id": 3282,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3441,
+                              "id": 3277,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3300,
-                              "src": "11822:11:7",
+                              "referencedDeclaration": 3136,
+                              "src": "12101:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60755,26 +61037,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3442,
+                                  "id": 3278,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "11837:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "12116:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3444,
+                                "id": 3280,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3443,
+                                  "id": 3279,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11843:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "12122:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60785,27 +61067,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11837:13:7",
+                                "src": "12116:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3445,
+                              "id": 3281,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2197,
-                              "src": "11837:22:7",
+                              "referencedDeclaration": 2021,
+                              "src": "12116:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11822:37:7",
+                            "src": "12101:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -60819,19 +61101,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3452,
+                            "id": 3288,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3447,
+                              "id": 3283,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3298,
-                              "src": "11863:8:7",
+                              "referencedDeclaration": 3134,
+                              "src": "12142:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -60845,26 +61127,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3448,
+                                  "id": 3284,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "11874:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "12153:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3450,
+                                "id": 3286,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3449,
+                                  "id": 3285,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "11880:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "12159:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -60875,33 +61157,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "11874:13:7",
+                                "src": "12153:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3451,
+                              "id": 3287,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2199,
-                              "src": "11874:19:7",
+                              "referencedDeclaration": 2023,
+                              "src": "12153:19:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "11863:30:7",
+                            "src": "12142:30:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "11822:71:7",
+                          "src": "12101:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -60914,7 +61196,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 3500,
+                            "id": 3336,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -60925,7 +61207,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 3495,
+                              "id": 3331,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -60933,10 +61215,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 3490,
+                                "id": 3326,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -60945,28 +61227,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3486,
+                                    "id": 3322,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "12190:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "12469:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3487,
+                                  "id": 3323,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "12190:22:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "12469:22:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -60976,18 +61258,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3488,
+                                    "id": 3324,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "12216:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "12495:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3489,
+                                  "id": 3325,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -60995,13 +61277,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "12216:29:7",
+                                  "src": "12495:29:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "12190:55:7",
+                                "src": "12469:55:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -61015,7 +61297,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 3494,
+                                "id": 3330,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -61024,26 +61306,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3491,
+                                    "id": 3327,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "12249:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "12528:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3492,
+                                  "id": 3328,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2249,
-                                  "src": "12249:24:7",
+                                  "referencedDeclaration": 2073,
+                                  "src": "12528:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -61053,24 +61335,24 @@
                                 "operator": ">=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 3493,
+                                  "id": 3329,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3300,
-                                  "src": "12277:11:7",
+                                  "referencedDeclaration": 3136,
+                                  "src": "12556:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12249:39:7",
+                                "src": "12528:39:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "12190:98:7",
+                              "src": "12469:98:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -61084,7 +61366,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3499,
+                              "id": 3335,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -61093,26 +61375,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3496,
+                                  "id": 3332,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3432,
-                                  "src": "12292:15:7",
+                                  "referencedDeclaration": 3268,
+                                  "src": "12571:15:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3497,
+                                "id": 3333,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2247,
-                                "src": "12292:21:7",
+                                "referencedDeclaration": 2071,
+                                "src": "12571:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -61122,67 +61404,67 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 3498,
+                                "id": 3334,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3298,
-                                "src": "12317:8:7",
+                                "referencedDeclaration": 3134,
+                                "src": "12596:8:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "12292:33:7",
+                              "src": "12571:33:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "12190:135:7",
+                            "src": "12469:135:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 3571,
+                            "id": 3407,
                             "nodeType": "Block",
-                            "src": "12899:54:7",
+                            "src": "13178:54:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3569,
+                                  "id": 3405,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2330,
-                                  "src": "12924:14:7",
+                                  "referencedDeclaration": 2154,
+                                  "src": "13203:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 3304,
-                                "id": 3570,
+                                "functionReturnParameters": 3140,
+                                "id": 3406,
                                 "nodeType": "Return",
-                                "src": "12917:21:7"
+                                "src": "13196:21:6"
                               }
                             ]
                           },
-                          "id": 3572,
+                          "id": 3408,
                           "nodeType": "IfStatement",
-                          "src": "12186:767:7",
+                          "src": "12465:767:6",
                           "trueBody": {
-                            "id": 3568,
+                            "id": 3404,
                             "nodeType": "Block",
-                            "src": "12327:566:7",
+                            "src": "12606:566:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3507,
+                                  "id": 3343,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61193,26 +61475,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3501,
+                                        "id": 3337,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "12345:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "12624:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3503,
+                                      "id": 3339,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3502,
+                                        "id": 3338,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2330,
-                                        "src": "12354:14:7",
+                                        "referencedDeclaration": 2154,
+                                        "src": "12633:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61223,23 +61505,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12345:24:7",
+                                      "src": "12624:24:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3504,
+                                    "id": 3340,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "12345:31:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "12624:31:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -61249,18 +61531,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3505,
+                                      "id": 3341,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "12379:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "12658:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3506,
+                                    "id": 3342,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -61268,26 +61550,26 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12379:30:7",
+                                    "src": "12658:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12345:64:7",
+                                  "src": "12624:64:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3508,
+                                "id": 3344,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12345:64:7"
+                                "src": "12624:64:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3519,
+                                  "id": 3355,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61298,44 +61580,44 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3509,
+                                        "id": 3345,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "12427:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "12706:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3515,
+                                      "id": 3351,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
                                           "baseExpression": {
                                             "argumentTypes": null,
-                                            "id": 3510,
+                                            "id": 3346,
                                             "name": "actualRequests",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 2357,
-                                            "src": "12436:14:7",
+                                            "referencedDeclaration": 2181,
+                                            "src": "12715:14:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                               "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                             }
                                           },
-                                          "id": 3512,
+                                          "id": 3348,
                                           "indexExpression": {
                                             "argumentTypes": null,
-                                            "id": 3511,
+                                            "id": 3347,
                                             "name": "dealID",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 3296,
-                                            "src": "12451:6:7",
+                                            "referencedDeclaration": 3132,
+                                            "src": "12730:6:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -61346,24 +61628,24 @@
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "nodeType": "IndexAccess",
-                                          "src": "12436:22:7",
+                                          "src": "12715:22:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                             "typeString": "uint256[2] storage ref"
                                           }
                                         },
-                                        "id": 3514,
+                                        "id": 3350,
                                         "indexExpression": {
                                           "argumentTypes": null,
                                           "hexValue": "30",
-                                          "id": 3513,
+                                          "id": 3349,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": true,
                                           "kind": "number",
                                           "lValueRequested": false,
                                           "nodeType": "Literal",
-                                          "src": "12459:1:7",
+                                          "src": "12738:1:6",
                                           "subdenomination": null,
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_rational_0_by_1",
@@ -61376,7 +61658,7 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12436:25:7",
+                                        "src": "12715:25:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61387,23 +61669,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12427:35:7",
+                                      "src": "12706:35:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3516,
+                                    "id": 3352,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "12427:42:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "12706:42:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -61413,18 +61695,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3517,
+                                      "id": 3353,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "12472:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "12751:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3518,
+                                    "id": 3354,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -61432,21 +61714,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "12472:30:7",
+                                    "src": "12751:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "12427:75:7",
+                                  "src": "12706:75:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3520,
+                                "id": 3356,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12427:75:7"
+                                "src": "12706:75:6"
                               },
                               {
                                 "eventCall": {
@@ -61458,26 +61740,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3522,
+                                          "id": 3358,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2357,
-                                          "src": "12550:14:7",
+                                          "referencedDeclaration": 2181,
+                                          "src": "12829:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 3524,
+                                        "id": 3360,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3523,
+                                          "id": 3359,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3296,
-                                          "src": "12565:6:7",
+                                          "referencedDeclaration": 3132,
+                                          "src": "12844:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -61488,24 +61770,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "12550:22:7",
+                                        "src": "12829:22:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 3526,
+                                      "id": 3362,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "30",
-                                        "id": 3525,
+                                        "id": 3361,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "12573:1:7",
+                                        "src": "12852:1:6",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_0_by_1",
@@ -61518,7 +61800,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12550:25:7",
+                                      "src": "12829:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -61532,18 +61814,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3521,
+                                    "id": 3357,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "12525:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "12804:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3527,
+                                  "id": 3363,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61551,20 +61833,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12525:51:7",
+                                  "src": "12804:51:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3528,
+                                "id": 3364,
                                 "nodeType": "EmitStatement",
-                                "src": "12520:56:7"
+                                "src": "12799:56:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3535,
+                                  "id": 3371,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61575,26 +61857,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3529,
+                                        "id": 3365,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "12594:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "12873:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3532,
+                                      "id": 3368,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3530,
+                                        "id": 3366,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12609:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "12888:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61605,24 +61887,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12594:22:7",
+                                      "src": "12873:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3533,
+                                    "id": 3369,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 3531,
+                                      "id": 3367,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12617:1:7",
+                                      "src": "12896:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -61635,7 +61917,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12594:25:7",
+                                    "src": "12873:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61646,14 +61928,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3534,
+                                    "id": 3370,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12622:1:7",
+                                    "src": "12901:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -61661,20 +61943,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12594:29:7",
+                                  "src": "12873:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3536,
+                                "id": 3372,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12594:29:7"
+                                "src": "12873:29:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3543,
+                                  "id": 3379,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61685,26 +61967,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3537,
+                                        "id": 3373,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "12641:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "12920:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3540,
+                                      "id": 3376,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3538,
+                                        "id": 3374,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12656:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "12935:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61715,24 +61997,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12641:22:7",
+                                      "src": "12920:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3541,
+                                    "id": 3377,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 3539,
+                                      "id": 3375,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "12664:1:7",
+                                      "src": "12943:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -61745,7 +62027,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "12641:25:7",
+                                    "src": "12920:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61756,14 +62038,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3542,
+                                    "id": 3378,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12669:1:7",
+                                    "src": "12948:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -61771,15 +62053,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "12641:29:7",
+                                  "src": "12920:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3544,
+                                "id": 3380,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12641:29:7"
+                                "src": "12920:29:6"
                               },
                               {
                                 "expression": {
@@ -61787,12 +62069,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3546,
+                                      "id": 3382,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12693:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12972:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -61806,18 +62088,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3545,
+                                    "id": 3381,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3294,
-                                    "src": "12688:4:7",
+                                    "referencedDeclaration": 3130,
+                                    "src": "12967:4:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 3547,
+                                  "id": 3383,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61825,20 +62107,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12688:12:7",
+                                  "src": "12967:12:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 3548,
+                                "id": 3384,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12688:12:7"
+                                "src": "12967:12:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3555,
+                                  "id": 3391,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61849,26 +62131,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3549,
+                                        "id": 3385,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "12718:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "12997:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3551,
+                                      "id": 3387,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3550,
+                                        "id": 3386,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12724:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "13003:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61879,21 +62161,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12718:13:7",
+                                      "src": "12997:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3552,
+                                    "id": 3388,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2199,
-                                    "src": "12718:19:7",
+                                    "referencedDeclaration": 2023,
+                                    "src": "12997:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -61905,45 +62187,45 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3553,
+                                      "id": 3389,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3432,
-                                      "src": "12740:15:7",
+                                      "referencedDeclaration": 3268,
+                                      "src": "13019:15:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 3554,
+                                    "id": 3390,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2247,
-                                    "src": "12740:21:7",
+                                    "referencedDeclaration": 2071,
+                                    "src": "13019:21:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12718:43:7",
+                                  "src": "12997:43:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3556,
+                                "id": 3392,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12718:43:7"
+                                "src": "12997:43:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3562,
+                                  "id": 3398,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -61954,26 +62236,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3557,
+                                        "id": 3393,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "12779:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "13058:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3559,
+                                      "id": 3395,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3558,
+                                        "id": 3394,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "12785:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "13064:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -61984,21 +62266,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "12779:13:7",
+                                      "src": "13058:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3560,
+                                    "id": 3396,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2197,
-                                    "src": "12779:22:7",
+                                    "referencedDeclaration": 2021,
+                                    "src": "13058:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62008,26 +62290,26 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 3561,
+                                    "id": 3397,
                                     "name": "newDuration",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3300,
-                                    "src": "12804:11:7",
+                                    "referencedDeclaration": 3136,
+                                    "src": "13083:11:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "12779:36:7",
+                                  "src": "13058:36:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3563,
+                                "id": 3399,
                                 "nodeType": "ExpressionStatement",
-                                "src": "12779:36:7"
+                                "src": "13058:36:6"
                               },
                               {
                                 "eventCall": {
@@ -62035,12 +62317,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3565,
+                                      "id": 3401,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "12863:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "13142:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62054,18 +62336,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3564,
+                                    "id": 3400,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "12838:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "13117:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3566,
+                                  "id": 3402,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -62073,31 +62355,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "12838:40:7",
+                                  "src": "13117:40:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3567,
+                                "id": 3403,
                                 "nodeType": "EmitStatement",
-                                "src": "12833:45:7"
+                                "src": "13112:45:6"
                               }
                             ]
                           }
                         },
-                        "id": 3573,
+                        "id": 3409,
                         "nodeType": "IfStatement",
-                        "src": "11818:1135:7",
+                        "src": "12097:1135:6",
                         "trueBody": {
-                          "id": 3485,
+                          "id": 3321,
                           "nodeType": "Block",
-                          "src": "11895:285:7",
+                          "src": "12174:285:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3460,
+                                "id": 3296,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62108,26 +62390,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3454,
+                                      "id": 3290,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "11913:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "12192:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3456,
+                                    "id": 3292,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3455,
+                                      "id": 3291,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "11922:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "12201:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62138,23 +62420,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "11913:24:7",
+                                    "src": "12192:24:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3457,
+                                  "id": 3293,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "11913:31:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "12192:31:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -62164,18 +62446,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3458,
+                                    "id": 3294,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "11947:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "12226:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3459,
+                                  "id": 3295,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -62183,21 +62465,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "11947:30:7",
+                                  "src": "12226:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "11913:64:7",
+                                "src": "12192:64:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3461,
+                              "id": 3297,
                               "nodeType": "ExpressionStatement",
-                              "src": "11913:64:7"
+                              "src": "12192:64:6"
                             },
                             {
                               "expression": {
@@ -62205,12 +62487,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3463,
+                                    "id": 3299,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "12000:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "12279:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62224,18 +62506,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3462,
+                                  "id": 3298,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3294,
-                                  "src": "11995:4:7",
+                                  "referencedDeclaration": 3130,
+                                  "src": "12274:4:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3464,
+                                "id": 3300,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62243,20 +62525,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "11995:12:7",
+                                "src": "12274:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3465,
+                              "id": 3301,
                               "nodeType": "ExpressionStatement",
-                              "src": "11995:12:7"
+                              "src": "12274:12:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3471,
+                                "id": 3307,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62267,26 +62549,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3466,
+                                      "id": 3302,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "12025:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "12304:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3468,
+                                    "id": 3304,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3467,
+                                      "id": 3303,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12031:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12310:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62297,21 +62579,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12025:13:7",
+                                    "src": "12304:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3469,
+                                  "id": 3305,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "12025:19:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "12304:19:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62321,31 +62603,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3470,
+                                  "id": 3306,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3298,
-                                  "src": "12047:8:7",
+                                  "referencedDeclaration": 3134,
+                                  "src": "12326:8:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "12025:30:7",
+                                "src": "12304:30:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3472,
+                              "id": 3308,
                               "nodeType": "ExpressionStatement",
-                              "src": "12025:30:7"
+                              "src": "12304:30:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3479,
+                                "id": 3315,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62356,26 +62638,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3473,
+                                      "id": 3309,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2357,
-                                      "src": "12073:14:7",
+                                      "referencedDeclaration": 2181,
+                                      "src": "12352:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 3476,
+                                    "id": 3312,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3474,
+                                      "id": 3310,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "12088:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "12367:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -62386,24 +62668,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "12073:22:7",
+                                    "src": "12352:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 3477,
+                                  "id": 3313,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "31",
-                                    "id": 3475,
+                                    "id": 3311,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "12096:1:7",
+                                    "src": "12375:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_1_by_1",
@@ -62416,7 +62698,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "12073:25:7",
+                                  "src": "12352:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62427,14 +62709,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3478,
+                                  "id": 3314,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12101:1:7",
+                                  "src": "12380:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -62442,15 +62724,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "12073:29:7",
+                                "src": "12352:29:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3480,
+                              "id": 3316,
                               "nodeType": "ExpressionStatement",
-                              "src": "12073:29:7"
+                              "src": "12352:29:6"
                             },
                             {
                               "eventCall": {
@@ -62458,12 +62740,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3482,
+                                    "id": 3318,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2330,
-                                    "src": "12150:14:7",
+                                    "referencedDeclaration": 2154,
+                                    "src": "12429:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62477,18 +62759,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3481,
+                                  "id": 3317,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2282,
-                                  "src": "12125:24:7",
+                                  "referencedDeclaration": 2106,
+                                  "src": "12404:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3483,
+                                "id": 3319,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -62496,15 +62778,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "12125:40:7",
+                                "src": "12404:40:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3484,
+                              "id": 3320,
                               "nodeType": "EmitStatement",
-                              "src": "12120:45:7"
+                              "src": "12399:45:6"
                             }
                           ]
                         }
@@ -62512,7 +62794,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3584,
+                          "id": 3420,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62523,44 +62805,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3574,
+                                "id": 3410,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "12967:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "13246:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3580,
+                              "id": 3416,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3575,
+                                    "id": 3411,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "12976:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "13255:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3577,
+                                  "id": 3413,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3576,
+                                    "id": 3412,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "12991:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13270:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -62571,24 +62853,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "12976:22:7",
+                                  "src": "13255:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3579,
+                                "id": 3415,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 3578,
+                                  "id": 3414,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "12999:1:7",
+                                  "src": "13278:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -62601,7 +62883,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "12976:25:7",
+                                "src": "13255:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -62612,23 +62894,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12967:35:7",
+                              "src": "13246:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3581,
+                            "id": 3417,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "12967:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "13246:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -62638,18 +62920,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3582,
+                              "id": 3418,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "13012:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "13291:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3583,
+                            "id": 3419,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -62657,21 +62939,21 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13012:30:7",
+                            "src": "13291:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "12967:75:7",
+                          "src": "13246:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3585,
+                        "id": 3421,
                         "nodeType": "ExpressionStatement",
-                        "src": "12967:75:7"
+                        "src": "13246:75:6"
                       },
                       {
                         "eventCall": {
@@ -62683,26 +62965,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3587,
+                                  "id": 3423,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13086:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13365:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3589,
+                                "id": 3425,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3588,
+                                  "id": 3424,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13101:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13380:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -62713,24 +62995,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13086:22:7",
+                                "src": "13365:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3591,
+                              "id": 3427,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3590,
+                                "id": 3426,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13109:1:7",
+                                "src": "13388:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -62743,7 +63025,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13086:25:7",
+                              "src": "13365:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -62757,18 +63039,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3586,
+                            "id": 3422,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "13061:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "13340:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3592,
+                          "id": 3428,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62776,20 +63058,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13061:51:7",
+                          "src": "13340:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3593,
+                        "id": 3429,
                         "nodeType": "EmitStatement",
-                        "src": "13056:56:7"
+                        "src": "13335:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3600,
+                          "id": 3436,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -62800,26 +63082,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3594,
+                                "id": 3430,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "13126:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "13405:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3597,
+                              "id": 3433,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3595,
+                                "id": 3431,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "13141:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "13420:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -62830,24 +63112,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13126:22:7",
+                              "src": "13405:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3598,
+                            "id": 3434,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3596,
+                              "id": 3432,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13149:1:7",
+                              "src": "13428:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -62860,7 +63142,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13126:25:7",
+                            "src": "13405:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -62870,26 +63152,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3599,
+                            "id": 3435,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "13154:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "13433:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13126:42:7",
+                          "src": "13405:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3601,
+                        "id": 3437,
                         "nodeType": "ExpressionStatement",
-                        "src": "13126:42:7"
+                        "src": "13405:42:6"
                       }
                     ]
                   }
@@ -62898,24 +63180,24 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3607,
+                    "id": 3443,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 3604,
+                      "id": 3440,
                       "name": "requestType",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3360,
-                      "src": "13193:11:7",
+                      "referencedDeclaration": 3196,
+                      "src": "13472:11:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -62925,18 +63207,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3605,
+                        "id": 3441,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "13208:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "13487:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3606,
+                      "id": 3442,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -62944,26 +63226,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "13208:19:7",
+                      "src": "13487:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "13193:34:7",
+                    "src": "13472:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3768,
+                  "id": 3604,
                   "nodeType": "IfStatement",
-                  "src": "13189:1389:7",
+                  "src": "13468:1389:6",
                   "trueBody": {
-                    "id": 3767,
+                    "id": 3603,
                     "nodeType": "Block",
-                    "src": "13229:1349:7",
+                    "src": "13508:1349:6",
                     "statements": [
                       {
                         "eventCall": {
@@ -62975,26 +63257,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3609,
+                                  "id": 3445,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13273:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13552:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3611,
+                                "id": 3447,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3610,
+                                  "id": 3446,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13288:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13567:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63005,24 +63287,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13273:22:7",
+                                "src": "13552:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3613,
+                              "id": 3449,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "30",
-                                "id": 3612,
+                                "id": 3448,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13296:1:7",
+                                "src": "13575:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_0_by_1",
@@ -63035,7 +63317,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13273:25:7",
+                              "src": "13552:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63049,18 +63331,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3608,
+                            "id": 3444,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "13248:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "13527:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3614,
+                          "id": 3450,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63068,20 +63350,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "13248:51:7",
+                          "src": "13527:51:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3615,
+                        "id": 3451,
                         "nodeType": "EmitStatement",
-                        "src": "13243:56:7"
+                        "src": "13522:56:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3626,
+                          "id": 3462,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63092,44 +63374,44 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3616,
+                                "id": 3452,
                                 "name": "requests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2351,
-                                "src": "13313:8:7",
+                                "referencedDeclaration": 2175,
+                                "src": "13592:8:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                 }
                               },
-                              "id": 3622,
+                              "id": 3458,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 3617,
+                                    "id": 3453,
                                     "name": "actualRequests",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2357,
-                                    "src": "13322:14:7",
+                                    "referencedDeclaration": 2181,
+                                    "src": "13601:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                       "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                     }
                                   },
-                                  "id": 3619,
+                                  "id": 3455,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 3618,
+                                    "id": 3454,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "13337:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13616:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -63140,24 +63422,24 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "13322:22:7",
+                                  "src": "13601:22:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                     "typeString": "uint256[2] storage ref"
                                   }
                                 },
-                                "id": 3621,
+                                "id": 3457,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3620,
+                                  "id": 3456,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13345:1:7",
+                                  "src": "13624:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -63170,7 +63452,7 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13322:25:7",
+                                "src": "13601:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63181,23 +63463,23 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13313:35:7",
+                              "src": "13592:35:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                 "typeString": "struct Market.ChangeRequest storage ref"
                               }
                             },
-                            "id": 3623,
+                            "id": 3459,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2251,
-                            "src": "13313:42:7",
+                            "referencedDeclaration": 2075,
+                            "src": "13592:42:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
@@ -63207,18 +63489,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3624,
+                              "id": 3460,
                               "name": "RequestStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2178,
-                              "src": "13358:13:7",
+                              "referencedDeclaration": 2002,
+                              "src": "13637:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                 "typeString": "type(enum Market.RequestStatus)"
                               }
                             },
-                            "id": 3625,
+                            "id": 3461,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -63226,26 +63508,26 @@
                             "memberName": "REQUEST_CANCELED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "13358:30:7",
+                            "src": "13637:30:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                              "typeIdentifier": "t_enum$_RequestStatus_$2002",
                               "typeString": "enum Market.RequestStatus"
                             }
                           },
-                          "src": "13313:75:7",
+                          "src": "13592:75:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "id": 3627,
+                        "id": 3463,
                         "nodeType": "ExpressionStatement",
-                        "src": "13313:75:7"
+                        "src": "13592:75:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3634,
+                          "id": 3470,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63256,26 +63538,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3628,
+                                "id": 3464,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "13402:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "13681:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3631,
+                              "id": 3467,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 3629,
+                                "id": 3465,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3296,
-                                "src": "13417:6:7",
+                                "referencedDeclaration": 3132,
+                                "src": "13696:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63286,24 +63568,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13402:22:7",
+                              "src": "13681:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3632,
+                            "id": 3468,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3630,
+                              "id": 3466,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "13425:1:7",
+                              "src": "13704:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -63316,7 +63598,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "13402:25:7",
+                            "src": "13681:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -63326,45 +63608,45 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 3633,
+                            "id": 3469,
                             "name": "requestsAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2330,
-                            "src": "13430:14:7",
+                            "referencedDeclaration": 2154,
+                            "src": "13709:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "13402:42:7",
+                          "src": "13681:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3635,
+                        "id": 3471,
                         "nodeType": "ExpressionStatement",
-                        "src": "13402:42:7"
+                        "src": "13681:42:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3644,
+                          "id": 3480,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 3636,
+                            "id": 3472,
                             "name": "matchingRequest",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3432,
-                            "src": "13458:15:7",
+                            "referencedDeclaration": 3268,
+                            "src": "13737:15:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
@@ -63374,44 +63656,44 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3637,
+                              "id": 3473,
                               "name": "requests",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2351,
-                              "src": "13476:8:7",
+                              "referencedDeclaration": 2175,
+                              "src": "13755:8:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                               }
                             },
-                            "id": 3643,
+                            "id": 3479,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3638,
+                                  "id": 3474,
                                   "name": "actualRequests",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2357,
-                                  "src": "13485:14:7",
+                                  "referencedDeclaration": 2181,
+                                  "src": "13764:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                     "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                   }
                                 },
-                                "id": 3640,
+                                "id": 3476,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3639,
+                                  "id": 3475,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13500:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13779:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63422,24 +63704,24 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13485:22:7",
+                                "src": "13764:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                   "typeString": "uint256[2] storage ref"
                                 }
                               },
-                              "id": 3642,
+                              "id": 3478,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "31",
-                                "id": 3641,
+                                "id": 3477,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "number",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "13508:1:7",
+                                "src": "13787:1:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_rational_1_by_1",
@@ -63452,7 +63734,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "13485:25:7",
+                              "src": "13764:25:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63463,21 +63745,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "13476:35:7",
+                            "src": "13755:35:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                               "typeString": "struct Market.ChangeRequest storage ref"
                             }
                           },
-                          "src": "13458:53:7",
+                          "src": "13737:53:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                             "typeString": "struct Market.ChangeRequest memory"
                           }
                         },
-                        "id": 3645,
+                        "id": 3481,
                         "nodeType": "ExpressionStatement",
-                        "src": "13458:53:7"
+                        "src": "13737:53:6"
                       },
                       {
                         "condition": {
@@ -63486,7 +63768,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3658,
+                          "id": 3494,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -63497,19 +63779,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3651,
+                            "id": 3487,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3646,
+                              "id": 3482,
                               "name": "newDuration",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3300,
-                              "src": "13530:11:7",
+                              "referencedDeclaration": 3136,
+                              "src": "13809:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63523,26 +63805,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3647,
+                                  "id": 3483,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "13545:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "13824:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3649,
+                                "id": 3485,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3648,
+                                  "id": 3484,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13551:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13830:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63553,27 +63835,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13545:13:7",
+                                "src": "13824:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3650,
+                              "id": 3486,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "duration",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2197,
-                              "src": "13545:22:7",
+                              "referencedDeclaration": 2021,
+                              "src": "13824:22:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13530:37:7",
+                            "src": "13809:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -63587,19 +63869,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 3657,
+                            "id": 3493,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 3652,
+                              "id": 3488,
                               "name": "newPrice",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3298,
-                              "src": "13571:8:7",
+                              "referencedDeclaration": 3134,
+                              "src": "13850:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -63613,26 +63895,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3653,
+                                  "id": 3489,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "13582:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "13861:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3655,
+                                "id": 3491,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 3654,
+                                  "id": 3490,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3296,
-                                  "src": "13588:6:7",
+                                  "referencedDeclaration": 3132,
+                                  "src": "13867:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63643,33 +63925,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "13582:13:7",
+                                "src": "13861:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3656,
+                              "id": 3492,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "price",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2199,
-                              "src": "13582:19:7",
+                              "referencedDeclaration": 2023,
+                              "src": "13861:19:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "13571:30:7",
+                            "src": "13850:30:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "13530:71:7",
+                          "src": "13809:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -63682,7 +63964,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 3705,
+                            "id": 3541,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -63693,7 +63975,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 3700,
+                              "id": 3536,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -63701,10 +63983,10 @@
                               "leftExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 },
-                                "id": 3695,
+                                "id": 3531,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -63713,28 +63995,28 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3691,
+                                    "id": 3527,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "13898:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "14177:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3692,
+                                  "id": 3528,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "13898:22:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "14177:22:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -63744,18 +64026,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3693,
+                                    "id": 3529,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "13924:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "14203:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3694,
+                                  "id": 3530,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -63763,13 +64045,13 @@
                                   "memberName": "REQUEST_CREATED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13924:29:7",
+                                  "src": "14203:29:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13898:55:7",
+                                "src": "14177:55:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -63783,7 +64065,7 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 3699,
+                                "id": 3535,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -63792,26 +64074,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3696,
+                                    "id": 3532,
                                     "name": "matchingRequest",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3432,
-                                    "src": "13957:15:7",
+                                    "referencedDeclaration": 3268,
+                                    "src": "14236:15:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3697,
+                                  "id": 3533,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "duration",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2249,
-                                  "src": "13957:24:7",
+                                  "referencedDeclaration": 2073,
+                                  "src": "14236:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -63821,24 +64103,24 @@
                                 "operator": "<=",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 3698,
+                                  "id": 3534,
                                   "name": "newDuration",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3300,
-                                  "src": "13985:11:7",
+                                  "referencedDeclaration": 3136,
+                                  "src": "14264:11:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13957:39:7",
+                                "src": "14236:39:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "13898:98:7",
+                              "src": "14177:98:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -63852,7 +64134,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 3704,
+                              "id": 3540,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -63861,26 +64143,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3701,
+                                  "id": 3537,
                                   "name": "matchingRequest",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3432,
-                                  "src": "14000:15:7",
+                                  "referencedDeclaration": 3268,
+                                  "src": "14279:15:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3702,
+                                "id": 3538,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "price",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2247,
-                                "src": "14000:21:7",
+                                "referencedDeclaration": 2071,
+                                "src": "14279:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -63890,67 +64172,67 @@
                               "operator": ">=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 3703,
+                                "id": 3539,
                                 "name": "newPrice",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3298,
-                                "src": "14025:8:7",
+                                "referencedDeclaration": 3134,
+                                "src": "14304:8:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "14000:33:7",
+                              "src": "14279:33:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "13898:135:7",
+                            "src": "14177:135:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
                           "falseBody": {
-                            "id": 3764,
+                            "id": 3600,
                             "nodeType": "Block",
-                            "src": "14514:54:7",
+                            "src": "14793:54:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3762,
+                                  "id": 3598,
                                   "name": "requestsAmount",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2330,
-                                  "src": "14539:14:7",
+                                  "referencedDeclaration": 2154,
+                                  "src": "14818:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "functionReturnParameters": 3304,
-                                "id": 3763,
+                                "functionReturnParameters": 3140,
+                                "id": 3599,
                                 "nodeType": "Return",
-                                "src": "14532:21:7"
+                                "src": "14811:21:6"
                               }
                             ]
                           },
-                          "id": 3765,
+                          "id": 3601,
                           "nodeType": "IfStatement",
-                          "src": "13894:674:7",
+                          "src": "14173:674:6",
                           "trueBody": {
-                            "id": 3761,
+                            "id": 3597,
                             "nodeType": "Block",
-                            "src": "14035:473:7",
+                            "src": "14314:473:6",
                             "statements": [
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3712,
+                                  "id": 3548,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -63961,26 +64243,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3706,
+                                        "id": 3542,
                                         "name": "requests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2351,
-                                        "src": "14053:8:7",
+                                        "referencedDeclaration": 2175,
+                                        "src": "14332:8:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                         }
                                       },
-                                      "id": 3708,
+                                      "id": 3544,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3707,
+                                        "id": 3543,
                                         "name": "requestsAmount",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2330,
-                                        "src": "14062:14:7",
+                                        "referencedDeclaration": 2154,
+                                        "src": "14341:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -63991,23 +64273,23 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14053:24:7",
+                                      "src": "14332:24:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                         "typeString": "struct Market.ChangeRequest storage ref"
                                       }
                                     },
-                                    "id": 3709,
+                                    "id": 3545,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "status",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2251,
-                                    "src": "14053:31:7",
+                                    "referencedDeclaration": 2075,
+                                    "src": "14332:31:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
@@ -64017,18 +64299,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3710,
+                                      "id": 3546,
                                       "name": "RequestStatus",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2178,
-                                      "src": "14087:13:7",
+                                      "referencedDeclaration": 2002,
+                                      "src": "14366:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                        "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                         "typeString": "type(enum Market.RequestStatus)"
                                       }
                                     },
-                                    "id": 3711,
+                                    "id": 3547,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
@@ -64036,21 +64318,21 @@
                                     "memberName": "REQUEST_ACCEPTED",
                                     "nodeType": "MemberAccess",
                                     "referencedDeclaration": null,
-                                    "src": "14087:30:7",
+                                    "src": "14366:30:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                       "typeString": "enum Market.RequestStatus"
                                     }
                                   },
-                                  "src": "14053:64:7",
+                                  "src": "14332:64:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "id": 3713,
+                                "id": 3549,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14053:64:7"
+                                "src": "14332:64:6"
                               },
                               {
                                 "eventCall": {
@@ -64062,26 +64344,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 3715,
+                                          "id": 3551,
                                           "name": "actualRequests",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2357,
-                                          "src": "14165:14:7",
+                                          "referencedDeclaration": 2181,
+                                          "src": "14444:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                             "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                           }
                                         },
-                                        "id": 3717,
+                                        "id": 3553,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 3716,
+                                          "id": 3552,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 3296,
-                                          "src": "14180:6:7",
+                                          "referencedDeclaration": 3132,
+                                          "src": "14459:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -64092,24 +64374,24 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "14165:22:7",
+                                        "src": "14444:22:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                           "typeString": "uint256[2] storage ref"
                                         }
                                       },
-                                      "id": 3719,
+                                      "id": 3555,
                                       "indexExpression": {
                                         "argumentTypes": null,
                                         "hexValue": "31",
-                                        "id": 3718,
+                                        "id": 3554,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": true,
                                         "kind": "number",
                                         "lValueRequested": false,
                                         "nodeType": "Literal",
-                                        "src": "14188:1:7",
+                                        "src": "14467:1:6",
                                         "subdenomination": null,
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_rational_1_by_1",
@@ -64122,7 +64404,7 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14165:25:7",
+                                      "src": "14444:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64136,18 +64418,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3714,
+                                    "id": 3550,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "14140:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "14419:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3720,
+                                  "id": 3556,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64155,20 +64437,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14140:51:7",
+                                  "src": "14419:51:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3721,
+                                "id": 3557,
                                 "nodeType": "EmitStatement",
-                                "src": "14135:56:7"
+                                "src": "14414:56:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3728,
+                                  "id": 3564,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64179,26 +64461,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3722,
+                                        "id": 3558,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "14209:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "14488:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3725,
+                                      "id": 3561,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3723,
+                                        "id": 3559,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14224:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14503:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64209,24 +64491,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14209:22:7",
+                                      "src": "14488:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3726,
+                                    "id": 3562,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "30",
-                                      "id": 3724,
+                                      "id": 3560,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14232:1:7",
+                                      "src": "14511:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_0_by_1",
@@ -64239,7 +64521,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14209:25:7",
+                                    "src": "14488:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64250,14 +64532,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3727,
+                                    "id": 3563,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14237:1:7",
+                                    "src": "14516:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -64265,20 +64547,20 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14209:29:7",
+                                  "src": "14488:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3729,
+                                "id": 3565,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14209:29:7"
+                                "src": "14488:29:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3736,
+                                  "id": 3572,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64289,26 +64571,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3730,
+                                        "id": 3566,
                                         "name": "actualRequests",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2357,
-                                        "src": "14256:14:7",
+                                        "referencedDeclaration": 2181,
+                                        "src": "14535:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                           "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                         }
                                       },
-                                      "id": 3733,
+                                      "id": 3569,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3731,
+                                        "id": 3567,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14271:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14550:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64319,24 +64601,24 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14256:22:7",
+                                      "src": "14535:22:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                         "typeString": "uint256[2] storage ref"
                                       }
                                     },
-                                    "id": 3734,
+                                    "id": 3570,
                                     "indexExpression": {
                                       "argumentTypes": null,
                                       "hexValue": "31",
-                                      "id": 3732,
+                                      "id": 3568,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": true,
                                       "kind": "number",
                                       "lValueRequested": false,
                                       "nodeType": "Literal",
-                                      "src": "14279:1:7",
+                                      "src": "14558:1:6",
                                       "subdenomination": null,
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_rational_1_by_1",
@@ -64349,7 +64631,7 @@
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "nodeType": "IndexAccess",
-                                    "src": "14256:25:7",
+                                    "src": "14535:25:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64360,14 +64642,14 @@
                                   "rightHandSide": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3735,
+                                    "id": 3571,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "14284:1:7",
+                                    "src": "14563:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -64375,15 +64657,15 @@
                                     },
                                     "value": "0"
                                   },
-                                  "src": "14256:29:7",
+                                  "src": "14535:29:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3737,
+                                "id": 3573,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14256:29:7"
+                                "src": "14535:29:6"
                               },
                               {
                                 "expression": {
@@ -64391,12 +64673,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3739,
+                                      "id": 3575,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "14308:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14587:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64410,18 +64692,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3738,
+                                    "id": 3574,
                                     "name": "Bill",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3294,
-                                    "src": "14303:4:7",
+                                    "referencedDeclaration": 3130,
+                                    "src": "14582:4:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                       "typeString": "function (uint256) returns (bool)"
                                     }
                                   },
-                                  "id": 3740,
+                                  "id": 3576,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64429,20 +64711,20 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14303:12:7",
+                                  "src": "14582:12:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
                                   }
                                 },
-                                "id": 3741,
+                                "id": 3577,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14303:12:7"
+                                "src": "14582:12:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3747,
+                                  "id": 3583,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64453,26 +64735,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3742,
+                                        "id": 3578,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "14333:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "14612:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3744,
+                                      "id": 3580,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3743,
+                                        "id": 3579,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14339:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14618:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64483,21 +64765,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14333:13:7",
+                                      "src": "14612:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3745,
+                                    "id": 3581,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "price",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2199,
-                                    "src": "14333:19:7",
+                                    "referencedDeclaration": 2023,
+                                    "src": "14612:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64507,31 +64789,31 @@
                                   "operator": "=",
                                   "rightHandSide": {
                                     "argumentTypes": null,
-                                    "id": 3746,
+                                    "id": 3582,
                                     "name": "newPrice",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3298,
-                                    "src": "14355:8:7",
+                                    "referencedDeclaration": 3134,
+                                    "src": "14634:8:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14333:30:7",
+                                  "src": "14612:30:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3748,
+                                "id": 3584,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14333:30:7"
+                                "src": "14612:30:6"
                               },
                               {
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3755,
+                                  "id": 3591,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64542,26 +64824,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 3749,
+                                        "id": 3585,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "14381:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "14660:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 3751,
+                                      "id": 3587,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 3750,
+                                        "id": 3586,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 3296,
-                                        "src": "14387:6:7",
+                                        "referencedDeclaration": 3132,
+                                        "src": "14666:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -64572,21 +64854,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "14381:13:7",
+                                      "src": "14660:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 3752,
+                                    "id": 3588,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": true,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2197,
-                                    "src": "14381:22:7",
+                                    "referencedDeclaration": 2021,
+                                    "src": "14660:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64598,40 +64880,40 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 3753,
+                                      "id": 3589,
                                       "name": "matchingRequest",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3432,
-                                      "src": "14406:15:7",
+                                      "referencedDeclaration": 3268,
+                                      "src": "14685:15:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                         "typeString": "struct Market.ChangeRequest memory"
                                       }
                                     },
-                                    "id": 3754,
+                                    "id": 3590,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "duration",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2249,
-                                    "src": "14406:24:7",
+                                    "referencedDeclaration": 2073,
+                                    "src": "14685:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
                                     }
                                   },
-                                  "src": "14381:49:7",
+                                  "src": "14660:49:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "id": 3756,
+                                "id": 3592,
                                 "nodeType": "ExpressionStatement",
-                                "src": "14381:49:7"
+                                "src": "14660:49:6"
                               },
                               {
                                 "eventCall": {
@@ -64639,12 +64921,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 3758,
+                                      "id": 3594,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "14478:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "14757:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64658,18 +64940,18 @@
                                         "typeString": "uint256"
                                       }
                                     ],
-                                    "id": 3757,
+                                    "id": 3593,
                                     "name": "DealChangeRequestUpdated",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2282,
-                                    "src": "14453:24:7",
+                                    "referencedDeclaration": 2106,
+                                    "src": "14732:24:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                       "typeString": "function (uint256)"
                                     }
                                   },
-                                  "id": 3759,
+                                  "id": 3595,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -64677,31 +64959,31 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "14453:40:7",
+                                  "src": "14732:40:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_tuple$__$",
                                     "typeString": "tuple()"
                                   }
                                 },
-                                "id": 3760,
+                                "id": 3596,
                                 "nodeType": "EmitStatement",
-                                "src": "14448:45:7"
+                                "src": "14727:45:6"
                               }
                             ]
                           }
                         },
-                        "id": 3766,
+                        "id": 3602,
                         "nodeType": "IfStatement",
-                        "src": "13526:1042:7",
+                        "src": "13805:1042:6",
                         "trueBody": {
-                          "id": 3690,
+                          "id": 3526,
                           "nodeType": "Block",
-                          "src": "13603:285:7",
+                          "src": "13882:285:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3665,
+                                "id": 3501,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64712,26 +64994,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3659,
+                                      "id": 3495,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "13621:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "13900:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3661,
+                                    "id": 3497,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3660,
+                                      "id": 3496,
                                       "name": "requestsAmount",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2330,
-                                      "src": "13630:14:7",
+                                      "referencedDeclaration": 2154,
+                                      "src": "13909:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64742,23 +65024,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13621:24:7",
+                                    "src": "13900:24:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3662,
+                                  "id": 3498,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "13621:31:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "13900:31:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -64768,18 +65050,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3663,
+                                    "id": 3499,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "13655:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "13934:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3664,
+                                  "id": 3500,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -64787,21 +65069,21 @@
                                   "memberName": "REQUEST_ACCEPTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "13655:30:7",
+                                  "src": "13934:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "13621:64:7",
+                                "src": "13900:64:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3666,
+                              "id": 3502,
                               "nodeType": "ExpressionStatement",
-                              "src": "13621:64:7"
+                              "src": "13900:64:6"
                             },
                             {
                               "expression": {
@@ -64809,12 +65091,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3668,
+                                    "id": 3504,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3296,
-                                    "src": "13708:6:7",
+                                    "referencedDeclaration": 3132,
+                                    "src": "13987:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -64828,18 +65110,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3667,
+                                  "id": 3503,
                                   "name": "Bill",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3294,
-                                  "src": "13703:4:7",
+                                  "referencedDeclaration": 3130,
+                                  "src": "13982:4:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 3669,
+                                "id": 3505,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64847,20 +65129,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13703:12:7",
+                                "src": "13982:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 3670,
+                              "id": 3506,
                               "nodeType": "ExpressionStatement",
-                              "src": "13703:12:7"
+                              "src": "13982:12:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3676,
+                                "id": 3512,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64871,26 +65153,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3671,
+                                      "id": 3507,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "13733:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "14012:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 3673,
+                                    "id": 3509,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3672,
+                                      "id": 3508,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "13739:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14018:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64901,21 +65183,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13733:13:7",
+                                    "src": "14012:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 3674,
+                                  "id": 3510,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "13733:19:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "14012:19:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -64925,31 +65207,31 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 3675,
+                                  "id": 3511,
                                   "name": "newPrice",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3298,
-                                  "src": "13755:8:7",
+                                  "referencedDeclaration": 3134,
+                                  "src": "14034:8:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "13733:30:7",
+                                "src": "14012:30:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3677,
+                              "id": 3513,
                               "nodeType": "ExpressionStatement",
-                              "src": "13733:30:7"
+                              "src": "14012:30:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3684,
+                                "id": 3520,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -64960,26 +65242,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3678,
+                                      "id": 3514,
                                       "name": "actualRequests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2357,
-                                      "src": "13781:14:7",
+                                      "referencedDeclaration": 2181,
+                                      "src": "14060:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                         "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                       }
                                     },
-                                    "id": 3681,
+                                    "id": 3517,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3679,
+                                      "id": 3515,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3296,
-                                      "src": "13796:6:7",
+                                      "referencedDeclaration": 3132,
+                                      "src": "14075:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -64990,24 +65272,24 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "13781:22:7",
+                                    "src": "14060:22:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                       "typeString": "uint256[2] storage ref"
                                     }
                                   },
-                                  "id": 3682,
+                                  "id": 3518,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "hexValue": "30",
-                                    "id": 3680,
+                                    "id": 3516,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": true,
                                     "kind": "number",
                                     "lValueRequested": false,
                                     "nodeType": "Literal",
-                                    "src": "13804:1:7",
+                                    "src": "14083:1:6",
                                     "subdenomination": null,
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_rational_0_by_1",
@@ -65020,7 +65302,7 @@
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "nodeType": "IndexAccess",
-                                  "src": "13781:25:7",
+                                  "src": "14060:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65031,14 +65313,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 3683,
+                                  "id": 3519,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "13809:1:7",
+                                  "src": "14088:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -65046,15 +65328,15 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "13781:29:7",
+                                "src": "14060:29:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 3685,
+                              "id": 3521,
                               "nodeType": "ExpressionStatement",
-                              "src": "13781:29:7"
+                              "src": "14060:29:6"
                             },
                             {
                               "eventCall": {
@@ -65062,12 +65344,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 3687,
+                                    "id": 3523,
                                     "name": "requestsAmount",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2330,
-                                    "src": "13858:14:7",
+                                    "referencedDeclaration": 2154,
+                                    "src": "14137:14:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -65081,18 +65363,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 3686,
+                                  "id": 3522,
                                   "name": "DealChangeRequestUpdated",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2282,
-                                  "src": "13833:24:7",
+                                  "referencedDeclaration": 2106,
+                                  "src": "14112:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 3688,
+                                "id": 3524,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -65100,15 +65382,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "13833:40:7",
+                                "src": "14112:40:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 3689,
+                              "id": 3525,
                               "nodeType": "EmitStatement",
-                              "src": "13828:45:7"
+                              "src": "14107:45:6"
                             }
                           ]
                         }
@@ -65119,7 +65401,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3783,
+                    "id": 3619,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -65130,26 +65412,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3769,
+                          "id": 3605,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "14588:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "14867:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 3771,
+                        "id": 3607,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3770,
+                          "id": 3606,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3296,
-                          "src": "14594:6:7",
+                          "referencedDeclaration": 3132,
+                          "src": "14873:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -65160,21 +65442,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "14588:13:7",
+                        "src": "14867:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 3772,
+                      "id": 3608,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2203,
-                      "src": "14588:21:7",
+                      "referencedDeclaration": 2027,
+                      "src": "14867:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -65191,26 +65473,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3778,
+                              "id": 3614,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "14640:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "14919:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3780,
+                            "id": 3616,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3779,
+                              "id": 3615,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "14646:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "14925:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -65221,21 +65503,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14640:13:7",
+                            "src": "14919:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3781,
+                          "id": 3617,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "duration",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2197,
-                          "src": "14640:22:7",
+                          "referencedDeclaration": 2021,
+                          "src": "14919:22:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -65255,26 +65537,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3773,
+                              "id": 3609,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "14612:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "14891:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 3775,
+                            "id": 3611,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3774,
+                              "id": 3610,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3296,
-                              "src": "14618:6:7",
+                              "referencedDeclaration": 3132,
+                              "src": "14897:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -65285,41 +65567,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "14612:13:7",
+                            "src": "14891:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 3776,
+                          "id": 3612,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "startTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2201,
-                          "src": "14612:23:7",
+                          "referencedDeclaration": 2025,
+                          "src": "14891:23:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3777,
+                        "id": 3613,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "14612:27:7",
+                        "referencedDeclaration": 11079,
+                        "src": "14891:27:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 3782,
+                      "id": 3618,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -65327,45 +65609,45 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "14612:51:7",
+                      "src": "14891:51:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "14588:75:7",
+                    "src": "14867:75:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 3784,
+                  "id": 3620,
                   "nodeType": "ExpressionStatement",
-                  "src": "14588:75:7"
+                  "src": "14867:75:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3785,
+                    "id": 3621,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2330,
-                    "src": "14680:14:7",
+                    "referencedDeclaration": 2154,
+                    "src": "14959:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 3304,
-                  "id": 3786,
+                  "functionReturnParameters": 3140,
+                  "id": 3622,
                   "nodeType": "Return",
-                  "src": "14673:21:7"
+                  "src": "14952:21:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3788,
+            "id": 3624,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -65373,16 +65655,16 @@
             "name": "CreateChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3301,
+              "id": 3137,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3296,
+                  "id": 3132,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10643:11:7",
+                  "scope": 3624,
+                  "src": "10922:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65390,10 +65672,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3295,
+                    "id": 3131,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10643:4:7",
+                    "src": "10922:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65404,11 +65686,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3298,
+                  "id": 3134,
                   "name": "newPrice",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10656:13:7",
+                  "scope": 3624,
+                  "src": "10935:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65416,10 +65698,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3297,
+                    "id": 3133,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10656:4:7",
+                    "src": "10935:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65430,11 +65712,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3300,
+                  "id": 3136,
                   "name": "newDuration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10671:16:7",
+                  "scope": 3624,
+                  "src": "10950:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65442,10 +65724,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3299,
+                    "id": 3135,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10671:4:7",
+                    "src": "10950:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65455,20 +65737,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10642:46:7"
+              "src": "10921:46:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3304,
+              "id": 3140,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3303,
+                  "id": 3139,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3788,
-                  "src": "10705:20:7",
+                  "scope": 3624,
+                  "src": "10984:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -65476,10 +65758,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3302,
+                    "id": 3138,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10705:4:7",
+                    "src": "10984:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -65489,47 +65771,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10704:22:7"
+              "src": "10983:22:6"
             },
-            "scope": 5229,
-            "src": "10614:4087:7",
+            "scope": 5065,
+            "src": "10893:4087:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3934,
+              "id": 3770,
               "nodeType": "Block",
-              "src": "14780:1218:7",
+              "src": "15059:1265:6",
               "statements": [
                 {
                   "assignments": [
-                    3796
+                    3632
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 3796,
+                      "id": 3632,
                       "name": "request",
                       "nodeType": "VariableDeclaration",
-                      "scope": 3935,
-                      "src": "14790:28:7",
+                      "scope": 3771,
+                      "src": "15069:28:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                        "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                         "typeString": "struct Market.ChangeRequest"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 3795,
+                        "id": 3631,
                         "name": "ChangeRequest",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2252,
-                        "src": "14790:13:7",
+                        "referencedDeclaration": 2076,
+                        "src": "15069:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage_ptr",
                           "typeString": "struct Market.ChangeRequest"
                         }
                       },
@@ -65537,31 +65819,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 3800,
+                  "id": 3636,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 3797,
+                      "id": 3633,
                       "name": "requests",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2351,
-                      "src": "14821:8:7",
+                      "referencedDeclaration": 2175,
+                      "src": "15100:8:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                       }
                     },
-                    "id": 3799,
+                    "id": 3635,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 3798,
+                      "id": 3634,
                       "name": "changeRequestID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3790,
-                      "src": "14830:15:7",
+                      "referencedDeclaration": 3626,
+                      "src": "15109:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -65572,14 +65854,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "14821:25:7",
+                    "src": "15100:25:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                       "typeString": "struct Market.ChangeRequest storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "14790:56:7"
+                  "src": "15069:56:6"
                 },
                 {
                   "expression": {
@@ -65591,7 +65873,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3827,
+                        "id": 3663,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -65602,7 +65884,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 3818,
+                          "id": 3654,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -65613,7 +65895,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3809,
+                            "id": 3645,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65622,18 +65904,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3802,
+                                "id": 3638,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "14864:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "15157:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3803,
+                              "id": 3639,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -65641,7 +65923,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14864:10:7",
+                              "src": "15157:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -65655,42 +65937,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3804,
+                                  "id": 3640,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "14878:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "15171:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3807,
+                                "id": 3643,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3805,
+                                    "id": 3641,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3796,
-                                    "src": "14884:7:7",
+                                    "referencedDeclaration": 3632,
+                                    "src": "15177:7:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3806,
+                                  "id": 3642,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2243,
-                                  "src": "14884:14:7",
+                                  "referencedDeclaration": 2067,
+                                  "src": "15177:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65701,27 +65983,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14878:21:7",
+                                "src": "15171:21:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3808,
+                              "id": 3644,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "14878:32:7",
+                              "referencedDeclaration": 2011,
+                              "src": "15171:32:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14864:46:7",
+                            "src": "15157:46:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -65735,7 +66017,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 3817,
+                            "id": 3653,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65744,18 +66026,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3810,
+                                "id": 3646,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "14914:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "15219:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3811,
+                              "id": 3647,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -65763,7 +66045,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "14914:10:7",
+                              "src": "15219:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -65777,42 +66059,42 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 3812,
+                                  "id": 3648,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "14928:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "15233:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 3815,
+                                "id": 3651,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3813,
+                                    "id": 3649,
                                     "name": "request",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3796,
-                                    "src": "14934:7:7",
+                                    "referencedDeclaration": 3632,
+                                    "src": "15239:7:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                       "typeString": "struct Market.ChangeRequest memory"
                                     }
                                   },
-                                  "id": 3814,
+                                  "id": 3650,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "dealID",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2243,
-                                  "src": "14934:14:7",
+                                  "referencedDeclaration": 2067,
+                                  "src": "15239:14:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -65823,33 +66105,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "14928:21:7",
+                                "src": "15233:21:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 3816,
+                              "id": 3652,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "masterID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2191,
-                              "src": "14928:30:7",
+                              "referencedDeclaration": 2015,
+                              "src": "15233:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "14914:44:7",
+                            "src": "15219:44:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "14864:94:7",
+                          "src": "15157:106:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -65863,7 +66145,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3826,
+                          "id": 3662,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -65872,18 +66154,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3819,
+                              "id": 3655,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "14962:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15279:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3820,
+                            "id": 3656,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -65891,7 +66173,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "14962:10:7",
+                            "src": "15279:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -65905,42 +66187,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3821,
+                                "id": 3657,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "14976:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15293:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3824,
+                              "id": 3660,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3822,
+                                  "id": 3658,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "14982:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15299:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3823,
+                                "id": 3659,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "14982:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15299:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -65951,33 +66233,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "14976:21:7",
+                              "src": "15293:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3825,
+                            "id": 3661,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "14976:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15293:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "14962:46:7",
+                          "src": "15279:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "14864:144:7",
+                        "src": "15157:168:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -65991,21 +66273,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3801,
+                      "id": 3637,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "14856:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "15136:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3828,
+                    "id": 3664,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66013,15 +66295,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "14856:153:7",
+                    "src": "15136:199:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3829,
+                  "id": 3665,
                   "nodeType": "ExpressionStatement",
-                  "src": "14856:153:7"
+                  "src": "15136:199:6"
                 },
                 {
                   "expression": {
@@ -66030,10 +66312,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2002",
                           "typeString": "enum Market.RequestStatus"
                         },
-                        "id": 3835,
+                        "id": 3671,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -66042,28 +66324,28 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3831,
+                            "id": 3667,
                             "name": "request",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3796,
-                            "src": "15027:7:7",
+                            "referencedDeclaration": 3632,
+                            "src": "15353:7:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                              "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                               "typeString": "struct Market.ChangeRequest memory"
                             }
                           },
-                          "id": 3832,
+                          "id": 3668,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2251,
-                          "src": "15027:14:7",
+                          "referencedDeclaration": 2075,
+                          "src": "15353:14:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
@@ -66073,18 +66355,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3833,
+                            "id": 3669,
                             "name": "RequestStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2178,
-                            "src": "15045:13:7",
+                            "referencedDeclaration": 2002,
+                            "src": "15371:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                              "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                               "typeString": "type(enum Market.RequestStatus)"
                             }
                           },
-                          "id": 3834,
+                          "id": 3670,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -66092,13 +66374,13 @@
                           "memberName": "REQUEST_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "15045:30:7",
+                          "src": "15371:30:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                            "typeIdentifier": "t_enum$_RequestStatus_$2002",
                             "typeString": "enum Market.RequestStatus"
                           }
                         },
-                        "src": "15027:48:7",
+                        "src": "15353:48:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -66112,21 +66394,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3830,
+                      "id": 3666,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "15019:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "15345:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3836,
+                    "id": 3672,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66134,24 +66416,24 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "15019:57:7",
+                    "src": "15345:57:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3837,
+                  "id": 3673,
                   "nodeType": "ExpressionStatement",
-                  "src": "15019:57:7"
+                  "src": "15345:57:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3842,
+                    "id": 3678,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66160,28 +66442,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3838,
+                        "id": 3674,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3796,
-                        "src": "15091:7:7",
+                        "referencedDeclaration": 3632,
+                        "src": "15417:7:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 3839,
+                      "id": 3675,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2245,
-                      "src": "15091:19:7",
+                      "referencedDeclaration": 2069,
+                      "src": "15417:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -66191,18 +66473,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3840,
+                        "id": 3676,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "15114:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "15440:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3841,
+                      "id": 3677,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -66210,26 +66492,26 @@
                       "memberName": "ORDER_ASK",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15114:19:7",
+                      "src": "15440:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15091:42:7",
+                    "src": "15417:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3884,
+                  "id": 3720,
                   "nodeType": "IfStatement",
-                  "src": "15087:437:7",
+                  "src": "15413:437:6",
                   "trueBody": {
-                    "id": 3883,
+                    "id": 3719,
                     "nodeType": "Block",
-                    "src": "15135:389:7",
+                    "src": "15461:389:6",
                     "statements": [
                       {
                         "condition": {
@@ -66238,7 +66520,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3850,
+                          "id": 3686,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66247,18 +66529,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3843,
+                              "id": 3679,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "15153:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15479:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3844,
+                            "id": 3680,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -66266,7 +66548,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15153:10:7",
+                            "src": "15479:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -66280,42 +66562,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3845,
+                                "id": 3681,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "15167:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15493:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3848,
+                              "id": 3684,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3846,
+                                  "id": 3682,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15173:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15499:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3847,
+                                "id": 3683,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15173:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15499:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66326,41 +66608,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15167:21:7",
+                              "src": "15493:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3849,
+                            "id": 3685,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "15167:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15493:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15153:46:7",
+                          "src": "15479:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3868,
+                          "id": 3704,
                           "nodeType": "Block",
-                          "src": "15305:98:7",
+                          "src": "15631:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3866,
+                                "id": 3702,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66371,26 +66653,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3860,
+                                      "id": 3696,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15323:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15649:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3862,
+                                    "id": 3698,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3861,
+                                      "id": 3697,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15332:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "15658:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -66401,23 +66683,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15323:25:7",
+                                    "src": "15649:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3863,
+                                  "id": 3699,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15323:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15649:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -66427,18 +66709,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3864,
+                                    "id": 3700,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15358:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "15684:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3865,
+                                  "id": 3701,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -66446,36 +66728,36 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15358:30:7",
+                                  "src": "15684:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15323:65:7",
+                                "src": "15649:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3867,
+                              "id": 3703,
                               "nodeType": "ExpressionStatement",
-                              "src": "15323:65:7"
+                              "src": "15649:65:6"
                             }
                           ]
                         },
-                        "id": 3869,
+                        "id": 3705,
                         "nodeType": "IfStatement",
-                        "src": "15149:254:7",
+                        "src": "15475:254:6",
                         "trueBody": {
-                          "id": 3859,
+                          "id": 3695,
                           "nodeType": "Block",
-                          "src": "15201:98:7",
+                          "src": "15527:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3857,
+                                "id": 3693,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66486,26 +66768,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3851,
+                                      "id": 3687,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15219:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15545:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3853,
+                                    "id": 3689,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3852,
+                                      "id": 3688,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15228:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "15554:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -66516,23 +66798,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15219:25:7",
+                                    "src": "15545:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3854,
+                                  "id": 3690,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15219:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15545:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -66542,18 +66824,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3855,
+                                    "id": 3691,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15254:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "15580:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3856,
+                                  "id": 3692,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -66561,21 +66843,21 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15254:30:7",
+                                  "src": "15580:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15219:65:7",
+                                "src": "15545:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3858,
+                              "id": 3694,
                               "nodeType": "ExpressionStatement",
-                              "src": "15219:65:7"
+                              "src": "15545:65:6"
                             }
                           ]
                         }
@@ -66583,7 +66865,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3877,
+                          "id": 3713,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66594,42 +66876,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3870,
+                                "id": 3706,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "15416:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "15742:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3874,
+                              "id": 3710,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3871,
+                                  "id": 3707,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15431:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15757:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3872,
+                                "id": 3708,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15431:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15757:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66640,24 +66922,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15416:30:7",
+                              "src": "15742:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3875,
+                            "id": 3711,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 3873,
+                              "id": 3709,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15447:1:7",
+                              "src": "15773:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -66670,7 +66952,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15416:33:7",
+                            "src": "15742:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -66681,14 +66963,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3876,
+                            "id": 3712,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15452:1:7",
+                            "src": "15778:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -66696,15 +66978,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15416:37:7",
+                          "src": "15742:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3878,
+                        "id": 3714,
                         "nodeType": "ExpressionStatement",
-                        "src": "15416:37:7"
+                        "src": "15742:37:6"
                       },
                       {
                         "eventCall": {
@@ -66712,12 +66994,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3880,
+                              "id": 3716,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3790,
-                              "src": "15497:15:7",
+                              "referencedDeclaration": 3626,
+                              "src": "15823:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -66731,18 +67013,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3879,
+                            "id": 3715,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "15472:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "15798:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3881,
+                          "id": 3717,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66750,15 +67032,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15472:41:7",
+                          "src": "15798:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3882,
+                        "id": 3718,
                         "nodeType": "EmitStatement",
-                        "src": "15467:46:7"
+                        "src": "15793:46:6"
                       }
                     ]
                   }
@@ -66767,10 +67049,10 @@
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     },
-                    "id": 3889,
+                    "id": 3725,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -66779,28 +67061,28 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3885,
+                        "id": 3721,
                         "name": "request",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3796,
-                        "src": "15538:7:7",
+                        "referencedDeclaration": 3632,
+                        "src": "15864:7:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                          "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                           "typeString": "struct Market.ChangeRequest memory"
                         }
                       },
-                      "id": 3886,
+                      "id": 3722,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "requestType",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2245,
-                      "src": "15538:19:7",
+                      "referencedDeclaration": 2069,
+                      "src": "15864:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
@@ -66810,18 +67092,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 3887,
+                        "id": 3723,
                         "name": "OrderType",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2168,
-                        "src": "15561:9:7",
+                        "referencedDeclaration": 1992,
+                        "src": "15887:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_OrderType_$2168_$",
+                          "typeIdentifier": "t_type$_t_enum$_OrderType_$1992_$",
                           "typeString": "type(enum Market.OrderType)"
                         }
                       },
-                      "id": 3888,
+                      "id": 3724,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -66829,26 +67111,26 @@
                       "memberName": "ORDER_BID",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "15561:19:7",
+                      "src": "15887:19:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_OrderType_$2168",
+                        "typeIdentifier": "t_enum$_OrderType_$1992",
                         "typeString": "enum Market.OrderType"
                       }
                     },
-                    "src": "15538:42:7",
+                    "src": "15864:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 3931,
+                  "id": 3767,
                   "nodeType": "IfStatement",
-                  "src": "15534:437:7",
+                  "src": "15860:437:6",
                   "trueBody": {
-                    "id": 3930,
+                    "id": 3766,
                     "nodeType": "Block",
-                    "src": "15582:389:7",
+                    "src": "15908:389:6",
                     "statements": [
                       {
                         "condition": {
@@ -66857,7 +67139,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 3897,
+                          "id": 3733,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -66866,18 +67148,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3890,
+                              "id": 3726,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "15600:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "15926:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3891,
+                            "id": 3727,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -66885,7 +67167,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "15600:10:7",
+                            "src": "15926:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -66899,42 +67181,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3892,
+                                "id": 3728,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "15614:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "15940:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 3895,
+                              "id": 3731,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3893,
+                                  "id": 3729,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15620:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "15946:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3894,
+                                "id": 3730,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15620:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "15946:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -66945,41 +67227,41 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15614:21:7",
+                              "src": "15940:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 3896,
+                            "id": 3732,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "15614:32:7",
+                            "referencedDeclaration": 2013,
+                            "src": "15940:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "15600:46:7",
+                          "src": "15926:46:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 3915,
+                          "id": 3751,
                           "nodeType": "Block",
-                          "src": "15752:98:7",
+                          "src": "16078:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3913,
+                                "id": 3749,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -66990,26 +67272,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3907,
+                                      "id": 3743,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15770:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "16096:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3909,
+                                    "id": 3745,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3908,
+                                      "id": 3744,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15779:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "16105:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -67020,23 +67302,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15770:25:7",
+                                    "src": "16096:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3910,
+                                  "id": 3746,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15770:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "16096:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -67046,18 +67328,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3911,
+                                    "id": 3747,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15805:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "16131:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3912,
+                                  "id": 3748,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -67065,36 +67347,36 @@
                                   "memberName": "REQUEST_REJECTED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15805:30:7",
+                                  "src": "16131:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15770:65:7",
+                                "src": "16096:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3914,
+                              "id": 3750,
                               "nodeType": "ExpressionStatement",
-                              "src": "15770:65:7"
+                              "src": "16096:65:6"
                             }
                           ]
                         },
-                        "id": 3916,
+                        "id": 3752,
                         "nodeType": "IfStatement",
-                        "src": "15596:254:7",
+                        "src": "15922:254:6",
                         "trueBody": {
-                          "id": 3906,
+                          "id": 3742,
                           "nodeType": "Block",
-                          "src": "15648:98:7",
+                          "src": "15974:98:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3904,
+                                "id": 3740,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -67105,26 +67387,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 3898,
+                                      "id": 3734,
                                       "name": "requests",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2351,
-                                      "src": "15666:8:7",
+                                      "referencedDeclaration": 2175,
+                                      "src": "15992:8:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                                       }
                                     },
-                                    "id": 3900,
+                                    "id": 3736,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 3899,
+                                      "id": 3735,
                                       "name": "changeRequestID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 3790,
-                                      "src": "15675:15:7",
+                                      "referencedDeclaration": 3626,
+                                      "src": "16001:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -67135,23 +67417,23 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "15666:25:7",
+                                    "src": "15992:25:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                                      "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                                       "typeString": "struct Market.ChangeRequest storage ref"
                                     }
                                   },
-                                  "id": 3901,
+                                  "id": 3737,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "status",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2251,
-                                  "src": "15666:32:7",
+                                  "referencedDeclaration": 2075,
+                                  "src": "15992:32:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
@@ -67161,18 +67443,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 3902,
+                                    "id": 3738,
                                     "name": "RequestStatus",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2178,
-                                    "src": "15701:13:7",
+                                    "referencedDeclaration": 2002,
+                                    "src": "16027:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2178_$",
+                                      "typeIdentifier": "t_type$_t_enum$_RequestStatus_$2002_$",
                                       "typeString": "type(enum Market.RequestStatus)"
                                     }
                                   },
-                                  "id": 3903,
+                                  "id": 3739,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -67180,21 +67462,21 @@
                                   "memberName": "REQUEST_CANCELED",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "15701:30:7",
+                                  "src": "16027:30:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                     "typeString": "enum Market.RequestStatus"
                                   }
                                 },
-                                "src": "15666:65:7",
+                                "src": "15992:65:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                                  "typeIdentifier": "t_enum$_RequestStatus_$2002",
                                   "typeString": "enum Market.RequestStatus"
                                 }
                               },
-                              "id": 3905,
+                              "id": 3741,
                               "nodeType": "ExpressionStatement",
-                              "src": "15666:65:7"
+                              "src": "15992:65:6"
                             }
                           ]
                         }
@@ -67202,7 +67484,7 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3924,
+                          "id": 3760,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67213,42 +67495,42 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 3917,
+                                "id": 3753,
                                 "name": "actualRequests",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2357,
-                                "src": "15863:14:7",
+                                "referencedDeclaration": 2181,
+                                "src": "16189:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$2_storage_$",
                                   "typeString": "mapping(uint256 => uint256[2] storage ref)"
                                 }
                               },
-                              "id": 3921,
+                              "id": 3757,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 3918,
+                                  "id": 3754,
                                   "name": "request",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3796,
-                                  "src": "15878:7:7",
+                                  "referencedDeclaration": 3632,
+                                  "src": "16204:7:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_ChangeRequest_$2252_memory_ptr",
+                                    "typeIdentifier": "t_struct$_ChangeRequest_$2076_memory_ptr",
                                     "typeString": "struct Market.ChangeRequest memory"
                                   }
                                 },
-                                "id": 3919,
+                                "id": 3755,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "dealID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2243,
-                                "src": "15878:14:7",
+                                "referencedDeclaration": 2067,
+                                "src": "16204:14:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -67259,24 +67541,24 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "15863:30:7",
+                              "src": "16189:30:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint256_$2_storage",
                                 "typeString": "uint256[2] storage ref"
                               }
                             },
-                            "id": 3922,
+                            "id": 3758,
                             "indexExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 3920,
+                              "id": 3756,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "15894:1:7",
+                              "src": "16220:1:6",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -67289,7 +67571,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "15863:33:7",
+                            "src": "16189:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -67300,14 +67582,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 3923,
+                            "id": 3759,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "15899:1:7",
+                            "src": "16225:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -67315,15 +67597,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "15863:37:7",
+                          "src": "16189:37:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 3925,
+                        "id": 3761,
                         "nodeType": "ExpressionStatement",
-                        "src": "15863:37:7"
+                        "src": "16189:37:6"
                       },
                       {
                         "eventCall": {
@@ -67331,12 +67613,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3927,
+                              "id": 3763,
                               "name": "changeRequestID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3790,
-                              "src": "15944:15:7",
+                              "referencedDeclaration": 3626,
+                              "src": "16270:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -67350,18 +67632,18 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 3926,
+                            "id": 3762,
                             "name": "DealChangeRequestUpdated",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2282,
-                            "src": "15919:24:7",
+                            "referencedDeclaration": 2106,
+                            "src": "16245:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                               "typeString": "function (uint256)"
                             }
                           },
-                          "id": 3928,
+                          "id": 3764,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67369,15 +67651,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "15919:41:7",
+                          "src": "16245:41:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 3929,
+                        "id": 3765,
                         "nodeType": "EmitStatement",
-                        "src": "15914:46:7"
+                        "src": "16240:46:6"
                       }
                     ]
                   }
@@ -67386,14 +67668,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3932,
+                    "id": 3768,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "15987:4:7",
+                    "src": "16313:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -67401,15 +67683,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3794,
-                  "id": 3933,
+                  "functionReturnParameters": 3630,
+                  "id": 3769,
                   "nodeType": "Return",
-                  "src": "15980:11:7"
+                  "src": "16306:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3935,
+            "id": 3771,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -67417,16 +67699,16 @@
             "name": "CancelChangeRequest",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3791,
+              "id": 3627,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3790,
+                  "id": 3626,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3935,
-                  "src": "14736:20:7",
+                  "scope": 3771,
+                  "src": "15015:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -67434,10 +67716,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3789,
+                    "id": 3625,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14736:4:7",
+                    "src": "15015:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -67447,20 +67729,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14735:22:7"
+              "src": "15014:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3794,
+              "id": 3630,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3793,
+                  "id": 3629,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3935,
-                  "src": "14774:4:7",
+                  "scope": 3771,
+                  "src": "15053:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -67468,10 +67750,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3792,
+                    "id": 3628,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "14774:4:7",
+                    "src": "15053:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -67481,19 +67763,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "14773:6:7"
+              "src": "15052:6:6"
             },
-            "scope": 5229,
-            "src": "14707:1291:7",
+            "scope": 5065,
+            "src": "14986:1338:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3988,
+              "id": 3824,
               "nodeType": "Block",
-              "src": "16113:280:7",
+              "src": "16439:280:6",
               "statements": [
                 {
                   "expression": {
@@ -67505,7 +67787,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3951,
+                        "id": 3787,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67517,18 +67799,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 3946,
+                                "id": 3782,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "16141:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "16467:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 3947,
+                              "id": 3783,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -67536,7 +67818,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16141:10:7",
+                              "src": "16467:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -67550,18 +67832,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 3945,
+                            "id": 3781,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4298,
-                            "src": "16131:9:7",
+                            "referencedDeclaration": 4134,
+                            "src": "16457:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 3948,
+                          "id": 3784,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67569,7 +67851,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16131:21:7",
+                          "src": "16457:21:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67581,18 +67863,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3949,
+                            "id": 3785,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "16156:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "16482:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 3950,
+                          "id": 3786,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67600,13 +67882,13 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16156:10:7",
+                          "src": "16482:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16131:35:7",
+                        "src": "16457:35:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67620,21 +67902,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3944,
+                      "id": 3780,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16123:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16449:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3952,
+                    "id": 3788,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67642,15 +67924,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16123:44:7",
+                    "src": "16449:44:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3953,
+                  "id": 3789,
                   "nodeType": "ExpressionStatement",
-                  "src": "16123:44:7"
+                  "src": "16449:44:6"
                 },
                 {
                   "expression": {
@@ -67662,7 +67944,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 3960,
+                        "id": 3796,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67671,34 +67953,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3955,
+                            "id": 3791,
                             "name": "isMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2365,
-                            "src": "16185:8:7",
+                            "referencedDeclaration": 2189,
+                            "src": "16511:8:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 3958,
+                          "id": 3794,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 3956,
+                              "id": 3792,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "16194:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "16520:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 3957,
+                            "id": 3793,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -67706,7 +67988,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "16194:10:7",
+                            "src": "16520:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -67717,7 +67999,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16185:20:7",
+                          "src": "16511:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -67728,14 +68010,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 3959,
+                          "id": 3795,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16209:5:7",
+                          "src": "16535:5:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -67743,7 +68025,7 @@
                           },
                           "value": "false"
                         },
-                        "src": "16185:29:7",
+                        "src": "16511:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67757,21 +68039,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3954,
+                      "id": 3790,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16177:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16503:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3961,
+                    "id": 3797,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67779,15 +68061,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16177:38:7",
+                    "src": "16503:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3962,
+                  "id": 3798,
                   "nodeType": "ExpressionStatement",
-                  "src": "16177:38:7"
+                  "src": "16503:38:6"
                 },
                 {
                   "expression": {
@@ -67799,7 +68081,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3968,
+                        "id": 3804,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67809,12 +68091,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3965,
+                              "id": 3801,
                               "name": "_master",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3937,
-                              "src": "16243:7:7",
+                              "referencedDeclaration": 3773,
+                              "src": "16569:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -67828,18 +68110,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 3964,
+                            "id": 3800,
                             "name": "GetMaster",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4298,
-                            "src": "16233:9:7",
+                            "referencedDeclaration": 4134,
+                            "src": "16559:9:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                               "typeString": "function (address) view returns (address)"
                             }
                           },
-                          "id": 3966,
+                          "id": 3802,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -67847,7 +68129,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "16233:18:7",
+                          "src": "16559:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67857,18 +68139,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 3967,
+                          "id": 3803,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3937,
-                          "src": "16255:7:7",
+                          "referencedDeclaration": 3773,
+                          "src": "16581:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "16233:29:7",
+                        "src": "16559:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -67882,21 +68164,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3963,
+                      "id": 3799,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16225:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16551:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3969,
+                    "id": 3805,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67904,20 +68186,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16225:38:7",
+                    "src": "16551:38:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3970,
+                  "id": 3806,
                   "nodeType": "ExpressionStatement",
-                  "src": "16225:38:7"
+                  "src": "16551:38:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 3978,
+                    "id": 3814,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -67928,26 +68210,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3971,
+                          "id": 3807,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2371,
-                          "src": "16273:13:7",
+                          "referencedDeclaration": 2195,
+                          "src": "16599:13:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 3975,
+                        "id": 3811,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3972,
+                          "id": 3808,
                           "name": "_master",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3937,
-                          "src": "16287:7:7",
+                          "referencedDeclaration": 3773,
+                          "src": "16613:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -67958,29 +68240,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16273:22:7",
+                        "src": "16599:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 3976,
+                      "id": 3812,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3973,
+                          "id": 3809,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16296:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16622:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 3974,
+                        "id": 3810,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -67988,7 +68270,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16296:10:7",
+                        "src": "16622:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -67999,7 +68281,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16273:34:7",
+                      "src": "16599:34:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68010,14 +68292,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 3977,
+                      "id": 3813,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16310:4:7",
+                      "src": "16636:4:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -68025,15 +68307,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "16273:41:7",
+                    "src": "16599:41:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 3979,
+                  "id": 3815,
                   "nodeType": "ExpressionStatement",
-                  "src": "16273:41:7"
+                  "src": "16599:41:6"
                 },
                 {
                   "eventCall": {
@@ -68043,18 +68325,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 3981,
+                          "id": 3817,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16345:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16671:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 3982,
+                        "id": 3818,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68062,7 +68344,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16345:10:7",
+                        "src": "16671:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68070,12 +68352,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 3983,
+                        "id": 3819,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3937,
-                        "src": "16357:7:7",
+                        "referencedDeclaration": 3773,
+                        "src": "16683:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68093,18 +68375,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 3980,
+                      "id": 3816,
                       "name": "WorkerAnnounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2288,
-                      "src": "16329:15:7",
+                      "referencedDeclaration": 2112,
+                      "src": "16655:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 3984,
+                    "id": 3820,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68112,28 +68394,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16329:36:7",
+                    "src": "16655:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3985,
+                  "id": 3821,
                   "nodeType": "EmitStatement",
-                  "src": "16324:41:7"
+                  "src": "16650:41:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 3986,
+                    "id": 3822,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16382:4:7",
+                    "src": "16708:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -68141,52 +68423,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3943,
-                  "id": 3987,
+                  "functionReturnParameters": 3779,
+                  "id": 3823,
                   "nodeType": "Return",
-                  "src": "16375:11:7"
+                  "src": "16701:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 3989,
+            "id": 3825,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3940,
+                "id": 3776,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3939,
+                  "id": 3775,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16084:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "16410:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16084:13:7"
+                "src": "16410:13:6"
               }
             ],
             "name": "RegisterWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3938,
+              "id": 3774,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3937,
+                  "id": 3773,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3989,
-                  "src": "16060:15:7",
+                  "scope": 3825,
+                  "src": "16386:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68194,10 +68476,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3936,
+                    "id": 3772,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16060:7:7",
+                    "src": "16386:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -68207,20 +68489,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16059:17:7"
+              "src": "16385:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3943,
+              "id": 3779,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3942,
+                  "id": 3778,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3989,
-                  "src": "16107:4:7",
+                  "scope": 3825,
+                  "src": "16433:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68228,10 +68510,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3941,
+                    "id": 3777,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16107:4:7",
+                    "src": "16433:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -68241,19 +68523,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16106:6:7"
+              "src": "16432:6:6"
             },
-            "scope": 5229,
-            "src": "16036:357:7",
+            "scope": 5065,
+            "src": "16362:357:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4039,
+              "id": 3875,
               "nodeType": "Block",
-              "src": "16475:268:7",
+              "src": "16801:268:6",
               "statements": [
                 {
                   "expression": {
@@ -68265,7 +68547,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4006,
+                        "id": 3842,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68276,34 +68558,34 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3999,
+                              "id": 3835,
                               "name": "masterRequest",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2371,
-                              "src": "16493:13:7",
+                              "referencedDeclaration": 2195,
+                              "src": "16819:13:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(address => mapping(address => bool))"
                               }
                             },
-                            "id": 4002,
+                            "id": 3838,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4000,
+                                "id": 3836,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "16507:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "16833:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4001,
+                              "id": 3837,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -68311,7 +68593,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "16507:10:7",
+                              "src": "16833:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -68322,21 +68604,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "16493:25:7",
+                            "src": "16819:25:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4004,
+                          "id": 3840,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4003,
+                            "id": 3839,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3991,
-                            "src": "16519:7:7",
+                            "referencedDeclaration": 3827,
+                            "src": "16845:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -68347,7 +68629,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "16493:34:7",
+                          "src": "16819:34:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -68358,14 +68640,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 4005,
+                          "id": 3841,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "16531:4:7",
+                          "src": "16857:4:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -68373,7 +68655,7 @@
                           },
                           "value": "true"
                         },
-                        "src": "16493:42:7",
+                        "src": "16819:42:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -68387,21 +68669,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3998,
+                      "id": 3834,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16485:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "16811:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4007,
+                    "id": 3843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68409,20 +68691,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16485:51:7",
+                    "src": "16811:51:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4008,
+                  "id": 3844,
                   "nodeType": "ExpressionStatement",
-                  "src": "16485:51:7"
+                  "src": "16811:51:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4014,
+                    "id": 3850,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68431,26 +68713,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4009,
+                        "id": 3845,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2361,
-                        "src": "16546:8:7",
+                        "referencedDeclaration": 2185,
+                        "src": "16872:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 4011,
+                      "id": 3847,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4010,
+                        "id": 3846,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16555:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "16881:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68461,7 +68743,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16546:17:7",
+                      "src": "16872:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -68473,18 +68755,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4012,
+                        "id": 3848,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "16566:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "16892:3:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4013,
+                      "id": 3849,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -68492,26 +68774,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "16566:10:7",
+                      "src": "16892:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "16546:30:7",
+                    "src": "16872:30:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 4015,
+                  "id": 3851,
                   "nodeType": "ExpressionStatement",
-                  "src": "16546:30:7"
+                  "src": "16872:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4021,
+                    "id": 3857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68520,34 +68802,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4016,
+                        "id": 3852,
                         "name": "isMaster",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2365,
-                        "src": "16586:8:7",
+                        "referencedDeclaration": 2189,
+                        "src": "16912:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4019,
+                      "id": 3855,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4017,
+                          "id": 3853,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16595:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "16921:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4018,
+                        "id": 3854,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68555,7 +68837,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16595:10:7",
+                        "src": "16921:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68566,7 +68848,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16586:20:7",
+                      "src": "16912:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68577,14 +68859,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4020,
+                      "id": 3856,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "16609:4:7",
+                      "src": "16935:4:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -68592,20 +68874,20 @@
                       },
                       "value": "true"
                     },
-                    "src": "16586:27:7",
+                    "src": "16912:27:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4022,
+                  "id": 3858,
                   "nodeType": "ExpressionStatement",
-                  "src": "16586:27:7"
+                  "src": "16912:27:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4029,
+                    "id": 3865,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68613,41 +68895,41 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16623:41:7",
+                    "src": "16949:41:6",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4023,
+                          "id": 3859,
                           "name": "masterRequest",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2371,
-                          "src": "16630:13:7",
+                          "referencedDeclaration": 2195,
+                          "src": "16956:13:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(address => mapping(address => bool))"
                           }
                         },
-                        "id": 4026,
+                        "id": 3862,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4024,
+                            "id": 3860,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "16644:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "16970:3:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4025,
+                          "id": 3861,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -68655,7 +68937,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "16644:10:7",
+                          "src": "16970:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -68666,21 +68948,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "16630:25:7",
+                        "src": "16956:25:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4028,
+                      "id": 3864,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4027,
+                        "id": 3863,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16656:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "16982:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68691,7 +68973,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16630:34:7",
+                      "src": "16956:34:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -68702,9 +68984,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4030,
+                  "id": 3866,
                   "nodeType": "ExpressionStatement",
-                  "src": "16623:41:7"
+                  "src": "16949:41:6"
                 },
                 {
                   "eventCall": {
@@ -68712,12 +68994,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4032,
+                        "id": 3868,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3991,
-                        "src": "16695:7:7",
+                        "referencedDeclaration": 3827,
+                        "src": "17021:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68727,18 +69009,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4033,
+                          "id": 3869,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "16704:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "17030:3:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4034,
+                        "id": 3870,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68746,7 +69028,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "16704:10:7",
+                        "src": "17030:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -68764,18 +69046,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4031,
+                      "id": 3867,
                       "name": "WorkerConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2294,
-                      "src": "16679:15:7",
+                      "referencedDeclaration": 2118,
+                      "src": "17005:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 4035,
+                    "id": 3871,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -68783,28 +69065,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16679:36:7",
+                    "src": "17005:36:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4036,
+                  "id": 3872,
                   "nodeType": "EmitStatement",
-                  "src": "16674:41:7"
+                  "src": "17000:41:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4037,
+                    "id": 3873,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "16732:4:7",
+                    "src": "17058:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -68812,52 +69094,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 3997,
-                  "id": 4038,
+                  "functionReturnParameters": 3833,
+                  "id": 3874,
                   "nodeType": "Return",
-                  "src": "16725:11:7"
+                  "src": "17051:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4040,
+            "id": 3876,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 3994,
+                "id": 3830,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 3993,
+                  "id": 3829,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16446:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "16772:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16446:13:7"
+                "src": "16772:13:6"
               }
             ],
             "name": "ConfirmWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 3992,
+              "id": 3828,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3991,
+                  "id": 3827,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4040,
-                  "src": "16422:15:7",
+                  "scope": 3876,
+                  "src": "16748:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68865,10 +69147,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3990,
+                    "id": 3826,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16422:7:7",
+                    "src": "16748:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -68878,20 +69160,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16421:17:7"
+              "src": "16747:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 3997,
+              "id": 3833,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3996,
+                  "id": 3832,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4040,
-                  "src": "16469:4:7",
+                  "scope": 3876,
+                  "src": "16795:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -68899,10 +69181,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 3995,
+                    "id": 3831,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16469:4:7",
+                    "src": "16795:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -68912,19 +69194,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16468:6:7"
+              "src": "16794:6:6"
             },
-            "scope": 5229,
-            "src": "16399:344:7",
+            "scope": 5065,
+            "src": "16725:344:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4082,
+              "id": 3918,
               "nodeType": "Block",
-              "src": "16841:208:7",
+              "src": "17167:208:6",
               "statements": [
                 {
                   "expression": {
@@ -68936,7 +69218,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4067,
+                        "id": 3903,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -68947,7 +69229,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4056,
+                          "id": 3892,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -68957,12 +69239,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4053,
+                                "id": 3889,
                                 "name": "_worker",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4042,
-                                "src": "16869:7:7",
+                                "referencedDeclaration": 3878,
+                                "src": "17195:7:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -68976,18 +69258,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 4052,
+                              "id": 3888,
                               "name": "GetMaster",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4298,
-                              "src": "16859:9:7",
+                              "referencedDeclaration": 4134,
+                              "src": "17185:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$",
                                 "typeString": "function (address) view returns (address)"
                               }
                             },
-                            "id": 4054,
+                            "id": 3890,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -68995,7 +69277,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "16859:18:7",
+                            "src": "17185:18:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -69005,18 +69287,18 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4055,
+                            "id": 3891,
                             "name": "_master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4044,
-                            "src": "16881:7:7",
+                            "referencedDeclaration": 3880,
+                            "src": "17207:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "16859:29:7",
+                          "src": "17185:29:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -69033,7 +69315,7 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 4065,
+                              "id": 3901,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -69044,7 +69326,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4060,
+                                "id": 3896,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -69053,18 +69335,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4057,
+                                    "id": 3893,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "16893:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "17219:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 4058,
+                                  "id": 3894,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -69072,7 +69354,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16893:10:7",
+                                  "src": "17219:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -69082,18 +69364,18 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 4059,
+                                  "id": 3895,
                                   "name": "_worker",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4042,
-                                  "src": "16907:7:7",
+                                  "referencedDeclaration": 3878,
+                                  "src": "17233:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16893:21:7",
+                                "src": "17219:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
@@ -69107,7 +69389,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4064,
+                                "id": 3900,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -69116,18 +69398,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4061,
+                                    "id": 3897,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "16918:3:7",
+                                    "referencedDeclaration": 11599,
+                                    "src": "17244:3:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 4062,
+                                  "id": 3898,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -69135,7 +69417,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "16918:10:7",
+                                  "src": "17244:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -69145,44 +69427,44 @@
                                 "operator": "==",
                                 "rightExpression": {
                                   "argumentTypes": null,
-                                  "id": 4063,
+                                  "id": 3899,
                                   "name": "_master",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4044,
-                                  "src": "16932:7:7",
+                                  "referencedDeclaration": 3880,
+                                  "src": "17258:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
                                   }
                                 },
-                                "src": "16918:21:7",
+                                "src": "17244:21:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "16893:46:7",
+                              "src": "17219:46:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             }
                           ],
-                          "id": 4066,
+                          "id": 3902,
                           "isConstant": false,
                           "isInlineArray": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "TupleExpression",
-                          "src": "16892:48:7",
+                          "src": "17218:48:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "16859:81:7",
+                        "src": "17185:81:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -69196,21 +69478,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4051,
+                      "id": 3887,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "16851:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "17177:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4068,
+                    "id": 3904,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69218,20 +69500,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16851:90:7",
+                    "src": "17177:90:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4069,
+                  "id": 3905,
                   "nodeType": "ExpressionStatement",
-                  "src": "16851:90:7"
+                  "src": "17177:90:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4073,
+                    "id": 3909,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69239,31 +69521,31 @@
                     "nodeType": "UnaryOperation",
                     "operator": "delete",
                     "prefix": true,
-                    "src": "16951:24:7",
+                    "src": "17277:24:6",
                     "subExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4070,
+                        "id": 3906,
                         "name": "masterOf",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2361,
-                        "src": "16958:8:7",
+                        "referencedDeclaration": 2185,
+                        "src": "17284:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                           "typeString": "mapping(address => address)"
                         }
                       },
-                      "id": 4072,
+                      "id": 3908,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4071,
+                        "id": 3907,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4042,
-                        "src": "16967:7:7",
+                        "referencedDeclaration": 3878,
+                        "src": "17293:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69274,7 +69556,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "16958:17:7",
+                      "src": "17284:17:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -69285,9 +69567,9 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4074,
+                  "id": 3910,
                   "nodeType": "ExpressionStatement",
-                  "src": "16951:24:7"
+                  "src": "17277:24:6"
                 },
                 {
                   "eventCall": {
@@ -69295,12 +69577,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4076,
+                        "id": 3912,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4042,
-                        "src": "17004:7:7",
+                        "referencedDeclaration": 3878,
+                        "src": "17330:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69308,12 +69590,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4077,
+                        "id": 3913,
                         "name": "_master",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4044,
-                        "src": "17013:7:7",
+                        "referencedDeclaration": 3880,
+                        "src": "17339:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69331,18 +69613,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4075,
+                      "id": 3911,
                       "name": "WorkerRemoved",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2300,
-                      "src": "16990:13:7",
+                      "referencedDeclaration": 2124,
+                      "src": "17316:13:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 4078,
+                    "id": 3914,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -69350,28 +69632,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "16990:31:7",
+                    "src": "17316:31:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4079,
+                  "id": 3915,
                   "nodeType": "EmitStatement",
-                  "src": "16985:36:7"
+                  "src": "17311:36:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4080,
+                    "id": 3916,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "17038:4:7",
+                    "src": "17364:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -69379,52 +69661,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4050,
-                  "id": 4081,
+                  "functionReturnParameters": 3886,
+                  "id": 3917,
                   "nodeType": "Return",
-                  "src": "17031:11:7"
+                  "src": "17357:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4083,
+            "id": 3919,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4047,
+                "id": 3883,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4046,
+                  "id": 3882,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "16812:13:7",
+                  "referencedDeclaration": 10947,
+                  "src": "17138:13:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "16812:13:7"
+                "src": "17138:13:6"
               }
             ],
             "name": "RemoveWorker",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4045,
+              "id": 3881,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4042,
+                  "id": 3878,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16771:15:7",
+                  "scope": 3919,
+                  "src": "17097:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69432,10 +69714,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4041,
+                    "id": 3877,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16771:7:7",
+                    "src": "17097:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -69446,11 +69728,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4044,
+                  "id": 3880,
                   "name": "_master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16788:15:7",
+                  "scope": 3919,
+                  "src": "17114:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69458,10 +69740,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4043,
+                    "id": 3879,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16788:7:7",
+                    "src": "17114:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -69471,20 +69753,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16770:34:7"
+              "src": "17096:34:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4050,
+              "id": 3886,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4049,
+                  "id": 3885,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4083,
-                  "src": "16835:4:7",
+                  "scope": 3919,
+                  "src": "17161:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69492,10 +69774,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4048,
+                    "id": 3884,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "16835:4:7",
+                    "src": "17161:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -69505,47 +69787,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "16834:6:7"
+              "src": "17160:6:6"
             },
-            "scope": 5229,
-            "src": "16749:300:7",
+            "scope": 5065,
+            "src": "17075:300:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4142,
+              "id": 3978,
               "nodeType": "Block",
-              "src": "17442:348:7",
+              "src": "17768:348:6",
               "statements": [
                 {
                   "assignments": [
-                    4113
+                    3949
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4113,
+                      "id": 3949,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4143,
-                      "src": "17452:18:7",
+                      "scope": 3979,
+                      "src": "17778:18:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4112,
+                        "id": 3948,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "17452:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "17778:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -69553,31 +69835,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4117,
+                  "id": 3953,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4114,
+                      "id": 3950,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "17473:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "17799:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 4116,
+                    "id": 3952,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4115,
+                      "id": 3951,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4085,
-                      "src": "17480:7:7",
+                      "referencedDeclaration": 3921,
+                      "src": "17806:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -69588,14 +69870,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17473:15:7",
+                    "src": "17799:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17452:36:7"
+                  "src": "17778:36:6"
                 },
                 {
                   "expression": {
@@ -69605,28 +69887,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4118,
+                          "id": 3954,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17515:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17841:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4119,
+                        "id": 3955,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2214,
-                        "src": "17515:15:7",
+                        "referencedDeclaration": 2038,
+                        "src": "17841:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -69634,26 +69916,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4120,
+                          "id": 3956,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17540:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17866:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4121,
+                        "id": 3957,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "author",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2218,
-                        "src": "17540:12:7",
+                        "referencedDeclaration": 2042,
+                        "src": "17866:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69663,26 +69945,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4122,
+                          "id": 3958,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17562:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17888:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4123,
+                        "id": 3959,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "counterparty",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2220,
-                        "src": "17562:18:7",
+                        "referencedDeclaration": 2044,
+                        "src": "17888:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69692,26 +69974,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4124,
+                          "id": 3960,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17590:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17916:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4125,
+                        "id": 3961,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2222,
-                        "src": "17590:14:7",
+                        "referencedDeclaration": 2046,
+                        "src": "17916:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -69721,26 +70003,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4126,
+                          "id": 3962,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17614:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17940:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4127,
+                        "id": 3963,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2224,
-                        "src": "17614:11:7",
+                        "referencedDeclaration": 2048,
+                        "src": "17940:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -69750,26 +70032,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4128,
+                          "id": 3964,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17635:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17961:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4129,
+                        "id": 3965,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "netflags",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2227,
-                        "src": "17635:14:7",
+                        "referencedDeclaration": 2051,
+                        "src": "17961:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                           "typeString": "bool[] memory"
@@ -69779,28 +70061,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4130,
+                          "id": 3966,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17659:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "17985:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4131,
+                        "id": 3967,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "identityLevel",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2229,
-                        "src": "17659:19:7",
+                        "referencedDeclaration": 2053,
+                        "src": "17985:19:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                          "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                           "typeString": "enum ProfileRegistry.IdentityLevel"
                         }
                       },
@@ -69808,26 +70090,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4132,
+                          "id": 3968,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17688:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18014:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4133,
+                        "id": 3969,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blacklist",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2231,
-                        "src": "17688:15:7",
+                        "referencedDeclaration": 2055,
+                        "src": "18014:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -69837,26 +70119,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4134,
+                          "id": 3970,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17713:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18039:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4135,
+                        "id": 3971,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "tag",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2233,
-                        "src": "17713:9:7",
+                        "referencedDeclaration": 2057,
+                        "src": "18039:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
@@ -69866,26 +70148,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4136,
+                          "id": 3972,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17732:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18058:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4137,
+                        "id": 3973,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2236,
-                        "src": "17732:16:7",
+                        "referencedDeclaration": 2060,
+                        "src": "18058:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                           "typeString": "uint64[] memory"
@@ -69895,54 +70177,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4138,
+                          "id": 3974,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4113,
-                          "src": "17758:5:7",
+                          "referencedDeclaration": 3949,
+                          "src": "18084:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4139,
+                        "id": 3975,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "frozenSum",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2238,
-                        "src": "17758:15:7",
+                        "referencedDeclaration": 2062,
+                        "src": "18084:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4140,
+                    "id": 3976,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17505:278:7",
+                    "src": "17831:278:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$2168_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$9497_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderType_$1992_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_array$_t_bool_$dyn_memory_$_t_enum$_IdentityLevel_$10343_$_t_address_$_t_bytes32_$_t_array$_t_uint64_$dyn_memory_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderType,address,address,uint256,uint256,bool[] memory,enum ProfileRegistry.IdentityLevel,address,bytes32,uint64[] memory,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4111,
-                  "id": 4141,
+                  "functionReturnParameters": 3947,
+                  "id": 3977,
                   "nodeType": "Return",
-                  "src": "17498:285:7"
+                  "src": "17824:285:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4143,
+            "id": 3979,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -69950,16 +70232,16 @@
             "name": "GetOrderInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4086,
+              "id": 3922,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4085,
+                  "id": 3921,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17093:12:7",
+                  "scope": 3979,
+                  "src": "17419:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -69967,10 +70249,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4084,
+                    "id": 3920,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17093:4:7",
+                    "src": "17419:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -69980,35 +70262,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17092:14:7"
+              "src": "17418:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4111,
+              "id": 3947,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4088,
+                  "id": 3924,
                   "name": "orderType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17141:19:7",
+                  "scope": 3979,
+                  "src": "17467:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4087,
+                    "id": 3923,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "17141:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "17467:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -70017,11 +70299,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4090,
+                  "id": 3926,
                   "name": "author",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17170:14:7",
+                  "scope": 3979,
+                  "src": "17496:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70029,10 +70311,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4089,
+                    "id": 3925,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17170:7:7",
+                    "src": "17496:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70043,11 +70325,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4092,
+                  "id": 3928,
                   "name": "counterparty",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17194:20:7",
+                  "scope": 3979,
+                  "src": "17520:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70055,10 +70337,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4091,
+                    "id": 3927,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17194:7:7",
+                    "src": "17520:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70069,11 +70351,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4094,
+                  "id": 3930,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17224:13:7",
+                  "scope": 3979,
+                  "src": "17550:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70081,10 +70363,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4093,
+                    "id": 3929,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17224:4:7",
+                    "src": "17550:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70095,11 +70377,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4096,
+                  "id": 3932,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17247:10:7",
+                  "scope": 3979,
+                  "src": "17573:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70107,10 +70389,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4095,
+                    "id": 3931,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17247:4:7",
+                    "src": "17573:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70121,11 +70403,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4099,
+                  "id": 3935,
                   "name": "netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17267:15:7",
+                  "scope": 3979,
+                  "src": "17593:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70134,19 +70416,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4097,
+                      "id": 3933,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17267:4:7",
+                      "src": "17593:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 4098,
+                    "id": 3934,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17267:6:7",
+                    "src": "17593:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -70157,26 +70439,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4101,
+                  "id": 3937,
                   "name": "identityLevel",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17292:43:7",
+                  "scope": 3979,
+                  "src": "17618:43:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4100,
+                    "id": 3936,
                     "name": "ProfileRegistry.IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
-                    "src": "17292:29:7",
+                    "referencedDeclaration": 10343,
+                    "src": "17618:29:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -70185,11 +70467,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4103,
+                  "id": 3939,
                   "name": "blacklist",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17345:17:7",
+                  "scope": 3979,
+                  "src": "17671:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70197,10 +70479,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4102,
+                    "id": 3938,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17345:7:7",
+                    "src": "17671:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -70211,11 +70493,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4105,
+                  "id": 3941,
                   "name": "tag",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17372:11:7",
+                  "scope": 3979,
+                  "src": "17698:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70223,10 +70505,10 @@
                     "typeString": "bytes32"
                   },
                   "typeName": {
-                    "id": 4104,
+                    "id": 3940,
                     "name": "bytes32",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17372:7:7",
+                    "src": "17698:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes32",
                       "typeString": "bytes32"
@@ -70237,11 +70519,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4108,
+                  "id": 3944,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17393:19:7",
+                  "scope": 3979,
+                  "src": "17719:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70250,19 +70532,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4106,
+                      "id": 3942,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "17393:6:7",
+                      "src": "17719:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 4107,
+                    "id": 3943,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "17393:8:7",
+                    "src": "17719:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -70273,11 +70555,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4110,
+                  "id": 3946,
                   "name": "frozenSum",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4143,
-                  "src": "17422:14:7",
+                  "scope": 3979,
+                  "src": "17748:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70285,10 +70567,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4109,
+                    "id": 3945,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17422:4:7",
+                    "src": "17748:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70298,47 +70580,47 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17131:311:7"
+              "src": "17457:311:6"
             },
-            "scope": 5229,
-            "src": "17071:719:7",
+            "scope": 5065,
+            "src": "17397:719:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4164,
+              "id": 4000,
               "nodeType": "Block",
-              "src": "17919:129:7",
+              "src": "18245:129:6",
               "statements": [
                 {
                   "assignments": [
-                    4153
+                    3989
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4153,
+                      "id": 3989,
                       "name": "order",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4165,
-                      "src": "17929:18:7",
+                      "scope": 4001,
+                      "src": "18255:18:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                        "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                         "typeString": "struct Market.Order"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4152,
+                        "id": 3988,
                         "name": "Order",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2241,
-                        "src": "17929:5:7",
+                        "referencedDeclaration": 2065,
+                        "src": "18255:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Order_$2241_storage_ptr",
+                          "typeIdentifier": "t_struct$_Order_$2065_storage_ptr",
                           "typeString": "struct Market.Order"
                         }
                       },
@@ -70346,31 +70628,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4157,
+                  "id": 3993,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4154,
+                      "id": 3990,
                       "name": "orders",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2338,
-                      "src": "17950:6:7",
+                      "referencedDeclaration": 2162,
+                      "src": "18276:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2241_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Order_$2065_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Order storage ref)"
                       }
                     },
-                    "id": 4156,
+                    "id": 3992,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4155,
+                      "id": 3991,
                       "name": "orderID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4145,
-                      "src": "17957:7:7",
+                      "referencedDeclaration": 3981,
+                      "src": "18283:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -70381,14 +70663,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "17950:15:7",
+                    "src": "18276:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Order_$2241_storage",
+                      "typeIdentifier": "t_struct$_Order_$2065_storage",
                       "typeString": "struct Market.Order storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "17929:36:7"
+                  "src": "18255:36:6"
                 },
                 {
                   "expression": {
@@ -70398,28 +70680,28 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4158,
+                          "id": 3994,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4153,
-                          "src": "17992:5:7",
+                          "referencedDeclaration": 3989,
+                          "src": "18318:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4159,
+                        "id": 3995,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "orderStatus",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2216,
-                        "src": "17992:17:7",
+                        "referencedDeclaration": 2040,
+                        "src": "18318:17:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                          "typeIdentifier": "t_enum$_OrderStatus_$1996",
                           "typeString": "enum Market.OrderStatus"
                         }
                       },
@@ -70427,54 +70709,54 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4160,
+                          "id": 3996,
                           "name": "order",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4153,
-                          "src": "18019:5:7",
+                          "referencedDeclaration": 3989,
+                          "src": "18345:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Order_$2241_memory_ptr",
+                            "typeIdentifier": "t_struct$_Order_$2065_memory_ptr",
                             "typeString": "struct Market.Order memory"
                           }
                         },
-                        "id": 4161,
+                        "id": 3997,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2240,
-                        "src": "18019:12:7",
+                        "referencedDeclaration": 2064,
+                        "src": "18345:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4162,
+                    "id": 3998,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "17982:59:7",
+                    "src": "18308:59:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$2172_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_enum$_OrderStatus_$1996_$_t_uint256_$",
                       "typeString": "tuple(enum Market.OrderStatus,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4151,
-                  "id": 4163,
+                  "functionReturnParameters": 3987,
+                  "id": 3999,
                   "nodeType": "Return",
-                  "src": "17975:66:7"
+                  "src": "18301:66:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4165,
+            "id": 4001,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -70482,16 +70764,16 @@
             "name": "GetOrderParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4146,
+              "id": 3982,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4145,
+                  "id": 3981,
                   "name": "orderID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17821:12:7",
+                  "scope": 4001,
+                  "src": "18147:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70499,10 +70781,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4144,
+                    "id": 3980,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17821:4:7",
+                    "src": "18147:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70512,35 +70794,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17820:14:7"
+              "src": "18146:14:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4151,
+              "id": 3987,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4148,
+                  "id": 3984,
                   "name": "orderStatus",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17869:23:7",
+                  "scope": 4001,
+                  "src": "18195:23:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                    "typeIdentifier": "t_enum$_OrderStatus_$1996",
                     "typeString": "enum Market.OrderStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4147,
+                    "id": 3983,
                     "name": "OrderStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2172,
-                    "src": "17869:11:7",
+                    "referencedDeclaration": 1996,
+                    "src": "18195:11:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderStatus_$2172",
+                      "typeIdentifier": "t_enum$_OrderStatus_$1996",
                       "typeString": "enum Market.OrderStatus"
                     }
                   },
@@ -70549,11 +70831,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4150,
+                  "id": 3986,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4165,
-                  "src": "17902:11:7",
+                  "scope": 4001,
+                  "src": "18228:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -70561,10 +70843,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4149,
+                    "id": 3985,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "17902:4:7",
+                    "src": "18228:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -70574,19 +70856,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "17859:60:7"
+              "src": "18185:60:6"
             },
-            "scope": 5229,
-            "src": "17797:251:7",
+            "scope": 5065,
+            "src": "18123:251:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4215,
+              "id": 4051,
               "nodeType": "Block",
-              "src": "18293:260:7",
+              "src": "18619:260:6",
               "statements": [
                 {
                   "expression": {
@@ -70598,26 +70880,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4185,
+                            "id": 4021,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18320:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18646:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4187,
+                          "id": 4023,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4186,
+                            "id": 4022,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18326:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18652:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70628,21 +70910,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18320:13:7",
+                          "src": "18646:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4188,
+                        "id": 4024,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "benchmarks",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2185,
-                        "src": "18320:24:7",
+                        "referencedDeclaration": 2009,
+                        "src": "18646:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage",
                           "typeString": "uint64[] storage ref"
@@ -70654,26 +70936,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4189,
+                            "id": 4025,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18354:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18680:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4191,
+                          "id": 4027,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4190,
+                            "id": 4026,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18360:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18686:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70684,21 +70966,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18354:13:7",
+                          "src": "18680:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4192,
+                        "id": 4028,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "supplierID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2187,
-                        "src": "18354:24:7",
+                        "referencedDeclaration": 2011,
+                        "src": "18680:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70710,26 +70992,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4193,
+                            "id": 4029,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18388:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18714:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4195,
+                          "id": 4031,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4194,
+                            "id": 4030,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18394:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18720:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70740,21 +71022,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18388:13:7",
+                          "src": "18714:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4196,
+                        "id": 4032,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "consumerID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2189,
-                        "src": "18388:24:7",
+                        "referencedDeclaration": 2013,
+                        "src": "18714:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70766,26 +71048,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4197,
+                            "id": 4033,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18422:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18748:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4199,
+                          "id": 4035,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4198,
+                            "id": 4034,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18428:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18754:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70796,21 +71078,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18422:13:7",
+                          "src": "18748:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4200,
+                        "id": 4036,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "masterID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2191,
-                        "src": "18422:22:7",
+                        "referencedDeclaration": 2015,
+                        "src": "18748:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -70822,26 +71104,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4201,
+                            "id": 4037,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18454:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18780:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4203,
+                          "id": 4039,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4202,
+                            "id": 4038,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18460:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18786:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70852,21 +71134,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18454:13:7",
+                          "src": "18780:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4204,
+                        "id": 4040,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "askID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2193,
-                        "src": "18454:19:7",
+                        "referencedDeclaration": 2017,
+                        "src": "18780:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -70878,26 +71160,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4205,
+                            "id": 4041,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18483:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18809:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4207,
+                          "id": 4043,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4206,
+                            "id": 4042,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18489:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18815:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70908,21 +71190,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18483:13:7",
+                          "src": "18809:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4208,
+                        "id": 4044,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "bidID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2195,
-                        "src": "18483:19:7",
+                        "referencedDeclaration": 2019,
+                        "src": "18809:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -70934,26 +71216,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4209,
+                            "id": 4045,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18512:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "18838:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4211,
+                          "id": 4047,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4210,
+                            "id": 4046,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4167,
-                            "src": "18518:6:7",
+                            "referencedDeclaration": 4003,
+                            "src": "18844:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -70964,49 +71246,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18512:13:7",
+                          "src": "18838:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4212,
+                        "id": 4048,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "startTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2201,
-                        "src": "18512:23:7",
+                        "referencedDeclaration": 2025,
+                        "src": "18838:23:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4213,
+                    "id": 4049,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18310:236:7",
+                    "src": "18636:236:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$_t_array$_t_uint64_$dyn_storage_$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint64[] storage ref,address,address,address,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4184,
-                  "id": 4214,
+                  "functionReturnParameters": 4020,
+                  "id": 4050,
                   "nodeType": "Return",
-                  "src": "18303:243:7"
+                  "src": "18629:243:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4216,
+            "id": 4052,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -71014,16 +71296,16 @@
             "name": "GetDealInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4168,
+              "id": 4004,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4167,
+                  "id": 4003,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18075:11:7",
+                  "scope": 4052,
+                  "src": "18401:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71031,10 +71313,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4166,
+                    "id": 4002,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18075:4:7",
+                    "src": "18401:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71044,20 +71326,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18074:13:7"
+              "src": "18400:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4184,
+              "id": 4020,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4171,
+                  "id": 4007,
                   "name": "benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18122:19:7",
+                  "scope": 4052,
+                  "src": "18448:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71066,19 +71348,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4169,
+                      "id": 4005,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "18122:6:7",
+                      "src": "18448:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 4170,
+                    "id": 4006,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "18122:8:7",
+                    "src": "18448:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -71089,11 +71371,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4173,
+                  "id": 4009,
                   "name": "supplierID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18151:18:7",
+                  "scope": 4052,
+                  "src": "18477:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71101,10 +71383,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4172,
+                    "id": 4008,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18151:7:7",
+                    "src": "18477:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71115,11 +71397,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4175,
+                  "id": 4011,
                   "name": "consumerID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18179:18:7",
+                  "scope": 4052,
+                  "src": "18505:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71127,10 +71409,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4174,
+                    "id": 4010,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18179:7:7",
+                    "src": "18505:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71141,11 +71423,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4177,
+                  "id": 4013,
                   "name": "masterID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18207:16:7",
+                  "scope": 4052,
+                  "src": "18533:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71153,10 +71435,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4176,
+                    "id": 4012,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18207:7:7",
+                    "src": "18533:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -71167,11 +71449,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4179,
+                  "id": 4015,
                   "name": "askID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18233:10:7",
+                  "scope": 4052,
+                  "src": "18559:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71179,10 +71461,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4178,
+                    "id": 4014,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18233:4:7",
+                    "src": "18559:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71193,11 +71475,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4181,
+                  "id": 4017,
                   "name": "bidID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18253:10:7",
+                  "scope": 4052,
+                  "src": "18579:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71205,10 +71487,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4180,
+                    "id": 4016,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18253:4:7",
+                    "src": "18579:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71219,11 +71501,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4183,
+                  "id": 4019,
                   "name": "startTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4216,
-                  "src": "18273:14:7",
+                  "scope": 4052,
+                  "src": "18599:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71231,10 +71513,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4182,
+                    "id": 4018,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18273:4:7",
+                    "src": "18599:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71244,19 +71526,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18112:181:7"
+              "src": "18438:181:6"
             },
-            "scope": 5229,
-            "src": "18054:499:7",
+            "scope": 5065,
+            "src": "18380:499:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4265,
+              "id": 4101,
               "nodeType": "Block",
-              "src": "18797:263:7",
+              "src": "19123:263:6",
               "statements": [
                 {
                   "expression": {
@@ -71268,26 +71550,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4235,
+                            "id": 4071,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18824:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19150:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4237,
+                          "id": 4073,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4236,
+                            "id": 4072,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18830:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19156:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71298,21 +71580,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18824:13:7",
+                          "src": "19150:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4238,
+                        "id": 4074,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2197,
-                        "src": "18824:22:7",
+                        "referencedDeclaration": 2021,
+                        "src": "19150:22:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71324,26 +71606,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4239,
+                            "id": 4075,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18856:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19182:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4241,
+                          "id": 4077,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4240,
+                            "id": 4076,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18862:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19188:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71354,21 +71636,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18856:13:7",
+                          "src": "19182:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4242,
+                        "id": 4078,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2199,
-                        "src": "18856:19:7",
+                        "referencedDeclaration": 2023,
+                        "src": "19182:19:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71380,26 +71662,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4243,
+                            "id": 4079,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18885:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19211:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4245,
+                          "id": 4081,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4244,
+                            "id": 4080,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18891:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19217:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71410,21 +71692,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18885:13:7",
+                          "src": "19211:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4246,
+                        "id": 4082,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2203,
-                        "src": "18885:21:7",
+                        "referencedDeclaration": 2027,
+                        "src": "19211:21:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71436,26 +71718,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4247,
+                            "id": 4083,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18916:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19242:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4249,
+                          "id": 4085,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4248,
+                            "id": 4084,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18922:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19248:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71466,23 +71748,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18916:13:7",
+                          "src": "19242:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4250,
+                        "id": 4086,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2205,
-                        "src": "18916:20:7",
+                        "referencedDeclaration": 2029,
+                        "src": "19242:20:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         }
                       },
@@ -71492,26 +71774,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4251,
+                            "id": 4087,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18946:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19272:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4253,
+                          "id": 4089,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4252,
+                            "id": 4088,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18952:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19278:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71522,21 +71804,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18946:13:7",
+                          "src": "19272:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4254,
+                        "id": 4090,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "blockedBalance",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2207,
-                        "src": "18946:28:7",
+                        "referencedDeclaration": 2031,
+                        "src": "19272:28:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71548,26 +71830,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4255,
+                            "id": 4091,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "18984:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19310:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4257,
+                          "id": 4093,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4256,
+                            "id": 4092,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "18990:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19316:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71578,21 +71860,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "18984:13:7",
+                          "src": "19310:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4258,
+                        "id": 4094,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "totalPayout",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2209,
-                        "src": "18984:25:7",
+                        "referencedDeclaration": 2033,
+                        "src": "19310:25:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -71604,26 +71886,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4259,
+                            "id": 4095,
                             "name": "deals",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2342,
-                            "src": "19019:5:7",
+                            "referencedDeclaration": 2166,
+                            "src": "19345:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                               "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                             }
                           },
-                          "id": 4261,
+                          "id": 4097,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4260,
+                            "id": 4096,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4218,
-                            "src": "19025:6:7",
+                            "referencedDeclaration": 4054,
+                            "src": "19351:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -71634,49 +71916,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19019:13:7",
+                          "src": "19345:13:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                            "typeIdentifier": "t_struct$_Deal_$2036_storage",
                             "typeString": "struct Market.Deal storage ref"
                           }
                         },
-                        "id": 4262,
+                        "id": 4098,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2211,
-                        "src": "19019:24:7",
+                        "referencedDeclaration": 2035,
+                        "src": "19345:24:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       }
                     ],
-                    "id": 4263,
+                    "id": 4099,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "18814:239:7",
+                    "src": "19140:239:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$2164_$_t_uint256_$_t_uint256_$_t_uint256_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_enum$_DealStatus_$1988_$_t_uint256_$_t_uint256_$_t_uint256_$",
                       "typeString": "tuple(uint256,uint256,uint256,enum Market.DealStatus,uint256,uint256,uint256)"
                     }
                   },
-                  "functionReturnParameters": 4234,
-                  "id": 4264,
+                  "functionReturnParameters": 4070,
+                  "id": 4100,
                   "nodeType": "Return",
-                  "src": "18807:246:7"
+                  "src": "19133:246:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4266,
+            "id": 4102,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -71684,16 +71966,16 @@
             "name": "GetDealParams",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4219,
+              "id": 4055,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4218,
+                  "id": 4054,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18582:11:7",
+                  "scope": 4102,
+                  "src": "18908:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71701,10 +71983,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4217,
+                    "id": 4053,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18582:4:7",
+                    "src": "18908:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71714,20 +71996,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18581:13:7"
+              "src": "18907:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4234,
+              "id": 4070,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4221,
+                  "id": 4057,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18629:13:7",
+                  "scope": 4102,
+                  "src": "18955:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71735,10 +72017,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4220,
+                    "id": 4056,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18629:4:7",
+                    "src": "18955:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71749,11 +72031,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4223,
+                  "id": 4059,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18652:10:7",
+                  "scope": 4102,
+                  "src": "18978:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71761,10 +72043,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4222,
+                    "id": 4058,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18652:4:7",
+                    "src": "18978:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71775,11 +72057,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4225,
+                  "id": 4061,
                   "name": "endTime",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18672:12:7",
+                  "scope": 4102,
+                  "src": "18998:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71787,10 +72069,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4224,
+                    "id": 4060,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18672:4:7",
+                    "src": "18998:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71801,26 +72083,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4227,
+                  "id": 4063,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18694:17:7",
+                  "scope": 4102,
+                  "src": "19020:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_DealStatus_$2164",
+                    "typeIdentifier": "t_enum$_DealStatus_$1988",
                     "typeString": "enum Market.DealStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4226,
+                    "id": 4062,
                     "name": "DealStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2164,
-                    "src": "18694:10:7",
+                    "referencedDeclaration": 1988,
+                    "src": "19020:10:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
@@ -71829,11 +72111,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4229,
+                  "id": 4065,
                   "name": "blockedBalance",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18721:19:7",
+                  "scope": 4102,
+                  "src": "19047:19:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71841,10 +72123,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4228,
+                    "id": 4064,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18721:4:7",
+                    "src": "19047:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71855,11 +72137,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4231,
+                  "id": 4067,
                   "name": "totalPayout",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18750:16:7",
+                  "scope": 4102,
+                  "src": "19076:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71867,10 +72149,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4230,
+                    "id": 4066,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18750:4:7",
+                    "src": "19076:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71881,11 +72163,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4233,
+                  "id": 4069,
                   "name": "lastBillTS",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4266,
-                  "src": "18776:15:7",
+                  "scope": 4102,
+                  "src": "19102:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -71893,10 +72175,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4232,
+                    "id": 4068,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "18776:4:7",
+                    "src": "19102:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -71906,19 +72188,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "18619:178:7"
+              "src": "18945:178:6"
             },
-            "scope": 5229,
-            "src": "18559:501:7",
+            "scope": 5065,
+            "src": "18885:501:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4297,
+              "id": 4133,
               "nodeType": "Block",
-              "src": "19139:176:7",
+              "src": "19465:176:6",
               "statements": [
                 {
                   "condition": {
@@ -71927,7 +72209,7 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 4283,
+                    "id": 4119,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -71938,7 +72220,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4277,
+                      "id": 4113,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -71947,26 +72229,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4273,
+                          "id": 4109,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2361,
-                          "src": "19153:8:7",
+                          "referencedDeclaration": 2185,
+                          "src": "19479:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 4275,
+                        "id": 4111,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4274,
+                          "id": 4110,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4268,
-                          "src": "19162:7:7",
+                          "referencedDeclaration": 4104,
+                          "src": "19488:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -71977,7 +72259,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19153:17:7",
+                        "src": "19479:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -71988,14 +72270,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "307830",
-                        "id": 4276,
+                        "id": 4112,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "19174:3:7",
+                        "src": "19500:3:6",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -72003,7 +72285,7 @@
                         },
                         "value": "0x0"
                       },
-                      "src": "19153:24:7",
+                      "src": "19479:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -72017,7 +72299,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4282,
+                      "id": 4118,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -72026,26 +72308,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4278,
+                          "id": 4114,
                           "name": "masterOf",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2361,
-                          "src": "19181:8:7",
+                          "referencedDeclaration": 2185,
+                          "src": "19507:8:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                             "typeString": "mapping(address => address)"
                           }
                         },
-                        "id": 4280,
+                        "id": 4116,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4279,
+                          "id": 4115,
                           "name": "_worker",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4268,
-                          "src": "19190:7:7",
+                          "referencedDeclaration": 4104,
+                          "src": "19516:7:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -72056,7 +72338,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "19181:17:7",
+                        "src": "19507:17:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -72066,50 +72348,50 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4281,
+                        "id": 4117,
                         "name": "_worker",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4268,
-                        "src": "19202:7:7",
+                        "referencedDeclaration": 4104,
+                        "src": "19528:7:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "19181:28:7",
+                      "src": "19507:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "19153:56:7",
+                    "src": "19479:56:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 4295,
+                    "id": 4131,
                     "nodeType": "Block",
-                    "src": "19258:51:7",
+                    "src": "19584:51:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4293,
+                          "id": 4129,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4289,
+                            "id": 4125,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4271,
-                            "src": "19272:6:7",
+                            "referencedDeclaration": 4107,
+                            "src": "19598:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -72121,26 +72403,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4290,
+                              "id": 4126,
                               "name": "masterOf",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2361,
-                              "src": "19281:8:7",
+                              "referencedDeclaration": 2185,
+                              "src": "19607:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_address_$",
                                 "typeString": "mapping(address => address)"
                               }
                             },
-                            "id": 4292,
+                            "id": 4128,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4291,
+                              "id": 4127,
                               "name": "_worker",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4268,
-                              "src": "19290:7:7",
+                              "referencedDeclaration": 4104,
+                              "src": "19616:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -72151,48 +72433,48 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "19281:17:7",
+                            "src": "19607:17:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19272:26:7",
+                          "src": "19598:26:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4294,
+                        "id": 4130,
                         "nodeType": "ExpressionStatement",
-                        "src": "19272:26:7"
+                        "src": "19598:26:6"
                       }
                     ]
                   },
-                  "id": 4296,
+                  "id": 4132,
                   "nodeType": "IfStatement",
-                  "src": "19149:160:7",
+                  "src": "19475:160:6",
                   "trueBody": {
-                    "id": 4288,
+                    "id": 4124,
                     "nodeType": "Block",
-                    "src": "19211:41:7",
+                    "src": "19537:41:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4286,
+                          "id": 4122,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4284,
+                            "id": 4120,
                             "name": "master",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4271,
-                            "src": "19225:6:7",
+                            "referencedDeclaration": 4107,
+                            "src": "19551:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -72202,26 +72484,26 @@
                           "operator": "=",
                           "rightHandSide": {
                             "argumentTypes": null,
-                            "id": 4285,
+                            "id": 4121,
                             "name": "_worker",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4268,
-                            "src": "19234:7:7",
+                            "referencedDeclaration": 4104,
+                            "src": "19560:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "19225:16:7",
+                          "src": "19551:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4287,
+                        "id": 4123,
                         "nodeType": "ExpressionStatement",
-                        "src": "19225:16:7"
+                        "src": "19551:16:6"
                       }
                     ]
                   }
@@ -72229,7 +72511,7 @@
               ]
             },
             "documentation": null,
-            "id": 4298,
+            "id": 4134,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72237,16 +72519,16 @@
             "name": "GetMaster",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4269,
+              "id": 4105,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4268,
+                  "id": 4104,
                   "name": "_worker",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4298,
-                  "src": "19085:15:7",
+                  "scope": 4134,
+                  "src": "19411:15:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72254,10 +72536,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4267,
+                    "id": 4103,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19085:7:7",
+                    "src": "19411:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -72267,20 +72549,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19084:17:7"
+              "src": "19410:17:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4272,
+              "id": 4108,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4271,
+                  "id": 4107,
                   "name": "master",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4298,
-                  "src": "19123:14:7",
+                  "scope": 4134,
+                  "src": "19449:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72288,10 +72570,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4270,
+                    "id": 4106,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19123:7:7",
+                    "src": "19449:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -72301,19 +72583,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19122:16:7"
+              "src": "19448:16:6"
             },
-            "scope": 5229,
-            "src": "19066:249:7",
+            "scope": 5065,
+            "src": "19392:249:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4335,
+              "id": 4171,
               "nodeType": "Block",
-              "src": "19528:250:7",
+              "src": "19854:250:6",
               "statements": [
                 {
                   "expression": {
@@ -72325,26 +72607,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4313,
+                            "id": 4149,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19555:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19881:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4315,
+                          "id": 4151,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4314,
+                            "id": 4150,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19564:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19890:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72355,21 +72637,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19555:25:7",
+                          "src": "19881:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4316,
+                        "id": 4152,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "dealID",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2243,
-                        "src": "19555:32:7",
+                        "referencedDeclaration": 2067,
+                        "src": "19881:32:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72381,26 +72663,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4317,
+                            "id": 4153,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19597:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19923:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4319,
+                          "id": 4155,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4318,
+                            "id": 4154,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19606:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19932:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72411,23 +72693,23 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19597:25:7",
+                          "src": "19923:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4320,
+                        "id": 4156,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "requestType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2245,
-                        "src": "19597:37:7",
+                        "referencedDeclaration": 2069,
+                        "src": "19923:37:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_OrderType_$2168",
+                          "typeIdentifier": "t_enum$_OrderType_$1992",
                           "typeString": "enum Market.OrderType"
                         }
                       },
@@ -72437,26 +72719,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4321,
+                            "id": 4157,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19644:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "19970:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4323,
+                          "id": 4159,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4322,
+                            "id": 4158,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19653:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "19979:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72467,21 +72749,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19644:25:7",
+                          "src": "19970:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4324,
+                        "id": 4160,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "price",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2247,
-                        "src": "19644:31:7",
+                        "referencedDeclaration": 2071,
+                        "src": "19970:31:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72493,26 +72775,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4325,
+                            "id": 4161,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19685:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "20011:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4327,
+                          "id": 4163,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4326,
+                            "id": 4162,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19694:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "20020:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72523,21 +72805,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19685:25:7",
+                          "src": "20011:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4328,
+                        "id": 4164,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "duration",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2249,
-                        "src": "19685:34:7",
+                        "referencedDeclaration": 2073,
+                        "src": "20011:34:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -72549,26 +72831,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4329,
+                            "id": 4165,
                             "name": "requests",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2351,
-                            "src": "19729:8:7",
+                            "referencedDeclaration": 2175,
+                            "src": "20055:8:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2252_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_ChangeRequest_$2076_storage_$",
                               "typeString": "mapping(uint256 => struct Market.ChangeRequest storage ref)"
                             }
                           },
-                          "id": 4331,
+                          "id": 4167,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4330,
+                            "id": 4166,
                             "name": "changeRequestID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4300,
-                            "src": "19738:15:7",
+                            "referencedDeclaration": 4136,
+                            "src": "20064:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -72579,49 +72861,49 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "19729:25:7",
+                          "src": "20055:25:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_ChangeRequest_$2252_storage",
+                            "typeIdentifier": "t_struct$_ChangeRequest_$2076_storage",
                             "typeString": "struct Market.ChangeRequest storage ref"
                           }
                         },
-                        "id": 4332,
+                        "id": 4168,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "status",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2251,
-                        "src": "19729:32:7",
+                        "referencedDeclaration": 2075,
+                        "src": "20055:32:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                          "typeIdentifier": "t_enum$_RequestStatus_$2002",
                           "typeString": "enum Market.RequestStatus"
                         }
                       }
                     ],
-                    "id": 4333,
+                    "id": 4169,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "TupleExpression",
-                    "src": "19545:226:7",
+                    "src": "19871:226:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$2168_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2178_$",
+                      "typeIdentifier": "t_tuple$_t_uint256_$_t_enum$_OrderType_$1992_$_t_uint256_$_t_uint256_$_t_enum$_RequestStatus_$2002_$",
                       "typeString": "tuple(uint256,enum Market.OrderType,uint256,uint256,enum Market.RequestStatus)"
                     }
                   },
-                  "functionReturnParameters": 4312,
-                  "id": 4334,
+                  "functionReturnParameters": 4148,
+                  "id": 4170,
                   "nodeType": "Return",
-                  "src": "19538:233:7"
+                  "src": "19864:233:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4336,
+            "id": 4172,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72629,16 +72911,16 @@
             "name": "GetChangeRequestInfo",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4301,
+              "id": 4137,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4300,
+                  "id": 4136,
                   "name": "changeRequestID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19351:20:7",
+                  "scope": 4172,
+                  "src": "19677:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72646,10 +72928,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4299,
+                    "id": 4135,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19351:4:7",
+                    "src": "19677:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72659,20 +72941,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19350:22:7"
+              "src": "19676:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4312,
+              "id": 4148,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4303,
+                  "id": 4139,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19407:11:7",
+                  "scope": 4172,
+                  "src": "19733:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72680,10 +72962,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4302,
+                    "id": 4138,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19407:4:7",
+                    "src": "19733:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72694,26 +72976,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4305,
+                  "id": 4141,
                   "name": "requestType",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19428:21:7",
+                  "scope": 4172,
+                  "src": "19754:21:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_OrderType_$2168",
+                    "typeIdentifier": "t_enum$_OrderType_$1992",
                     "typeString": "enum Market.OrderType"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4304,
+                    "id": 4140,
                     "name": "OrderType",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2168,
-                    "src": "19428:9:7",
+                    "referencedDeclaration": 1992,
+                    "src": "19754:9:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_OrderType_$2168",
+                      "typeIdentifier": "t_enum$_OrderType_$1992",
                       "typeString": "enum Market.OrderType"
                     }
                   },
@@ -72722,11 +73004,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4307,
+                  "id": 4143,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19459:10:7",
+                  "scope": 4172,
+                  "src": "19785:10:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72734,10 +73016,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4306,
+                    "id": 4142,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19459:4:7",
+                    "src": "19785:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72748,11 +73030,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4309,
+                  "id": 4145,
                   "name": "duration",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19479:13:7",
+                  "scope": 4172,
+                  "src": "19805:13:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72760,10 +73042,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4308,
+                    "id": 4144,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19479:4:7",
+                    "src": "19805:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72774,26 +73056,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4311,
+                  "id": 4147,
                   "name": "status",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4336,
-                  "src": "19502:20:7",
+                  "scope": 4172,
+                  "src": "19828:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                    "typeIdentifier": "t_enum$_RequestStatus_$2002",
                     "typeString": "enum Market.RequestStatus"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4310,
+                    "id": 4146,
                     "name": "RequestStatus",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2178,
-                    "src": "19502:13:7",
+                    "referencedDeclaration": 2002,
+                    "src": "19828:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_RequestStatus_$2178",
+                      "typeIdentifier": "t_enum$_RequestStatus_$2002",
                       "typeString": "enum Market.RequestStatus"
                     }
                   },
@@ -72801,43 +73083,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19397:131:7"
+              "src": "19723:131:6"
             },
-            "scope": 5229,
-            "src": "19321:457:7",
+            "scope": 5065,
+            "src": "19647:457:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4343,
+              "id": 4179,
               "nodeType": "Block",
-              "src": "19836:34:7",
+              "src": "20162:34:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4341,
+                    "id": 4177,
                     "name": "dealAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2327,
-                    "src": "19853:10:7",
+                    "referencedDeclaration": 2151,
+                    "src": "20179:10:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4340,
-                  "id": 4342,
+                  "functionReturnParameters": 4176,
+                  "id": 4178,
                   "nodeType": "Return",
-                  "src": "19846:17:7"
+                  "src": "20172:17:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4344,
+            "id": 4180,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72845,23 +73127,23 @@
             "name": "GetDealsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4337,
+              "id": 4173,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19807:2:7"
+              "src": "20133:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4340,
+              "id": 4176,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4339,
+                  "id": 4175,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4344,
-                  "src": "19831:4:7",
+                  "scope": 4180,
+                  "src": "20157:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72869,10 +73151,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4338,
+                    "id": 4174,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19831:4:7",
+                    "src": "20157:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72882,43 +73164,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19830:6:7"
+              "src": "20156:6:6"
             },
-            "scope": 5229,
-            "src": "19784:86:7",
+            "scope": 5065,
+            "src": "20110:86:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4351,
+              "id": 4187,
               "nodeType": "Block",
-              "src": "19929:36:7",
+              "src": "20255:36:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4349,
+                    "id": 4185,
                     "name": "ordersAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2324,
-                    "src": "19946:12:7",
+                    "referencedDeclaration": 2148,
+                    "src": "20272:12:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4348,
-                  "id": 4350,
+                  "functionReturnParameters": 4184,
+                  "id": 4186,
                   "nodeType": "Return",
-                  "src": "19939:19:7"
+                  "src": "20265:19:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4352,
+            "id": 4188,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -72926,23 +73208,23 @@
             "name": "GetOrdersAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4345,
+              "id": 4181,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "19900:2:7"
+              "src": "20226:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4348,
+              "id": 4184,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4347,
+                  "id": 4183,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4352,
-                  "src": "19924:4:7",
+                  "scope": 4188,
+                  "src": "20250:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -72950,10 +73232,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4346,
+                    "id": 4182,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "19924:4:7",
+                    "src": "20250:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -72963,43 +73245,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "19923:6:7"
+              "src": "20249:6:6"
             },
-            "scope": 5229,
-            "src": "19876:89:7",
+            "scope": 5065,
+            "src": "20202:89:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4359,
+              "id": 4195,
               "nodeType": "Block",
-              "src": "20032:38:7",
+              "src": "20358:38:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4357,
+                    "id": 4193,
                     "name": "requestsAmount",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2330,
-                    "src": "20049:14:7",
+                    "referencedDeclaration": 2154,
+                    "src": "20375:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4356,
-                  "id": 4358,
+                  "functionReturnParameters": 4192,
+                  "id": 4194,
                   "nodeType": "Return",
-                  "src": "20042:21:7"
+                  "src": "20368:21:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4360,
+            "id": 4196,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73007,23 +73289,23 @@
             "name": "GetChangeRequestsAmount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4353,
+              "id": 4189,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20003:2:7"
+              "src": "20329:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4356,
+              "id": 4192,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4355,
+                  "id": 4191,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4360,
-                  "src": "20027:4:7",
+                  "scope": 4196,
+                  "src": "20353:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73031,10 +73313,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4354,
+                    "id": 4190,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20027:4:7",
+                    "src": "20353:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73044,43 +73326,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20026:6:7"
+              "src": "20352:6:6"
             },
-            "scope": 5229,
-            "src": "19971:99:7",
+            "scope": 5065,
+            "src": "20297:99:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4367,
+              "id": 4203,
               "nodeType": "Block",
-              "src": "20136:42:7",
+              "src": "20462:42:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4365,
+                    "id": 4201,
                     "name": "benchmarksQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2332,
-                    "src": "20153:18:7",
+                    "referencedDeclaration": 2156,
+                    "src": "20479:18:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4364,
-                  "id": 4366,
+                  "functionReturnParameters": 4200,
+                  "id": 4202,
                   "nodeType": "Return",
-                  "src": "20146:25:7"
+                  "src": "20472:25:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4368,
+            "id": 4204,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73088,23 +73370,23 @@
             "name": "GetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4361,
+              "id": 4197,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20106:2:7"
+              "src": "20432:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4364,
+              "id": 4200,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4363,
+                  "id": 4199,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4368,
-                  "src": "20130:4:7",
+                  "scope": 4204,
+                  "src": "20456:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73112,10 +73394,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4362,
+                    "id": 4198,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20130:4:7",
+                    "src": "20456:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73125,43 +73407,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20129:6:7"
+              "src": "20455:6:6"
             },
-            "scope": 5229,
-            "src": "20076:102:7",
+            "scope": 5065,
+            "src": "20402:102:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4375,
+              "id": 4211,
               "nodeType": "Block",
-              "src": "20242:40:7",
+              "src": "20568:40:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4373,
+                    "id": 4209,
                     "name": "netflagsQuantity",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 2334,
-                    "src": "20259:16:7",
+                    "referencedDeclaration": 2158,
+                    "src": "20585:16:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4372,
-                  "id": 4374,
+                  "functionReturnParameters": 4208,
+                  "id": 4210,
                   "nodeType": "Return",
-                  "src": "20252:23:7"
+                  "src": "20578:23:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4376,
+            "id": 4212,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -73169,23 +73451,23 @@
             "name": "GetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4369,
+              "id": 4205,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "20212:2:7"
+              "src": "20538:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4372,
+              "id": 4208,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4371,
+                  "id": 4207,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4376,
-                  "src": "20236:4:7",
+                  "scope": 4212,
+                  "src": "20562:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -73193,10 +73475,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4370,
+                    "id": 4206,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20236:4:7",
+                    "src": "20562:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -73206,19 +73488,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20235:6:7"
+              "src": "20561:6:6"
             },
-            "scope": 5229,
-            "src": "20184:98:7",
+            "scope": 5065,
+            "src": "20510:98:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4641,
+              "id": 4477,
               "nodeType": "Block",
-              "src": "20364:1917:7",
+              "src": "20690:1917:6",
               "statements": [
                 {
                   "expression": {
@@ -73227,10 +73509,10 @@
                       {
                         "argumentTypes": null,
                         "commonType": {
-                          "typeIdentifier": "t_enum$_DealStatus_$2164",
+                          "typeIdentifier": "t_enum$_DealStatus_$1988",
                           "typeString": "enum Market.DealStatus"
                         },
-                        "id": 4390,
+                        "id": 4226,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73241,26 +73523,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4384,
+                              "id": 4220,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "20382:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "20708:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4386,
+                            "id": 4222,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4385,
+                              "id": 4221,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "20388:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "20714:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -73271,23 +73553,23 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "20382:13:7",
+                            "src": "20708:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4387,
+                          "id": 4223,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "status",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2205,
-                          "src": "20382:20:7",
+                          "referencedDeclaration": 2029,
+                          "src": "20708:20:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
@@ -73297,18 +73579,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4388,
+                            "id": 4224,
                             "name": "DealStatus",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2164,
-                            "src": "20406:10:7",
+                            "referencedDeclaration": 1988,
+                            "src": "20732:10:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                              "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                               "typeString": "type(enum Market.DealStatus)"
                             }
                           },
-                          "id": 4389,
+                          "id": 4225,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -73316,13 +73598,13 @@
                           "memberName": "STATUS_ACCEPTED",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "20406:26:7",
+                          "src": "20732:26:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           }
                         },
-                        "src": "20382:50:7",
+                        "src": "20708:50:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73336,21 +73618,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4383,
+                      "id": 4219,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "20374:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "20700:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4391,
+                    "id": 4227,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -73358,15 +73640,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20374:59:7",
+                    "src": "20700:59:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4392,
+                  "id": 4228,
                   "nodeType": "ExpressionStatement",
-                  "src": "20374:59:7"
+                  "src": "20700:59:6"
                 },
                 {
                   "expression": {
@@ -73378,7 +73660,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4416,
+                        "id": 4252,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73389,7 +73671,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4408,
+                          "id": 4244,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -73400,7 +73682,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4400,
+                            "id": 4236,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73409,18 +73691,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4394,
+                                "id": 4230,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "20451:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "20777:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4395,
+                              "id": 4231,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -73428,7 +73710,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20451:10:7",
+                              "src": "20777:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -73442,26 +73724,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4396,
+                                  "id": 4232,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "20465:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "20791:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4398,
+                                "id": 4234,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4397,
+                                  "id": 4233,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4378,
-                                  "src": "20471:6:7",
+                                  "referencedDeclaration": 4214,
+                                  "src": "20797:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -73472,27 +73754,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20465:13:7",
+                                "src": "20791:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4399,
+                              "id": 4235,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "20465:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "20791:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20451:38:7",
+                            "src": "20777:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -73506,7 +73788,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4407,
+                            "id": 4243,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73515,18 +73797,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4401,
+                                "id": 4237,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "20493:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "20819:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4402,
+                              "id": 4238,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -73534,7 +73816,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "20493:10:7",
+                              "src": "20819:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -73548,26 +73830,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4403,
+                                  "id": 4239,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "20507:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "20833:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4405,
+                                "id": 4241,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4404,
+                                  "id": 4240,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4378,
-                                  "src": "20513:6:7",
+                                  "referencedDeclaration": 4214,
+                                  "src": "20839:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -73578,33 +73860,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "20507:13:7",
+                                "src": "20833:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4406,
+                              "id": 4242,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "20507:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "20833:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "20493:38:7",
+                            "src": "20819:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "20451:80:7",
+                          "src": "20777:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -73618,7 +73900,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4415,
+                          "id": 4251,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -73627,18 +73909,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4409,
+                              "id": 4245,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "20535:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "20861:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4410,
+                            "id": 4246,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -73646,7 +73928,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20535:10:7",
+                            "src": "20861:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -73660,26 +73942,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4411,
+                                "id": 4247,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "20549:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "20875:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4413,
+                              "id": 4249,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4412,
+                                "id": 4248,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4378,
-                                "src": "20555:6:7",
+                                "referencedDeclaration": 4214,
+                                "src": "20881:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -73690,33 +73972,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "20549:13:7",
+                              "src": "20875:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4414,
+                            "id": 4250,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "20549:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "20875:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "20535:36:7",
+                          "src": "20861:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20451:120:7",
+                        "src": "20777:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73730,21 +74012,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4393,
+                      "id": 4229,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "20443:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "20769:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4417,
+                    "id": 4253,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -73752,43 +74034,43 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "20443:129:7",
+                    "src": "20769:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4418,
+                  "id": 4254,
                   "nodeType": "ExpressionStatement",
-                  "src": "20443:129:7"
+                  "src": "20769:129:6"
                 },
                 {
                   "assignments": [
-                    4420
+                    4256
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4420,
+                      "id": 4256,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4642,
-                      "src": "20582:16:7",
+                      "scope": 4478,
+                      "src": "20908:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4419,
+                        "id": 4255,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2212,
-                        "src": "20582:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "20908:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -73796,31 +74078,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4424,
+                  "id": 4260,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4421,
+                      "id": 4257,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2342,
-                      "src": "20601:5:7",
+                      "referencedDeclaration": 2166,
+                      "src": "20927:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 4423,
+                    "id": 4259,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4422,
+                      "id": 4258,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4378,
-                      "src": "20607:6:7",
+                      "referencedDeclaration": 4214,
+                      "src": "20933:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -73831,25 +74113,25 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "20601:13:7",
+                    "src": "20927:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20582:32:7"
+                  "src": "20908:32:6"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4426,
+                      "id": 4262,
                       "name": "paidAmount",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4642,
-                      "src": "20625:15:7",
+                      "scope": 4478,
+                      "src": "20951:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -73857,10 +74139,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4425,
+                        "id": 4261,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "20625:4:7",
+                        "src": "20951:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -73870,10 +74152,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4427,
+                  "id": 4263,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "20625:15:7"
+                  "src": "20951:15:6"
                 },
                 {
                   "condition": {
@@ -73882,14 +74164,14 @@
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     },
-                    "id": 4437,
+                    "id": 4273,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4431,
+                      "id": 4267,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -73897,18 +74179,18 @@
                       "nodeType": "UnaryOperation",
                       "operator": "!",
                       "prefix": true,
-                      "src": "20655:15:7",
+                      "src": "20981:15:6",
                       "subExpression": {
                         "argumentTypes": null,
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 4429,
+                            "id": 4265,
                             "name": "dealID",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4378,
-                            "src": "20663:6:7",
+                            "referencedDeclaration": 4214,
+                            "src": "20989:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -73922,18 +74204,18 @@
                               "typeString": "uint256"
                             }
                           ],
-                          "id": 4428,
+                          "id": 4264,
                           "name": "IsSpot",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4843,
-                          "src": "20656:6:7",
+                          "referencedDeclaration": 4679,
+                          "src": "20982:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (uint256) view returns (bool)"
                           }
                         },
-                        "id": 4430,
+                        "id": 4266,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -73941,7 +74223,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "20656:14:7",
+                        "src": "20982:14:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -73960,7 +74242,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 4436,
+                      "id": 4272,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -73969,26 +74251,26 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4432,
+                          "id": 4268,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4420,
-                          "src": "20674:4:7",
+                          "referencedDeclaration": 4256,
+                          "src": "21000:4:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 4433,
+                        "id": 4269,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "lastBillTS",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2211,
-                        "src": "20674:15:7",
+                        "referencedDeclaration": 2035,
+                        "src": "21000:15:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -74000,38 +74282,38 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4434,
+                          "id": 4270,
                           "name": "deal",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4420,
-                          "src": "20693:4:7",
+                          "referencedDeclaration": 4256,
+                          "src": "21019:4:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                             "typeString": "struct Market.Deal memory"
                           }
                         },
-                        "id": 4435,
+                        "id": 4271,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "endTime",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 2203,
-                        "src": "20693:12:7",
+                        "referencedDeclaration": 2027,
+                        "src": "21019:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "20674:31:7",
+                      "src": "21000:31:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "src": "20655:50:7",
+                    "src": "20981:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -74044,7 +74326,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4456,
+                      "id": 4292,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -74055,14 +74337,14 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4450,
+                        "id": 4286,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4444,
+                          "id": 4280,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74070,18 +74352,18 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "20811:15:7",
+                          "src": "21137:15:6",
                           "subExpression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4442,
+                                "id": 4278,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4378,
-                                "src": "20819:6:7",
+                                "referencedDeclaration": 4214,
+                                "src": "21145:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -74095,18 +74377,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 4441,
+                              "id": 4277,
                               "name": "IsSpot",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4843,
-                              "src": "20812:6:7",
+                              "referencedDeclaration": 4679,
+                              "src": "21138:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                                 "typeString": "function (uint256) view returns (bool)"
                               }
                             },
-                            "id": 4443,
+                            "id": 4279,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74114,7 +74396,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "20812:14:7",
+                            "src": "21138:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -74133,7 +74415,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4449,
+                          "id": 4285,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74142,18 +74424,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4445,
+                              "id": 4281,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11305,
-                              "src": "20830:5:7",
+                              "referencedDeclaration": 11589,
+                              "src": "21156:5:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 4446,
+                            "id": 4282,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74161,7 +74443,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "20830:15:7",
+                            "src": "21156:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -74173,38 +74455,38 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4447,
+                              "id": 4283,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4420,
-                              "src": "20848:4:7",
+                              "referencedDeclaration": 4256,
+                              "src": "21174:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4448,
+                            "id": 4284,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2203,
-                            "src": "20848:12:7",
+                            "referencedDeclaration": 2027,
+                            "src": "21174:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "20830:30:7",
+                          "src": "21156:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "20811:49:7",
+                        "src": "21137:49:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -74218,7 +74500,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 4455,
+                        "id": 4291,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -74227,26 +74509,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4451,
+                            "id": 4287,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4420,
-                            "src": "20864:4:7",
+                            "referencedDeclaration": 4256,
+                            "src": "21190:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4452,
+                          "id": 4288,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "lastBillTS",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2211,
-                          "src": "20864:15:7",
+                          "referencedDeclaration": 2035,
+                          "src": "21190:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -74258,64 +74540,64 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4453,
+                            "id": 4289,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4420,
-                            "src": "20882:4:7",
+                            "referencedDeclaration": 4256,
+                            "src": "21208:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4454,
+                          "id": 4290,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "endTime",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2203,
-                          "src": "20882:12:7",
+                          "referencedDeclaration": 2027,
+                          "src": "21208:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "20864:30:7",
+                        "src": "21190:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "20811:83:7",
+                      "src": "21137:83:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": {
-                      "id": 4484,
+                      "id": 4320,
                       "nodeType": "Block",
-                      "src": "21003:104:7",
+                      "src": "21329:104:6",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4482,
+                            "id": 4318,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4471,
+                              "id": 4307,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4426,
-                              "src": "21017:10:7",
+                              "referencedDeclaration": 4262,
+                              "src": "21343:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -74330,26 +74612,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4473,
+                                    "id": 4309,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4420,
-                                    "src": "21047:4:7",
+                                    "referencedDeclaration": 4256,
+                                    "src": "21373:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4474,
+                                  "id": 4310,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "21047:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "21373:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74362,26 +74644,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4478,
+                                        "id": 4314,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "21079:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21405:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4479,
+                                      "id": 4315,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2211,
-                                      "src": "21079:15:7",
+                                      "referencedDeclaration": 2035,
+                                      "src": "21405:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -74399,18 +74681,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4475,
+                                        "id": 4311,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11305,
-                                        "src": "21059:5:7",
+                                        "referencedDeclaration": 11589,
+                                        "src": "21385:5:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 4476,
+                                      "id": 4312,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -74418,27 +74700,27 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "21059:15:7",
+                                      "src": "21385:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4477,
+                                    "id": 4313,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "21059:19:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "21385:19:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4480,
+                                  "id": 4316,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -74446,7 +74728,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21059:36:7",
+                                  "src": "21385:36:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74464,18 +74746,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4472,
+                                "id": 4308,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "21030:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "21356:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4481,
+                              "id": 4317,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -74483,48 +74765,48 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "21030:66:7",
+                              "src": "21356:66:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "21017:79:7",
+                            "src": "21343:79:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4483,
+                          "id": 4319,
                           "nodeType": "ExpressionStatement",
-                          "src": "21017:79:7"
+                          "src": "21343:79:6"
                         }
                       ]
                     },
-                    "id": 4485,
+                    "id": 4321,
                     "nodeType": "IfStatement",
-                    "src": "20807:300:7",
+                    "src": "21133:300:6",
                     "trueBody": {
-                      "id": 4470,
+                      "id": 4306,
                       "nodeType": "Block",
-                      "src": "20896:101:7",
+                      "src": "21222:101:6",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4468,
+                            "id": 4304,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4457,
+                              "id": 4293,
                               "name": "paidAmount",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4426,
-                              "src": "20910:10:7",
+                              "referencedDeclaration": 4262,
+                              "src": "21236:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -74539,26 +74821,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4459,
+                                    "id": 4295,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4420,
-                                    "src": "20940:4:7",
+                                    "referencedDeclaration": 4256,
+                                    "src": "21266:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4460,
+                                  "id": 4296,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "20940:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "21266:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74571,26 +74853,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4464,
+                                        "id": 4300,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "20969:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21295:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4465,
+                                      "id": 4301,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "lastBillTS",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2211,
-                                      "src": "20969:15:7",
+                                      "referencedDeclaration": 2035,
+                                      "src": "21295:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -74608,46 +74890,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4461,
+                                        "id": 4297,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "20952:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "21278:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4462,
+                                      "id": 4298,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2203,
-                                      "src": "20952:12:7",
+                                      "referencedDeclaration": 2027,
+                                      "src": "21278:12:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4463,
+                                    "id": 4299,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "20952:16:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "21278:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4466,
+                                  "id": 4302,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -74655,7 +74937,7 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "20952:33:7",
+                                  "src": "21278:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -74673,18 +74955,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4458,
+                                "id": 4294,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "20923:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "21249:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4467,
+                              "id": 4303,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -74692,45 +74974,45 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "20923:63:7",
+                              "src": "21249:63:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "20910:76:7",
+                            "src": "21236:76:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4469,
+                          "id": 4305,
                           "nodeType": "ExpressionStatement",
-                          "src": "20910:76:7"
+                          "src": "21236:76:6"
                         }
                       ]
                     }
                   },
-                  "id": 4486,
+                  "id": 4322,
                   "nodeType": "IfStatement",
-                  "src": "20651:456:7",
+                  "src": "20977:456:6",
                   "trueBody": {
-                    "id": 4440,
+                    "id": 4276,
                     "nodeType": "Block",
-                    "src": "20707:94:7",
+                    "src": "21033:94:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "74727565",
-                          "id": 4438,
+                          "id": 4274,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "20786:4:7",
+                          "src": "21112:4:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -74738,10 +75020,10 @@
                           },
                           "value": "true"
                         },
-                        "functionReturnParameters": 4382,
-                        "id": 4439,
+                        "functionReturnParameters": 4218,
+                        "id": 4275,
                         "nodeType": "Return",
-                        "src": "20779:11:7"
+                        "src": "21105:11:6"
                       }
                     ]
                   }
@@ -74753,19 +75035,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4490,
+                    "id": 4326,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4487,
+                      "id": 4323,
                       "name": "paidAmount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4426,
-                      "src": "21121:10:7",
+                      "referencedDeclaration": 4262,
+                      "src": "21447:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -74777,45 +75059,45 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4488,
+                        "id": 4324,
                         "name": "deal",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4420,
-                        "src": "21134:4:7",
+                        "referencedDeclaration": 4256,
+                        "src": "21460:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                           "typeString": "struct Market.Deal memory"
                         }
                       },
-                      "id": 4489,
+                      "id": 4325,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "21134:19:7",
+                      "referencedDeclaration": 2031,
+                      "src": "21460:19:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "21121:32:7",
+                    "src": "21447:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4590,
+                  "id": 4426,
                   "nodeType": "IfStatement",
-                  "src": "21117:820:7",
+                  "src": "21443:820:6",
                   "trueBody": {
-                    "id": 4589,
+                    "id": 4425,
                     "nodeType": "Block",
-                    "src": "21155:782:7",
+                    "src": "21481:782:6",
                     "statements": [
                       {
                         "condition": {
@@ -74824,7 +75106,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4501,
+                          "id": 4337,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -74836,26 +75118,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4493,
+                                  "id": 4329,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4420,
-                                  "src": "21189:4:7",
+                                  "referencedDeclaration": 4256,
+                                  "src": "21515:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4494,
+                                "id": 4330,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "21189:15:7",
+                                "referencedDeclaration": 2013,
+                                "src": "21515:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -74871,32 +75153,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4491,
+                                "id": 4327,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2315,
-                                "src": "21173:5:7",
+                                "referencedDeclaration": 2139,
+                                "src": "21499:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$10080",
+                                  "typeIdentifier": "t_contract$_SNM_$10926",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 4492,
+                              "id": 4328,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10977,
-                              "src": "21173:15:7",
+                              "referencedDeclaration": 11261,
+                              "src": "21499:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 4495,
+                            "id": 4331,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74904,7 +75186,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21173:32:7",
+                            "src": "21499:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -74919,26 +75201,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4498,
+                                  "id": 4334,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4420,
-                                  "src": "21224:4:7",
+                                  "referencedDeclaration": 4256,
+                                  "src": "21550:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4499,
+                                "id": 4335,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "blockedBalance",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2207,
-                                "src": "21224:19:7",
+                                "referencedDeclaration": 2031,
+                                "src": "21550:19:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -74954,32 +75236,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4496,
+                                "id": 4332,
                                 "name": "paidAmount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4426,
-                                "src": "21209:10:7",
+                                "referencedDeclaration": 4262,
+                                "src": "21535:10:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4497,
+                              "id": 4333,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "21209:14:7",
+                              "referencedDeclaration": 11055,
+                              "src": "21535:14:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4500,
+                            "id": 4336,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -74987,22 +75269,22 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "21209:35:7",
+                            "src": "21535:35:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "21173:71:7",
+                          "src": "21499:71:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4587,
+                          "id": 4423,
                           "nodeType": "Block",
-                          "src": "21490:437:7",
+                          "src": "21816:437:6",
                           "statements": [
                             {
                               "eventCall": {
@@ -75010,12 +75292,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4535,
+                                    "id": 4371,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4378,
-                                    "src": "21520:6:7",
+                                    "referencedDeclaration": 4214,
+                                    "src": "21846:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75027,26 +75309,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 4536,
+                                        "id": 4372,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "21528:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "21854:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 4538,
+                                      "id": 4374,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 4537,
+                                        "id": 4373,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4378,
-                                        "src": "21534:6:7",
+                                        "referencedDeclaration": 4214,
+                                        "src": "21860:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75057,21 +75339,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "21528:13:7",
+                                      "src": "21854:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 4539,
+                                    "id": 4375,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2207,
-                                    "src": "21528:28:7",
+                                    "referencedDeclaration": 2031,
+                                    "src": "21854:28:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75089,18 +75371,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4534,
+                                  "id": 4370,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2274,
-                                  "src": "21513:6:7",
+                                  "referencedDeclaration": 2098,
+                                  "src": "21839:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 4540,
+                                "id": 4376,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75108,15 +75390,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21513:44:7",
+                                "src": "21839:44:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4541,
+                              "id": 4377,
                               "nodeType": "EmitStatement",
-                              "src": "21508:49:7"
+                              "src": "21834:49:6"
                             },
                             {
                               "expression": {
@@ -75124,12 +75406,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4543,
+                                    "id": 4379,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4378,
-                                    "src": "21593:6:7",
+                                    "referencedDeclaration": 4214,
+                                    "src": "21919:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -75143,18 +75425,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4542,
+                                  "id": 4378,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5004,
-                                  "src": "21575:17:7",
+                                  "referencedDeclaration": 4840,
+                                  "src": "21901:17:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4544,
+                                "id": 4380,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75162,15 +75444,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21575:25:7",
+                                "src": "21901:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4545,
+                              "id": 4381,
                               "nodeType": "ExpressionStatement",
-                              "src": "21575:25:7"
+                              "src": "21901:25:6"
                             },
                             {
                               "expression": {
@@ -75183,26 +75465,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4549,
+                                          "id": 4385,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21641:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21967:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4550,
+                                        "id": 4386,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "masterID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2191,
-                                        "src": "21641:13:7",
+                                        "referencedDeclaration": 2015,
+                                        "src": "21967:13:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -75212,26 +75494,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4551,
+                                          "id": 4387,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21656:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21982:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4552,
+                                        "id": 4388,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "blockedBalance",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2207,
-                                        "src": "21656:19:7",
+                                        "referencedDeclaration": 2031,
+                                        "src": "21982:19:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75251,32 +75533,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4547,
+                                        "id": 4383,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "21626:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "21952:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4548,
+                                      "id": 4384,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transfer",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 10965,
-                                      "src": "21626:14:7",
+                                      "referencedDeclaration": 11249,
+                                      "src": "21952:14:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4553,
+                                    "id": 4389,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -75284,7 +75566,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21626:50:7",
+                                    "src": "21952:50:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -75298,21 +75580,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4546,
+                                  "id": 4382,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "21618:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "21944:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4554,
+                                "id": 4390,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75320,20 +75602,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21618:59:7",
+                                "src": "21944:59:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4555,
+                              "id": 4391,
                               "nodeType": "ExpressionStatement",
-                              "src": "21618:59:7"
+                              "src": "21944:59:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4562,
+                                "id": 4398,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75344,26 +75626,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4556,
+                                      "id": 4392,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21695:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22021:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4558,
+                                    "id": 4394,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4557,
+                                      "id": 4393,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21701:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22027:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75374,21 +75656,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21695:13:7",
+                                    "src": "22021:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4559,
+                                  "id": 4395,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "lastBillTS",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2211,
-                                  "src": "21695:24:7",
+                                  "referencedDeclaration": 2035,
+                                  "src": "22021:24:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75400,18 +75682,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4560,
+                                    "id": 4396,
                                     "name": "block",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11305,
-                                    "src": "21722:5:7",
+                                    "referencedDeclaration": 11589,
+                                    "src": "22048:5:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_block",
                                       "typeString": "block"
                                     }
                                   },
-                                  "id": 4561,
+                                  "id": 4397,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -75419,26 +75701,26 @@
                                   "memberName": "timestamp",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "21722:15:7",
+                                  "src": "22048:15:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21695:42:7",
+                                "src": "22021:42:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4563,
+                              "id": 4399,
                               "nodeType": "ExpressionStatement",
-                              "src": "21695:42:7"
+                              "src": "22021:42:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4576,
+                                "id": 4412,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75449,26 +75731,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4564,
+                                      "id": 4400,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21755:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22081:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4566,
+                                    "id": 4402,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4565,
+                                      "id": 4401,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21761:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22087:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75479,21 +75761,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21755:13:7",
+                                    "src": "22081:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4567,
+                                  "id": 4403,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "totalPayout",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2209,
-                                  "src": "21755:25:7",
+                                  "referencedDeclaration": 2033,
+                                  "src": "22081:25:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75508,26 +75790,26 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4573,
+                                        "id": 4409,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4420,
-                                        "src": "21813:4:7",
+                                        "referencedDeclaration": 4256,
+                                        "src": "22139:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4574,
+                                      "id": 4410,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "21813:19:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "22139:19:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75547,26 +75829,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4568,
+                                          "id": 4404,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "21783:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "22109:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4570,
+                                        "id": 4406,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4569,
+                                          "id": 4405,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4378,
-                                          "src": "21789:6:7",
+                                          "referencedDeclaration": 4214,
+                                          "src": "22115:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -75577,41 +75859,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21783:13:7",
+                                        "src": "22109:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4571,
+                                      "id": 4407,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "totalPayout",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2209,
-                                      "src": "21783:25:7",
+                                      "referencedDeclaration": 2033,
+                                      "src": "22109:25:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4572,
+                                    "id": 4408,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "21783:29:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "22109:29:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4575,
+                                  "id": 4411,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -75619,26 +75901,26 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21783:50:7",
+                                  "src": "22109:50:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21755:78:7",
+                                "src": "22081:78:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4577,
+                              "id": 4413,
                               "nodeType": "ExpressionStatement",
-                              "src": "21755:78:7"
+                              "src": "22081:78:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4583,
+                                "id": 4419,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75649,26 +75931,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4578,
+                                      "id": 4414,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21851:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "22177:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4580,
+                                    "id": 4416,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4579,
+                                      "id": 4415,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21857:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "22183:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -75679,21 +75961,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21851:13:7",
+                                    "src": "22177:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4581,
+                                  "id": 4417,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "21851:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "22177:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -75704,14 +75986,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 4582,
+                                  "id": 4418,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "21882:1:7",
+                                  "src": "22208:1:6",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -75719,28 +76001,28 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "21851:32:7",
+                                "src": "22177:32:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4584,
+                              "id": 4420,
                               "nodeType": "ExpressionStatement",
-                              "src": "21851:32:7"
+                              "src": "22177:32:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4585,
+                                "id": 4421,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "21908:4:7",
+                                "src": "22234:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -75748,20 +76030,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4382,
-                              "id": 4586,
+                              "functionReturnParameters": 4218,
+                              "id": 4422,
                               "nodeType": "Return",
-                              "src": "21901:11:7"
+                              "src": "22227:11:6"
                             }
                           ]
                         },
-                        "id": 4588,
+                        "id": 4424,
                         "nodeType": "IfStatement",
-                        "src": "21169:758:7",
+                        "src": "21495:758:6",
                         "trueBody": {
-                          "id": 4533,
+                          "id": 4369,
                           "nodeType": "Block",
-                          "src": "21246:238:7",
+                          "src": "21572:238:6",
                           "statements": [
                             {
                               "expression": {
@@ -75774,26 +76056,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4505,
+                                          "id": 4341,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4420,
-                                          "src": "21291:4:7",
+                                          "referencedDeclaration": 4256,
+                                          "src": "21617:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4506,
+                                        "id": 4342,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2189,
-                                        "src": "21291:15:7",
+                                        "referencedDeclaration": 2013,
+                                        "src": "21617:15:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -75801,14 +76083,14 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4507,
+                                        "id": 4343,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11366,
-                                        "src": "21308:4:7",
+                                        "referencedDeclaration": 11646,
+                                        "src": "21634:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         }
                                       },
@@ -75819,26 +76101,26 @@
                                             "argumentTypes": null,
                                             "expression": {
                                               "argumentTypes": null,
-                                              "id": 4510,
+                                              "id": 4346,
                                               "name": "deal",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 4420,
-                                              "src": "21329:4:7",
+                                              "referencedDeclaration": 4256,
+                                              "src": "21655:4:6",
                                               "typeDescriptions": {
-                                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                                 "typeString": "struct Market.Deal memory"
                                               }
                                             },
-                                            "id": 4511,
+                                            "id": 4347,
                                             "isConstant": false,
                                             "isLValue": true,
                                             "isPure": false,
                                             "lValueRequested": false,
                                             "memberName": "blockedBalance",
                                             "nodeType": "MemberAccess",
-                                            "referencedDeclaration": 2207,
-                                            "src": "21329:19:7",
+                                            "referencedDeclaration": 2031,
+                                            "src": "21655:19:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
@@ -75854,32 +76136,32 @@
                                           ],
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 4508,
+                                            "id": 4344,
                                             "name": "paidAmount",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4426,
-                                            "src": "21314:10:7",
+                                            "referencedDeclaration": 4262,
+                                            "src": "21640:10:6",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_uint256",
                                               "typeString": "uint256"
                                             }
                                           },
-                                          "id": 4509,
+                                          "id": 4345,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "sub",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 10771,
-                                          "src": "21314:14:7",
+                                          "referencedDeclaration": 11055,
+                                          "src": "21640:14:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                                           }
                                         },
-                                        "id": 4512,
+                                        "id": 4348,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
@@ -75887,7 +76169,7 @@
                                         "lValueRequested": false,
                                         "names": [],
                                         "nodeType": "FunctionCall",
-                                        "src": "21314:35:7",
+                                        "src": "21640:35:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -75901,7 +76183,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -75911,32 +76193,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4503,
+                                        "id": 4339,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "21272:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "21598:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4504,
+                                      "id": 4340,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 11153,
-                                      "src": "21272:18:7",
+                                      "referencedDeclaration": 11437,
+                                      "src": "21598:18:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4513,
+                                    "id": 4349,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -75944,7 +76226,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "21272:78:7",
+                                    "src": "21598:78:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -75958,21 +76240,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4502,
+                                  "id": 4338,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "21264:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "21590:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4514,
+                                "id": 4350,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -75980,20 +76262,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "21264:87:7",
+                                "src": "21590:87:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4515,
+                              "id": 4351,
                               "nodeType": "ExpressionStatement",
-                              "src": "21264:87:7"
+                              "src": "21590:87:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4531,
+                                "id": 4367,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -76004,26 +76286,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4516,
+                                      "id": 4352,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "21369:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "21695:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4518,
+                                    "id": 4354,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4517,
+                                      "id": 4353,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4378,
-                                      "src": "21375:6:7",
+                                      "referencedDeclaration": 4214,
+                                      "src": "21701:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -76034,21 +76316,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "21369:13:7",
+                                    "src": "21695:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4519,
+                                  "id": 4355,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "21369:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "21695:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -76066,26 +76348,26 @@
                                           "argumentTypes": null,
                                           "expression": {
                                             "argumentTypes": null,
-                                            "id": 4527,
+                                            "id": 4363,
                                             "name": "deal",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 4420,
-                                            "src": "21448:4:7",
+                                            "referencedDeclaration": 4256,
+                                            "src": "21774:4:6",
                                             "typeDescriptions": {
-                                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                               "typeString": "struct Market.Deal memory"
                                             }
                                           },
-                                          "id": 4528,
+                                          "id": 4364,
                                           "isConstant": false,
                                           "isLValue": true,
                                           "isPure": false,
                                           "lValueRequested": false,
                                           "memberName": "blockedBalance",
                                           "nodeType": "MemberAccess",
-                                          "referencedDeclaration": 2207,
-                                          "src": "21448:19:7",
+                                          "referencedDeclaration": 2031,
+                                          "src": "21774:19:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -76101,32 +76383,32 @@
                                         ],
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4525,
+                                          "id": 4361,
                                           "name": "paidAmount",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4426,
-                                          "src": "21433:10:7",
+                                          "referencedDeclaration": 4262,
+                                          "src": "21759:10:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
                                           }
                                         },
-                                        "id": 4526,
+                                        "id": 4362,
                                         "isConstant": false,
                                         "isLValue": false,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "sub",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 10771,
-                                        "src": "21433:14:7",
+                                        "referencedDeclaration": 11055,
+                                        "src": "21759:14:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                                         }
                                       },
-                                      "id": 4529,
+                                      "id": 4365,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -76134,7 +76416,7 @@
                                       "lValueRequested": false,
                                       "names": [],
                                       "nodeType": "FunctionCall",
-                                      "src": "21433:35:7",
+                                      "src": "21759:35:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -76154,26 +76436,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4520,
+                                          "id": 4356,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "21400:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "21726:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4522,
+                                        "id": 4358,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4521,
+                                          "id": 4357,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4378,
-                                          "src": "21406:6:7",
+                                          "referencedDeclaration": 4214,
+                                          "src": "21732:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -76184,41 +76466,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "21400:13:7",
+                                        "src": "21726:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4523,
+                                      "id": 4359,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "21400:28:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "21726:28:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4524,
+                                    "id": 4360,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "21400:32:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "21726:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4530,
+                                  "id": 4366,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -76226,21 +76508,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "21400:69:7",
+                                  "src": "21726:69:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "21369:100:7",
+                                "src": "21695:100:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4532,
+                              "id": 4368,
                               "nodeType": "ExpressionStatement",
-                              "src": "21369:100:7"
+                              "src": "21695:100:6"
                             }
                           ]
                         }
@@ -76259,26 +76541,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4594,
+                              "id": 4430,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4420,
-                              "src": "21969:4:7",
+                              "referencedDeclaration": 4256,
+                              "src": "22295:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4595,
+                            "id": 4431,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "21969:13:7",
+                            "referencedDeclaration": 2015,
+                            "src": "22295:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -76286,12 +76568,12 @@
                           },
                           {
                             "argumentTypes": null,
-                            "id": 4596,
+                            "id": 4432,
                             "name": "paidAmount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4426,
-                            "src": "21984:10:7",
+                            "referencedDeclaration": 4262,
+                            "src": "22310:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -76311,32 +76593,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4592,
+                            "id": 4428,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "21954:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "22280:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 4593,
+                          "id": 4429,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "transfer",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10965,
-                          "src": "21954:14:7",
+                          "referencedDeclaration": 11249,
+                          "src": "22280:14:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                             "typeString": "function (address,uint256) external returns (bool)"
                           }
                         },
-                        "id": 4597,
+                        "id": 4433,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -76344,7 +76626,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "21954:41:7",
+                        "src": "22280:41:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -76358,21 +76640,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4591,
+                      "id": 4427,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "21946:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "22272:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4598,
+                    "id": 4434,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76380,20 +76662,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "21946:50:7",
+                    "src": "22272:50:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4599,
+                  "id": 4435,
                   "nodeType": "ExpressionStatement",
-                  "src": "21946:50:7"
+                  "src": "22272:50:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4611,
+                    "id": 4447,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76404,26 +76686,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4600,
+                          "id": 4436,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22006:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22332:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4602,
+                        "id": 4438,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4601,
+                          "id": 4437,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22012:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22338:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76434,21 +76716,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22006:13:7",
+                        "src": "22332:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4603,
+                      "id": 4439,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "22006:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "22332:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76461,12 +76743,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4609,
+                          "id": 4445,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4426,
-                          "src": "22070:10:7",
+                          "referencedDeclaration": 4262,
+                          "src": "22396:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76486,26 +76768,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4604,
+                              "id": 4440,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "22037:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "22363:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4606,
+                            "id": 4442,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4605,
+                              "id": 4441,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "22043:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "22369:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -76516,41 +76798,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22037:13:7",
+                            "src": "22363:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4607,
+                          "id": 4443,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "blockedBalance",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2207,
-                          "src": "22037:28:7",
+                          "referencedDeclaration": 2031,
+                          "src": "22363:28:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4608,
+                        "id": 4444,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "22037:32:7",
+                        "referencedDeclaration": 11055,
+                        "src": "22363:32:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 4610,
+                      "id": 4446,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76558,26 +76840,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22037:44:7",
+                      "src": "22363:44:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22006:75:7",
+                    "src": "22332:75:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4612,
+                  "id": 4448,
                   "nodeType": "ExpressionStatement",
-                  "src": "22006:75:7"
+                  "src": "22332:75:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4624,
+                    "id": 4460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76588,26 +76870,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4613,
+                          "id": 4449,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22091:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22417:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4615,
+                        "id": 4451,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4614,
+                          "id": 4450,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22097:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22423:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76618,21 +76900,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22091:13:7",
+                        "src": "22417:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4616,
+                      "id": 4452,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "totalPayout",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2209,
-                      "src": "22091:25:7",
+                      "referencedDeclaration": 2033,
+                      "src": "22417:25:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76645,12 +76927,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4622,
+                          "id": 4458,
                           "name": "paidAmount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4426,
-                          "src": "22149:10:7",
+                          "referencedDeclaration": 4262,
+                          "src": "22475:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76670,26 +76952,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4617,
+                              "id": 4453,
                               "name": "deals",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2342,
-                              "src": "22119:5:7",
+                              "referencedDeclaration": 2166,
+                              "src": "22445:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                 "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                               }
                             },
-                            "id": 4619,
+                            "id": 4455,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4618,
+                              "id": 4454,
                               "name": "dealID",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4378,
-                              "src": "22125:6:7",
+                              "referencedDeclaration": 4214,
+                              "src": "22451:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -76700,41 +76982,41 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "22119:13:7",
+                            "src": "22445:13:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                              "typeIdentifier": "t_struct$_Deal_$2036_storage",
                               "typeString": "struct Market.Deal storage ref"
                             }
                           },
-                          "id": 4620,
+                          "id": 4456,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "totalPayout",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2209,
-                          "src": "22119:25:7",
+                          "referencedDeclaration": 2033,
+                          "src": "22445:25:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4621,
+                        "id": 4457,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "22119:29:7",
+                        "referencedDeclaration": 11079,
+                        "src": "22445:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 4623,
+                      "id": 4459,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76742,26 +77024,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22119:41:7",
+                      "src": "22445:41:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22091:69:7",
+                    "src": "22417:69:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4625,
+                  "id": 4461,
                   "nodeType": "ExpressionStatement",
-                  "src": "22091:69:7"
+                  "src": "22417:69:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4632,
+                    "id": 4468,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76772,26 +77054,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4626,
+                          "id": 4462,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "22170:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "22496:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4628,
+                        "id": 4464,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4627,
+                          "id": 4463,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4378,
-                          "src": "22176:6:7",
+                          "referencedDeclaration": 4214,
+                          "src": "22502:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -76802,21 +77084,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "22170:13:7",
+                        "src": "22496:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4629,
+                      "id": 4465,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "lastBillTS",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2211,
-                      "src": "22170:24:7",
+                      "referencedDeclaration": 2035,
+                      "src": "22496:24:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -76828,18 +77110,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4630,
+                        "id": 4466,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "22197:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "22523:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 4631,
+                      "id": 4467,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -76847,21 +77129,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "22197:15:7",
+                      "src": "22523:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22170:42:7",
+                    "src": "22496:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4633,
+                  "id": 4469,
                   "nodeType": "ExpressionStatement",
-                  "src": "22170:42:7"
+                  "src": "22496:42:6"
                 },
                 {
                   "eventCall": {
@@ -76869,12 +77151,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4635,
+                        "id": 4471,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4378,
-                        "src": "22234:6:7",
+                        "referencedDeclaration": 4214,
+                        "src": "22560:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -76882,12 +77164,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4636,
+                        "id": 4472,
                         "name": "paidAmount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4426,
-                        "src": "22242:10:7",
+                        "referencedDeclaration": 4262,
+                        "src": "22568:10:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -76905,18 +77187,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4634,
+                      "id": 4470,
                       "name": "Billed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2274,
-                      "src": "22227:6:7",
+                      "referencedDeclaration": 2098,
+                      "src": "22553:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                         "typeString": "function (uint256,uint256)"
                       }
                     },
-                    "id": 4637,
+                    "id": 4473,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -76924,28 +77206,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22227:26:7",
+                    "src": "22553:26:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4638,
+                  "id": 4474,
                   "nodeType": "EmitStatement",
-                  "src": "22222:31:7"
+                  "src": "22548:31:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4639,
+                    "id": 4475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "22270:4:7",
+                    "src": "22596:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -76953,15 +77235,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4382,
-                  "id": 4640,
+                  "functionReturnParameters": 4218,
+                  "id": 4476,
                   "nodeType": "Return",
-                  "src": "22263:11:7"
+                  "src": "22589:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4642,
+            "id": 4478,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -76969,16 +77251,16 @@
             "name": "InternalBill",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4379,
+              "id": 4215,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4378,
+                  "id": 4214,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4642,
-                  "src": "20328:11:7",
+                  "scope": 4478,
+                  "src": "20654:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -76986,10 +77268,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4377,
+                    "id": 4213,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20328:4:7",
+                    "src": "20654:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -76999,20 +77281,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20327:13:7"
+              "src": "20653:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4382,
+              "id": 4218,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4381,
+                  "id": 4217,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4642,
-                  "src": "20359:4:7",
+                  "scope": 4478,
+                  "src": "20685:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -77020,10 +77302,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4380,
+                    "id": 4216,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "20359:4:7",
+                    "src": "20685:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -77033,30 +77315,30 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "20358:6:7"
+              "src": "20684:6:6"
             },
-            "scope": 5229,
-            "src": "20306:1975:7",
+            "scope": 5065,
+            "src": "20632:1975:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4789,
+              "id": 4625,
               "nodeType": "Block",
-              "src": "22356:1314:7",
+              "src": "22682:1314:6",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4650,
+                      "id": 4486,
                       "name": "nextPeriod",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4790,
-                      "src": "22366:15:7",
+                      "scope": 4626,
+                      "src": "22692:15:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -77064,10 +77346,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4649,
+                        "id": 4485,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "22366:4:7",
+                        "src": "22692:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -77077,38 +77359,38 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4651,
+                  "id": 4487,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22366:15:7"
+                  "src": "22692:15:6"
                 },
                 {
                   "assignments": [
-                    4653
+                    4489
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4653,
+                      "id": 4489,
                       "name": "deal",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4790,
-                      "src": "22391:16:7",
+                      "scope": 4626,
+                      "src": "22717:16:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                        "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                         "typeString": "struct Market.Deal"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 4652,
+                        "id": 4488,
                         "name": "Deal",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 2212,
-                        "src": "22391:4:7",
+                        "referencedDeclaration": 2036,
+                        "src": "22717:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage_ptr",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage_ptr",
                           "typeString": "struct Market.Deal"
                         }
                       },
@@ -77116,31 +77398,31 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4657,
+                  "id": 4493,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 4654,
+                      "id": 4490,
                       "name": "deals",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2342,
-                      "src": "22410:5:7",
+                      "referencedDeclaration": 2166,
+                      "src": "22736:5:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                       }
                     },
-                    "id": 4656,
+                    "id": 4492,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 4655,
+                      "id": 4491,
                       "name": "dealID",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4644,
-                      "src": "22416:6:7",
+                      "referencedDeclaration": 4480,
+                      "src": "22742:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77151,14 +77433,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "22410:13:7",
+                    "src": "22736:13:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                       "typeString": "struct Market.Deal storage ref"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "22391:32:7"
+                  "src": "22717:32:6"
                 },
                 {
                   "condition": {
@@ -77166,12 +77448,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4659,
+                        "id": 4495,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4644,
-                        "src": "22445:6:7",
+                        "referencedDeclaration": 4480,
+                        "src": "22771:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -77185,18 +77467,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4658,
+                      "id": 4494,
                       "name": "IsSpot",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4843,
-                      "src": "22438:6:7",
+                      "referencedDeclaration": 4679,
+                      "src": "22764:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 4660,
+                    "id": 4496,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -77204,16 +77486,16 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "22438:14:7",
+                    "src": "22764:14:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 4708,
+                    "id": 4544,
                     "nodeType": "Block",
-                    "src": "22607:360:7",
+                    "src": "22933:360:6",
                     "statements": [
                       {
                         "condition": {
@@ -77222,7 +77504,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4679,
+                          "id": 4515,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77231,18 +77513,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4675,
+                              "id": 4511,
                               "name": "block",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11305,
-                              "src": "22625:5:7",
+                              "referencedDeclaration": 11589,
+                              "src": "22951:5:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_block",
                                 "typeString": "block"
                               }
                             },
-                            "id": 4676,
+                            "id": 4512,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -77250,7 +77532,7 @@
                             "memberName": "timestamp",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22625:15:7",
+                            "src": "22951:15:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77262,58 +77544,58 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4677,
+                              "id": 4513,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4653,
-                              "src": "22643:4:7",
+                              "referencedDeclaration": 4489,
+                              "src": "22969:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4678,
+                            "id": 4514,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "endTime",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2203,
-                            "src": "22643:12:7",
+                            "referencedDeclaration": 2027,
+                            "src": "22969:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "22625:30:7",
+                          "src": "22951:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4683,
+                        "id": 4519,
                         "nodeType": "IfStatement",
-                        "src": "22621:138:7",
+                        "src": "22947:138:6",
                         "trueBody": {
-                          "id": 4682,
+                          "id": 4518,
                           "nodeType": "Block",
-                          "src": "22657:102:7",
+                          "src": "22983:102:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4680,
+                                "id": 4516,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22740:4:7",
+                                "src": "23066:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -77321,10 +77603,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4681,
+                              "functionReturnParameters": 4484,
+                              "id": 4517,
                               "nodeType": "Return",
-                              "src": "22733:11:7"
+                              "src": "23059:11:6"
                             }
                           ]
                         }
@@ -77336,7 +77618,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4691,
+                          "id": 4527,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77348,18 +77630,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4687,
+                                  "id": 4523,
                                   "name": "block",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11305,
-                                  "src": "22793:5:7",
+                                  "referencedDeclaration": 11589,
+                                  "src": "23119:5:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_block",
                                     "typeString": "block"
                                   }
                                 },
-                                "id": 4688,
+                                "id": 4524,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -77367,7 +77649,7 @@
                                 "memberName": "timestamp",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "22793:15:7",
+                                "src": "23119:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -77385,46 +77667,46 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4684,
+                                  "id": 4520,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4653,
-                                  "src": "22776:4:7",
+                                  "referencedDeclaration": 4489,
+                                  "src": "23102:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4685,
+                                "id": 4521,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "endTime",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2203,
-                                "src": "22776:12:7",
+                                "referencedDeclaration": 2027,
+                                "src": "23102:12:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4686,
+                              "id": 4522,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "22776:16:7",
+                              "referencedDeclaration": 11055,
+                              "src": "23102:16:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4689,
+                            "id": 4525,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -77432,7 +77714,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "22776:33:7",
+                            "src": "23102:33:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77443,14 +77725,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4690,
+                            "id": 4526,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22812:6:7",
+                            "src": "23138:6:6",
                             "subdenomination": "days",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_86400_by_1",
@@ -77458,33 +77740,33 @@
                             },
                             "value": "1"
                           },
-                          "src": "22776:42:7",
+                          "src": "23102:42:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4706,
+                          "id": 4542,
                           "nodeType": "Block",
-                          "src": "22905:52:7",
+                          "src": "23231:52:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4704,
+                                "id": 4540,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 4702,
+                                  "id": 4538,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "22923:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23249:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -77495,14 +77777,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 4703,
+                                  "id": 4539,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "22936:6:7",
+                                  "src": "23262:6:6",
                                   "subdenomination": "days",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_86400_by_1",
@@ -77510,42 +77792,42 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "22923:19:7",
+                                "src": "23249:19:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4705,
+                              "id": 4541,
                               "nodeType": "ExpressionStatement",
-                              "src": "22923:19:7"
+                              "src": "23249:19:6"
                             }
                           ]
                         },
-                        "id": 4707,
+                        "id": 4543,
                         "nodeType": "IfStatement",
-                        "src": "22772:185:7",
+                        "src": "23098:185:6",
                         "trueBody": {
-                          "id": 4701,
+                          "id": 4537,
                           "nodeType": "Block",
-                          "src": "22820:79:7",
+                          "src": "23146:79:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4699,
+                                "id": 4535,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftHandSide": {
                                   "argumentTypes": null,
-                                  "id": 4692,
+                                  "id": 4528,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "22838:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23164:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -77560,18 +77842,18 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4696,
+                                        "id": 4532,
                                         "name": "block",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11305,
-                                        "src": "22868:5:7",
+                                        "referencedDeclaration": 11589,
+                                        "src": "23194:5:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_magic_block",
                                           "typeString": "block"
                                         }
                                       },
-                                      "id": 4697,
+                                      "id": 4533,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -77579,7 +77861,7 @@
                                       "memberName": "timestamp",
                                       "nodeType": "MemberAccess",
                                       "referencedDeclaration": null,
-                                      "src": "22868:15:7",
+                                      "src": "23194:15:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -77597,46 +77879,46 @@
                                       "argumentTypes": null,
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4693,
+                                        "id": 4529,
                                         "name": "deal",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4653,
-                                        "src": "22851:4:7",
+                                        "referencedDeclaration": 4489,
+                                        "src": "23177:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                           "typeString": "struct Market.Deal memory"
                                         }
                                       },
-                                      "id": 4694,
+                                      "id": 4530,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "endTime",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2203,
-                                      "src": "22851:12:7",
+                                      "referencedDeclaration": 2027,
+                                      "src": "23177:12:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4695,
+                                    "id": 4531,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "sub",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10771,
-                                    "src": "22851:16:7",
+                                    "referencedDeclaration": 11055,
+                                    "src": "23177:16:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4698,
+                                  "id": 4534,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -77644,43 +77926,43 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "22851:33:7",
+                                  "src": "23177:33:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "22838:46:7",
+                                "src": "23164:46:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4700,
+                              "id": 4536,
                               "nodeType": "ExpressionStatement",
-                              "src": "22838:46:7"
+                              "src": "23164:46:6"
                             }
                           ]
                         }
                       }
                     ]
                   },
-                  "id": 4709,
+                  "id": 4545,
                   "nodeType": "IfStatement",
-                  "src": "22434:533:7",
+                  "src": "22760:533:6",
                   "trueBody": {
-                    "id": 4674,
+                    "id": 4510,
                     "nodeType": "Block",
-                    "src": "22454:147:7",
+                    "src": "22780:147:6",
                     "statements": [
                       {
                         "condition": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_DealStatus_$2164",
+                            "typeIdentifier": "t_enum$_DealStatus_$1988",
                             "typeString": "enum Market.DealStatus"
                           },
-                          "id": 4665,
+                          "id": 4501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -77689,28 +77971,28 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4661,
+                              "id": 4497,
                               "name": "deal",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4653,
-                              "src": "22472:4:7",
+                              "referencedDeclaration": 4489,
+                              "src": "22798:4:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                 "typeString": "struct Market.Deal memory"
                               }
                             },
-                            "id": 4662,
+                            "id": 4498,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "status",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2205,
-                            "src": "22472:11:7",
+                            "referencedDeclaration": 2029,
+                            "src": "22798:11:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
@@ -77720,18 +78002,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4663,
+                              "id": 4499,
                               "name": "DealStatus",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2164,
-                              "src": "22487:10:7",
+                              "referencedDeclaration": 1988,
+                              "src": "22813:10:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                 "typeString": "type(enum Market.DealStatus)"
                               }
                             },
-                            "id": 4664,
+                            "id": 4500,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -77739,39 +78021,39 @@
                             "memberName": "STATUS_CLOSED",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "22487:24:7",
+                            "src": "22813:24:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             }
                           },
-                          "src": "22472:39:7",
+                          "src": "22798:39:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4669,
+                        "id": 4505,
                         "nodeType": "IfStatement",
-                        "src": "22468:89:7",
+                        "src": "22794:89:6",
                         "trueBody": {
-                          "id": 4668,
+                          "id": 4504,
                           "nodeType": "Block",
-                          "src": "22513:44:7",
+                          "src": "22839:44:6",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4666,
+                                "id": 4502,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "22538:4:7",
+                                "src": "22864:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -77779,10 +78061,10 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4667,
+                              "functionReturnParameters": 4484,
+                              "id": 4503,
                               "nodeType": "Return",
-                              "src": "22531:11:7"
+                              "src": "22857:11:6"
                             }
                           ]
                         }
@@ -77790,19 +78072,19 @@
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4672,
+                          "id": 4508,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftHandSide": {
                             "argumentTypes": null,
-                            "id": 4670,
+                            "id": 4506,
                             "name": "nextPeriod",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4650,
-                            "src": "22570:10:7",
+                            "referencedDeclaration": 4486,
+                            "src": "22896:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -77813,14 +78095,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 4671,
+                            "id": 4507,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "22583:7:7",
+                            "src": "22909:7:6",
                             "subdenomination": "hours",
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_3600_by_1",
@@ -77828,15 +78110,15 @@
                             },
                             "value": "1"
                           },
-                          "src": "22570:20:7",
+                          "src": "22896:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4673,
+                        "id": 4509,
                         "nodeType": "ExpressionStatement",
-                        "src": "22570:20:7"
+                        "src": "22896:20:6"
                       }
                     ]
                   }
@@ -77848,7 +78130,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4719,
+                    "id": 4555,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -77860,26 +78142,26 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4711,
+                            "id": 4547,
                             "name": "deal",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4653,
-                            "src": "22998:4:7",
+                            "referencedDeclaration": 4489,
+                            "src": "23324:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                              "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                               "typeString": "struct Market.Deal memory"
                             }
                           },
-                          "id": 4712,
+                          "id": 4548,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "price",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 2199,
-                          "src": "22998:10:7",
+                          "referencedDeclaration": 2023,
+                          "src": "23324:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77887,12 +78169,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4713,
+                          "id": 4549,
                           "name": "nextPeriod",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4650,
-                          "src": "23010:10:7",
+                          "referencedDeclaration": 4486,
+                          "src": "23336:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77910,18 +78192,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4710,
+                        "id": 4546,
                         "name": "CalculatePayment",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4870,
-                        "src": "22981:16:7",
+                        "referencedDeclaration": 4706,
+                        "src": "23307:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                           "typeString": "function (uint256,uint256) view returns (uint256)"
                         }
                       },
-                      "id": 4714,
+                      "id": 4550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -77929,7 +78211,7 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "22981:40:7",
+                      "src": "23307:40:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77943,26 +78225,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4715,
+                          "id": 4551,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "23024:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "23350:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4717,
+                        "id": 4553,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4716,
+                          "id": 4552,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4644,
-                          "src": "23030:6:7",
+                          "referencedDeclaration": 4480,
+                          "src": "23356:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -77973,53 +78255,53 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23024:13:7",
+                        "src": "23350:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4718,
+                      "id": 4554,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "23024:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "23350:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "22981:71:7",
+                    "src": "23307:71:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4786,
+                  "id": 4622,
                   "nodeType": "IfStatement",
-                  "src": "22977:666:7",
+                  "src": "23303:666:6",
                   "trueBody": {
-                    "id": 4785,
+                    "id": 4621,
                     "nodeType": "Block",
-                    "src": "23054:589:7",
+                    "src": "23380:589:6",
                     "statements": [
                       {
                         "assignments": [
-                          4721
+                          4557
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 4721,
+                            "id": 4557,
                             "name": "nextPeriodSum",
                             "nodeType": "VariableDeclaration",
-                            "scope": 4790,
-                            "src": "23068:18:7",
+                            "scope": 4626,
+                            "src": "23394:18:6",
                             "stateVariable": false,
                             "storageLocation": "default",
                             "typeDescriptions": {
@@ -78027,10 +78309,10 @@
                               "typeString": "uint256"
                             },
                             "typeName": {
-                              "id": 4720,
+                              "id": 4556,
                               "name": "uint",
                               "nodeType": "ElementaryTypeName",
-                              "src": "23068:4:7",
+                              "src": "23394:4:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -78040,7 +78322,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 4733,
+                        "id": 4569,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -78050,26 +78332,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4728,
+                                  "id": 4564,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23134:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "23460:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4730,
+                                "id": 4566,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4729,
+                                  "id": 4565,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4644,
-                                  "src": "23140:6:7",
+                                  "referencedDeclaration": 4480,
+                                  "src": "23466:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78080,21 +78362,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23134:13:7",
+                                "src": "23460:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4731,
+                              "id": 4567,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2207,
-                              "src": "23134:28:7",
+                              "referencedDeclaration": 2031,
+                              "src": "23460:28:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -78115,26 +78397,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4723,
+                                    "id": 4559,
                                     "name": "deal",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4653,
-                                    "src": "23106:4:7",
+                                    "referencedDeclaration": 4489,
+                                    "src": "23432:4:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                       "typeString": "struct Market.Deal memory"
                                     }
                                   },
-                                  "id": 4724,
+                                  "id": 4560,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "memberName": "price",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2199,
-                                  "src": "23106:10:7",
+                                  "referencedDeclaration": 2023,
+                                  "src": "23432:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78142,12 +78424,12 @@
                                 },
                                 {
                                   "argumentTypes": null,
-                                  "id": 4725,
+                                  "id": 4561,
                                   "name": "nextPeriod",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4650,
-                                  "src": "23118:10:7",
+                                  "referencedDeclaration": 4486,
+                                  "src": "23444:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78165,18 +78447,18 @@
                                     "typeString": "uint256"
                                   }
                                 ],
-                                "id": 4722,
+                                "id": 4558,
                                 "name": "CalculatePayment",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4870,
-                                "src": "23089:16:7",
+                                "referencedDeclaration": 4706,
+                                "src": "23415:16:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_function_internal_view$_t_uint256_$_t_uint256_$returns$_t_uint256_$",
                                   "typeString": "function (uint256,uint256) view returns (uint256)"
                                 }
                               },
-                              "id": 4726,
+                              "id": 4562,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -78184,27 +78466,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "23089:40:7",
+                              "src": "23415:40:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 4727,
+                            "id": 4563,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "sub",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10771,
-                            "src": "23089:44:7",
+                            "referencedDeclaration": 11055,
+                            "src": "23415:44:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 4732,
+                          "id": 4568,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -78212,14 +78494,14 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23089:74:7",
+                          "src": "23415:74:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "23068:95:7"
+                        "src": "23394:95:6"
                       },
                       {
                         "condition": {
@@ -78228,7 +78510,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4740,
+                          "id": 4576,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -78240,26 +78522,26 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4736,
+                                  "id": 4572,
                                   "name": "deal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4653,
-                                  "src": "23198:4:7",
+                                  "referencedDeclaration": 4489,
+                                  "src": "23524:4:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                     "typeString": "struct Market.Deal memory"
                                   }
                                 },
-                                "id": 4737,
+                                "id": 4573,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "23198:15:7",
+                                "referencedDeclaration": 2013,
+                                "src": "23524:15:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -78275,32 +78557,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4734,
+                                "id": 4570,
                                 "name": "token",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2315,
-                                "src": "23182:5:7",
+                                "referencedDeclaration": 2139,
+                                "src": "23508:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_SNM_$10080",
+                                  "typeIdentifier": "t_contract$_SNM_$10926",
                                   "typeString": "contract SNM"
                                 }
                               },
-                              "id": 4735,
+                              "id": 4571,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "balanceOf",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10977,
-                              "src": "23182:15:7",
+                              "referencedDeclaration": 11261,
+                              "src": "23508:15:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                                 "typeString": "function (address) view external returns (uint256)"
                               }
                             },
-                            "id": 4738,
+                            "id": 4574,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -78308,7 +78590,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "23182:32:7",
+                            "src": "23508:32:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -78318,27 +78600,27 @@
                           "operator": ">=",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4739,
+                            "id": 4575,
                             "name": "nextPeriodSum",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4721,
-                            "src": "23218:13:7",
+                            "referencedDeclaration": 4557,
+                            "src": "23544:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "23182:49:7",
+                          "src": "23508:49:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4783,
+                          "id": 4619,
                           "nodeType": "Block",
-                          "src": "23433:200:7",
+                          "src": "23759:200:6",
                           "statements": [
                             {
                               "eventCall": {
@@ -78346,12 +78628,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4766,
+                                    "id": 4602,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23463:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23789:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78363,26 +78645,26 @@
                                       "argumentTypes": null,
                                       "baseExpression": {
                                         "argumentTypes": null,
-                                        "id": 4767,
+                                        "id": 4603,
                                         "name": "deals",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2342,
-                                        "src": "23471:5:7",
+                                        "referencedDeclaration": 2166,
+                                        "src": "23797:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                           "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                         }
                                       },
-                                      "id": 4769,
+                                      "id": 4605,
                                       "indexExpression": {
                                         "argumentTypes": null,
-                                        "id": 4768,
+                                        "id": 4604,
                                         "name": "dealID",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4644,
-                                        "src": "23477:6:7",
+                                        "referencedDeclaration": 4480,
+                                        "src": "23803:6:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -78393,21 +78675,21 @@
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "nodeType": "IndexAccess",
-                                      "src": "23471:13:7",
+                                      "src": "23797:13:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                        "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                         "typeString": "struct Market.Deal storage ref"
                                       }
                                     },
-                                    "id": 4770,
+                                    "id": 4606,
                                     "isConstant": false,
                                     "isLValue": true,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "blockedBalance",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 2207,
-                                    "src": "23471:28:7",
+                                    "referencedDeclaration": 2031,
+                                    "src": "23797:28:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78425,18 +78707,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4765,
+                                  "id": 4601,
                                   "name": "Billed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2274,
-                                  "src": "23456:6:7",
+                                  "referencedDeclaration": 2098,
+                                  "src": "23782:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256,uint256)"
                                   }
                                 },
-                                "id": 4771,
+                                "id": 4607,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78444,15 +78726,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23456:44:7",
+                                "src": "23782:44:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4772,
+                              "id": 4608,
                               "nodeType": "EmitStatement",
-                              "src": "23451:49:7"
+                              "src": "23777:49:6"
                             },
                             {
                               "expression": {
@@ -78460,12 +78742,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4774,
+                                    "id": 4610,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23536:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23862:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78479,18 +78761,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4773,
+                                  "id": 4609,
                                   "name": "InternalCloseDeal",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5004,
-                                  "src": "23518:17:7",
+                                  "referencedDeclaration": 4840,
+                                  "src": "23844:17:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4775,
+                                "id": 4611,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78498,15 +78780,15 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23518:25:7",
+                                "src": "23844:25:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4776,
+                              "id": 4612,
                               "nodeType": "ExpressionStatement",
-                              "src": "23518:25:7"
+                              "src": "23844:25:6"
                             },
                             {
                               "expression": {
@@ -78514,12 +78796,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4778,
+                                    "id": 4614,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4644,
-                                    "src": "23582:6:7",
+                                    "referencedDeclaration": 4480,
+                                    "src": "23908:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -78533,18 +78815,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4777,
+                                  "id": 4613,
                                   "name": "RefundRemainingFunds",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4828,
-                                  "src": "23561:20:7",
+                                  "referencedDeclaration": 4664,
+                                  "src": "23887:20:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$_t_bool_$",
                                     "typeString": "function (uint256) returns (bool)"
                                   }
                                 },
-                                "id": 4779,
+                                "id": 4615,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78552,28 +78834,28 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23561:28:7",
+                                "src": "23887:28:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 4780,
+                              "id": 4616,
                               "nodeType": "ExpressionStatement",
-                              "src": "23561:28:7"
+                              "src": "23887:28:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
                                 "hexValue": "74727565",
-                                "id": 4781,
+                                "id": 4617,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
                                 "kind": "bool",
                                 "lValueRequested": false,
                                 "nodeType": "Literal",
-                                "src": "23614:4:7",
+                                "src": "23940:4:6",
                                 "subdenomination": null,
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
@@ -78581,20 +78863,20 @@
                                 },
                                 "value": "true"
                               },
-                              "functionReturnParameters": 4648,
-                              "id": 4782,
+                              "functionReturnParameters": 4484,
+                              "id": 4618,
                               "nodeType": "Return",
-                              "src": "23607:11:7"
+                              "src": "23933:11:6"
                             }
                           ]
                         },
-                        "id": 4784,
+                        "id": 4620,
                         "nodeType": "IfStatement",
-                        "src": "23178:455:7",
+                        "src": "23504:455:6",
                         "trueBody": {
-                          "id": 4764,
+                          "id": 4600,
                           "nodeType": "Block",
-                          "src": "23233:194:7",
+                          "src": "23559:194:6",
                           "statements": [
                             {
                               "expression": {
@@ -78607,26 +78889,26 @@
                                         "argumentTypes": null,
                                         "expression": {
                                           "argumentTypes": null,
-                                          "id": 4744,
+                                          "id": 4580,
                                           "name": "deal",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4653,
-                                          "src": "23278:4:7",
+                                          "referencedDeclaration": 4489,
+                                          "src": "23604:4:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_struct$_Deal_$2212_memory_ptr",
+                                            "typeIdentifier": "t_struct$_Deal_$2036_memory_ptr",
                                             "typeString": "struct Market.Deal memory"
                                           }
                                         },
-                                        "id": 4745,
+                                        "id": 4581,
                                         "isConstant": false,
                                         "isLValue": true,
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "memberName": "consumerID",
                                         "nodeType": "MemberAccess",
-                                        "referencedDeclaration": 2189,
-                                        "src": "23278:15:7",
+                                        "referencedDeclaration": 2013,
+                                        "src": "23604:15:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_address",
                                           "typeString": "address"
@@ -78634,25 +78916,25 @@
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4746,
+                                        "id": 4582,
                                         "name": "this",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11366,
-                                        "src": "23295:4:7",
+                                        "referencedDeclaration": 11646,
+                                        "src": "23621:4:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         }
                                       },
                                       {
                                         "argumentTypes": null,
-                                        "id": 4747,
+                                        "id": 4583,
                                         "name": "nextPeriodSum",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 4721,
-                                        "src": "23301:13:7",
+                                        "referencedDeclaration": 4557,
+                                        "src": "23627:13:6",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_uint256",
                                           "typeString": "uint256"
@@ -78666,7 +78948,7 @@
                                           "typeString": "address"
                                         },
                                         {
-                                          "typeIdentifier": "t_contract$_Market_$5229",
+                                          "typeIdentifier": "t_contract$_Market_$5065",
                                           "typeString": "contract Market"
                                         },
                                         {
@@ -78676,32 +78958,32 @@
                                       ],
                                       "expression": {
                                         "argumentTypes": null,
-                                        "id": 4742,
+                                        "id": 4578,
                                         "name": "token",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 2315,
-                                        "src": "23259:5:7",
+                                        "referencedDeclaration": 2139,
+                                        "src": "23585:5:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_contract$_SNM_$10080",
+                                          "typeIdentifier": "t_contract$_SNM_$10926",
                                           "typeString": "contract SNM"
                                         }
                                       },
-                                      "id": 4743,
+                                      "id": 4579,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "transferFrom",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 11153,
-                                      "src": "23259:18:7",
+                                      "referencedDeclaration": 11437,
+                                      "src": "23585:18:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$",
                                         "typeString": "function (address,address,uint256) external returns (bool)"
                                       }
                                     },
-                                    "id": 4748,
+                                    "id": 4584,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -78709,7 +78991,7 @@
                                     "lValueRequested": false,
                                     "names": [],
                                     "nodeType": "FunctionCall",
-                                    "src": "23259:56:7",
+                                    "src": "23585:56:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_bool",
                                       "typeString": "bool"
@@ -78723,21 +79005,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 4741,
+                                  "id": 4577,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
-                                  "src": "23251:7:7",
+                                  "referencedDeclaration": 11602,
+                                  "src": "23577:7:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 4749,
+                                "id": 4585,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78745,20 +79027,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "23251:65:7",
+                                "src": "23577:65:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4750,
+                              "id": 4586,
                               "nodeType": "ExpressionStatement",
-                              "src": "23251:65:7"
+                              "src": "23577:65:6"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4762,
+                                "id": 4598,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -78769,26 +79051,26 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4751,
+                                      "id": 4587,
                                       "name": "deals",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 2342,
-                                      "src": "23334:5:7",
+                                      "referencedDeclaration": 2166,
+                                      "src": "23660:5:6",
                                       "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                         "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                       }
                                     },
-                                    "id": 4753,
+                                    "id": 4589,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4752,
+                                      "id": 4588,
                                       "name": "dealID",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4644,
-                                      "src": "23340:6:7",
+                                      "referencedDeclaration": 4480,
+                                      "src": "23666:6:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -78799,21 +79081,21 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "23334:13:7",
+                                    "src": "23660:13:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                      "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                       "typeString": "struct Market.Deal storage ref"
                                     }
                                   },
-                                  "id": 4754,
+                                  "id": 4590,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "blockedBalance",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 2207,
-                                  "src": "23334:28:7",
+                                  "referencedDeclaration": 2031,
+                                  "src": "23660:28:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -78826,12 +79108,12 @@
                                   "arguments": [
                                     {
                                       "argumentTypes": null,
-                                      "id": 4760,
+                                      "id": 4596,
                                       "name": "nextPeriodSum",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4721,
-                                      "src": "23398:13:7",
+                                      "referencedDeclaration": 4557,
+                                      "src": "23724:13:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -78851,26 +79133,26 @@
                                         "argumentTypes": null,
                                         "baseExpression": {
                                           "argumentTypes": null,
-                                          "id": 4755,
+                                          "id": 4591,
                                           "name": "deals",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 2342,
-                                          "src": "23365:5:7",
+                                          "referencedDeclaration": 2166,
+                                          "src": "23691:5:6",
                                           "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                           }
                                         },
-                                        "id": 4757,
+                                        "id": 4593,
                                         "indexExpression": {
                                           "argumentTypes": null,
-                                          "id": 4756,
+                                          "id": 4592,
                                           "name": "dealID",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 4644,
-                                          "src": "23371:6:7",
+                                          "referencedDeclaration": 4480,
+                                          "src": "23697:6:6",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_uint256",
                                             "typeString": "uint256"
@@ -78881,41 +79163,41 @@
                                         "isPure": false,
                                         "lValueRequested": false,
                                         "nodeType": "IndexAccess",
-                                        "src": "23365:13:7",
+                                        "src": "23691:13:6",
                                         "typeDescriptions": {
-                                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                           "typeString": "struct Market.Deal storage ref"
                                         }
                                       },
-                                      "id": 4758,
+                                      "id": 4594,
                                       "isConstant": false,
                                       "isLValue": true,
                                       "isPure": false,
                                       "lValueRequested": false,
                                       "memberName": "blockedBalance",
                                       "nodeType": "MemberAccess",
-                                      "referencedDeclaration": 2207,
-                                      "src": "23365:28:7",
+                                      "referencedDeclaration": 2031,
+                                      "src": "23691:28:6",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
                                       }
                                     },
-                                    "id": 4759,
+                                    "id": 4595,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "memberName": "add",
                                     "nodeType": "MemberAccess",
-                                    "referencedDeclaration": 10795,
-                                    "src": "23365:32:7",
+                                    "referencedDeclaration": 11079,
+                                    "src": "23691:32:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                       "typeString": "function (uint256,uint256) pure returns (uint256)"
                                     }
                                   },
-                                  "id": 4761,
+                                  "id": 4597,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -78923,21 +79205,21 @@
                                   "lValueRequested": false,
                                   "names": [],
                                   "nodeType": "FunctionCall",
-                                  "src": "23365:47:7",
+                                  "src": "23691:47:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
                                   }
                                 },
-                                "src": "23334:78:7",
+                                "src": "23660:78:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4763,
+                              "id": 4599,
                               "nodeType": "ExpressionStatement",
-                              "src": "23334:78:7"
+                              "src": "23660:78:6"
                             }
                           ]
                         }
@@ -78949,14 +79231,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4787,
+                    "id": 4623,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23659:4:7",
+                    "src": "23985:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -78964,15 +79246,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4648,
-                  "id": 4788,
+                  "functionReturnParameters": 4484,
+                  "id": 4624,
                   "nodeType": "Return",
-                  "src": "23652:11:7"
+                  "src": "23978:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4790,
+            "id": 4626,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -78980,16 +79262,16 @@
             "name": "ReserveNextPeriodFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4645,
+              "id": 4481,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4644,
+                  "id": 4480,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4790,
-                  "src": "22319:11:7",
+                  "scope": 4626,
+                  "src": "22645:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -78997,10 +79279,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4643,
+                    "id": 4479,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22319:4:7",
+                    "src": "22645:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79010,20 +79292,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22318:13:7"
+              "src": "22644:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4648,
+              "id": 4484,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4647,
+                  "id": 4483,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4790,
-                  "src": "22350:4:7",
+                  "scope": 4626,
+                  "src": "22676:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79031,10 +79313,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4646,
+                    "id": 4482,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "22350:4:7",
+                    "src": "22676:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79044,19 +79326,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "22349:6:7"
+              "src": "22675:6:6"
             },
-            "scope": 5229,
-            "src": "22287:1383:7",
+            "scope": 5065,
+            "src": "22613:1383:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4827,
+              "id": 4663,
               "nodeType": "Block",
-              "src": "23742:217:7",
+              "src": "24068:217:6",
               "statements": [
                 {
                   "condition": {
@@ -79065,7 +79347,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4802,
+                    "id": 4638,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79076,26 +79358,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4797,
+                          "id": 4633,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "23756:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "24082:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4799,
+                        "id": 4635,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4798,
+                          "id": 4634,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4792,
-                          "src": "23762:6:7",
+                          "referencedDeclaration": 4628,
+                          "src": "24088:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -79106,21 +79388,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "23756:13:7",
+                        "src": "24082:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4800,
+                      "id": 4636,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "blockedBalance",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2207,
-                      "src": "23756:28:7",
+                      "referencedDeclaration": 2031,
+                      "src": "24082:28:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -79131,14 +79413,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4801,
+                      "id": 4637,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "23788:1:7",
+                      "src": "24114:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -79146,20 +79428,20 @@
                       },
                       "value": "0"
                     },
-                    "src": "23756:33:7",
+                    "src": "24082:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4824,
+                  "id": 4660,
                   "nodeType": "IfStatement",
-                  "src": "23752:180:7",
+                  "src": "24078:180:6",
                   "trueBody": {
-                    "id": 4823,
+                    "id": 4659,
                     "nodeType": "Block",
-                    "src": "23791:141:7",
+                    "src": "24117:141:6",
                     "statements": [
                       {
                         "expression": {
@@ -79171,26 +79453,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4806,
+                                  "id": 4642,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23820:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24146:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4808,
+                                "id": 4644,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4807,
+                                  "id": 4643,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4792,
-                                  "src": "23826:6:7",
+                                  "referencedDeclaration": 4628,
+                                  "src": "24152:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -79201,21 +79483,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23820:13:7",
+                                "src": "24146:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4809,
+                              "id": 4645,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "23820:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "24146:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -79227,26 +79509,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4810,
+                                  "id": 4646,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "23846:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24172:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4812,
+                                "id": 4648,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4811,
+                                  "id": 4647,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4792,
-                                  "src": "23852:6:7",
+                                  "referencedDeclaration": 4628,
+                                  "src": "24178:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -79257,21 +79539,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "23846:13:7",
+                                "src": "24172:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4813,
+                              "id": 4649,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "blockedBalance",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2207,
-                              "src": "23846:28:7",
+                              "referencedDeclaration": 2031,
+                              "src": "24172:28:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -79291,32 +79573,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4803,
+                              "id": 4639,
                               "name": "token",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2315,
-                              "src": "23805:5:7",
+                              "referencedDeclaration": 2139,
+                              "src": "24131:5:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_SNM_$10080",
+                                "typeIdentifier": "t_contract$_SNM_$10926",
                                 "typeString": "contract SNM"
                               }
                             },
-                            "id": 4805,
+                            "id": 4641,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "transfer",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10965,
-                            "src": "23805:14:7",
+                            "referencedDeclaration": 11249,
+                            "src": "24131:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                               "typeString": "function (address,uint256) external returns (bool)"
                             }
                           },
-                          "id": 4814,
+                          "id": 4650,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -79324,20 +79606,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "23805:70:7",
+                          "src": "24131:70:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4815,
+                        "id": 4651,
                         "nodeType": "ExpressionStatement",
-                        "src": "23805:70:7"
+                        "src": "24131:70:6"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4821,
+                          "id": 4657,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -79348,26 +79630,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4816,
+                                "id": 4652,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "23889:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "24215:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4818,
+                              "id": 4654,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4817,
+                                "id": 4653,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4792,
-                                "src": "23895:6:7",
+                                "referencedDeclaration": 4628,
+                                "src": "24221:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -79378,21 +79660,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "23889:13:7",
+                              "src": "24215:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4819,
+                            "id": 4655,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "blockedBalance",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2207,
-                            "src": "23889:28:7",
+                            "referencedDeclaration": 2031,
+                            "src": "24215:28:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -79403,14 +79685,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 4820,
+                            "id": 4656,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "23920:1:7",
+                            "src": "24246:1:6",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -79418,15 +79700,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "23889:32:7",
+                          "src": "24215:32:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4822,
+                        "id": 4658,
                         "nodeType": "ExpressionStatement",
-                        "src": "23889:32:7"
+                        "src": "24215:32:6"
                       }
                     ]
                   }
@@ -79435,14 +79717,14 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 4825,
+                    "id": 4661,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "23948:4:7",
+                    "src": "24274:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -79450,15 +79732,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 4796,
-                  "id": 4826,
+                  "functionReturnParameters": 4632,
+                  "id": 4662,
                   "nodeType": "Return",
-                  "src": "23941:11:7"
+                  "src": "24267:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4828,
+            "id": 4664,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -79466,16 +79748,16 @@
             "name": "RefundRemainingFunds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4793,
+              "id": 4629,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4792,
+                  "id": 4628,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4828,
-                  "src": "23706:11:7",
+                  "scope": 4664,
+                  "src": "24032:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79483,10 +79765,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4791,
+                    "id": 4627,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23706:4:7",
+                    "src": "24032:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79496,20 +79778,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23705:13:7"
+              "src": "24031:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4796,
+              "id": 4632,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4795,
+                  "id": 4631,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4828,
-                  "src": "23737:4:7",
+                  "scope": 4664,
+                  "src": "24063:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79517,10 +79799,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4794,
+                    "id": 4630,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23737:4:7",
+                    "src": "24063:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79530,19 +79812,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23736:6:7"
+              "src": "24062:6:6"
             },
-            "scope": 5229,
-            "src": "23676:283:7",
+            "scope": 5065,
+            "src": "24002:283:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4842,
+              "id": 4678,
               "nodeType": "Block",
-              "src": "24022:51:7",
+              "src": "24348:51:6",
               "statements": [
                 {
                   "expression": {
@@ -79551,7 +79833,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4840,
+                    "id": 4676,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79562,26 +79844,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4835,
+                          "id": 4671,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "24039:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "24365:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4837,
+                        "id": 4673,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4836,
+                          "id": 4672,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4830,
-                          "src": "24045:6:7",
+                          "referencedDeclaration": 4666,
+                          "src": "24371:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -79592,21 +79874,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24039:13:7",
+                        "src": "24365:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4838,
+                      "id": 4674,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "duration",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2197,
-                      "src": "24039:22:7",
+                      "referencedDeclaration": 2021,
+                      "src": "24365:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -79617,14 +79899,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4839,
+                      "id": 4675,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "24065:1:7",
+                      "src": "24391:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -79632,21 +79914,21 @@
                       },
                       "value": "0"
                     },
-                    "src": "24039:27:7",
+                    "src": "24365:27:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 4834,
-                  "id": 4841,
+                  "functionReturnParameters": 4670,
+                  "id": 4677,
                   "nodeType": "Return",
-                  "src": "24032:34:7"
+                  "src": "24358:34:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4843,
+            "id": 4679,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -79654,16 +79936,16 @@
             "name": "IsSpot",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4831,
+              "id": 4667,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4830,
+                  "id": 4666,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4843,
-                  "src": "23981:11:7",
+                  "scope": 4679,
+                  "src": "24307:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79671,10 +79953,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4829,
+                    "id": 4665,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "23981:4:7",
+                    "src": "24307:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -79684,20 +79966,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "23980:13:7"
+              "src": "24306:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4834,
+              "id": 4670,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4833,
+                  "id": 4669,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4843,
-                  "src": "24017:4:7",
+                  "scope": 4679,
+                  "src": "24343:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -79705,10 +79987,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4832,
+                    "id": 4668,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24017:4:7",
+                    "src": "24343:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -79718,32 +80000,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24016:6:7"
+              "src": "24342:6:6"
             },
-            "scope": 5229,
-            "src": "23965:108:7",
+            "scope": 5065,
+            "src": "24291:108:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4869,
+              "id": 4705,
               "nodeType": "Block",
-              "src": "24161:109:7",
+              "src": "24487:109:6",
               "statements": [
                 {
                   "assignments": [
-                    4853
+                    4689
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4853,
+                      "id": 4689,
                       "name": "rate",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4870,
-                      "src": "24171:9:7",
+                      "scope": 4706,
+                      "src": "24497:9:6",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -79751,10 +80033,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4852,
+                        "id": 4688,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "24171:4:7",
+                        "src": "24497:4:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -79764,7 +80046,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4857,
+                  "id": 4693,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [],
@@ -79772,32 +80054,32 @@
                       "argumentTypes": [],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4854,
+                        "id": 4690,
                         "name": "oracle",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2319,
-                        "src": "24183:6:7",
+                        "referencedDeclaration": 2143,
+                        "src": "24509:6:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                          "typeIdentifier": "t_contract$_OracleUSD_$9523",
                           "typeString": "contract OracleUSD"
                         }
                       },
-                      "id": 4855,
+                      "id": 4691,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "getCurrentPrice",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 8676,
-                      "src": "24183:22:7",
+                      "referencedDeclaration": 9522,
+                      "src": "24509:22:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                         "typeString": "function () view external returns (uint256)"
                       }
                     },
-                    "id": 4856,
+                    "id": 4692,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79805,14 +80087,14 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24183:24:7",
+                    "src": "24509:24:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "24171:36:7"
+                  "src": "24497:36:6"
                 },
                 {
                   "expression": {
@@ -79821,14 +80103,14 @@
                       {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 4866,
+                        "id": 4702,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "24258:4:7",
+                        "src": "24584:4:6",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1000000000000000000_by_1",
@@ -79849,12 +80131,12 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 4863,
+                            "id": 4699,
                             "name": "_period",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4847,
-                            "src": "24245:7:7",
+                            "referencedDeclaration": 4683,
+                            "src": "24571:7:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -79873,12 +80155,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4860,
+                                "id": 4696,
                                 "name": "_price",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4845,
-                                "src": "24233:6:7",
+                                "referencedDeclaration": 4681,
+                                "src": "24559:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -79894,32 +80176,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4858,
+                                "id": 4694,
                                 "name": "rate",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4853,
-                                "src": "24224:4:7",
+                                "referencedDeclaration": 4689,
+                                "src": "24550:4:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 4859,
+                              "id": 4695,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "mul",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10737,
-                              "src": "24224:8:7",
+                              "referencedDeclaration": 11021,
+                              "src": "24550:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 4861,
+                            "id": 4697,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -79927,27 +80209,27 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24224:16:7",
+                            "src": "24550:16:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4862,
+                          "id": 4698,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "mul",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10737,
-                          "src": "24224:20:7",
+                          "referencedDeclaration": 11021,
+                          "src": "24550:20:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                             "typeString": "function (uint256,uint256) pure returns (uint256)"
                           }
                         },
-                        "id": 4864,
+                        "id": 4700,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -79955,27 +80237,27 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "24224:29:7",
+                        "src": "24550:29:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "id": 4865,
+                      "id": 4701,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "div",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 10751,
-                      "src": "24224:33:7",
+                      "referencedDeclaration": 11035,
+                      "src": "24550:33:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                         "typeString": "function (uint256,uint256) pure returns (uint256)"
                       }
                     },
-                    "id": 4867,
+                    "id": 4703,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -79983,21 +80265,21 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24224:39:7",
+                    "src": "24550:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 4851,
-                  "id": 4868,
+                  "functionReturnParameters": 4687,
+                  "id": 4704,
                   "nodeType": "Return",
-                  "src": "24217:46:7"
+                  "src": "24543:46:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 4870,
+            "id": 4706,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -80005,16 +80287,16 @@
             "name": "CalculatePayment",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4848,
+              "id": 4684,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4845,
+                  "id": 4681,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24105:11:7",
+                  "scope": 4706,
+                  "src": "24431:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80022,10 +80304,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4844,
+                    "id": 4680,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24105:4:7",
+                    "src": "24431:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80036,11 +80318,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4847,
+                  "id": 4683,
                   "name": "_period",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24118:12:7",
+                  "scope": 4706,
+                  "src": "24444:12:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80048,10 +80330,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4846,
+                    "id": 4682,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24118:4:7",
+                    "src": "24444:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80061,20 +80343,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24104:27:7"
+              "src": "24430:27:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4851,
+              "id": 4687,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4850,
+                  "id": 4686,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4870,
-                  "src": "24155:4:7",
+                  "scope": 4706,
+                  "src": "24481:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80082,10 +80364,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4849,
+                    "id": 4685,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24155:4:7",
+                    "src": "24481:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80095,19 +80377,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24154:6:7"
+              "src": "24480:6:6"
             },
-            "scope": 5229,
-            "src": "24079:191:7",
+            "scope": 5065,
+            "src": "24405:191:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4930,
+              "id": 4766,
               "nodeType": "Block",
-              "src": "24344:418:7",
+              "src": "24670:418:6",
               "statements": [
                 {
                   "expression": {
@@ -80119,7 +80401,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4889,
+                        "id": 4725,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -80130,7 +80412,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4884,
+                          "id": 4720,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -80139,18 +80421,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4878,
+                              "id": 4714,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "24401:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "24727:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4879,
+                            "id": 4715,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -80158,7 +80440,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24401:10:7",
+                            "src": "24727:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -80172,26 +80454,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4880,
+                                "id": 4716,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "24415:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "24741:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4882,
+                              "id": 4718,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4881,
+                                "id": 4717,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4872,
-                                "src": "24421:6:7",
+                                "referencedDeclaration": 4708,
+                                "src": "24747:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -80202,27 +80484,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "24415:13:7",
+                              "src": "24741:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4883,
+                            "id": 4719,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "consumerID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2189,
-                            "src": "24415:24:7",
+                            "referencedDeclaration": 2013,
+                            "src": "24741:24:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "24401:38:7",
+                          "src": "24727:38:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -80233,24 +80515,24 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "commonType": {
-                            "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                            "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                             "typeString": "enum Market.BlacklistPerson"
                           },
-                          "id": 4888,
+                          "id": 4724,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4885,
+                            "id": 4721,
                             "name": "role",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4874,
-                            "src": "24443:4:7",
+                            "referencedDeclaration": 4710,
+                            "src": "24769:4:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
@@ -80260,18 +80542,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4886,
+                              "id": 4722,
                               "name": "BlacklistPerson",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2182,
-                              "src": "24451:15:7",
+                              "referencedDeclaration": 2006,
+                              "src": "24777:15:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                                "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                                 "typeString": "type(enum Market.BlacklistPerson)"
                               }
                             },
-                            "id": 4887,
+                            "id": 4723,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -80279,19 +80561,19 @@
                             "memberName": "BLACKLIST_NOBODY",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "24451:32:7",
+                            "src": "24777:32:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                              "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                               "typeString": "enum Market.BlacklistPerson"
                             }
                           },
-                          "src": "24443:40:7",
+                          "src": "24769:40:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "24401:82:7",
+                        "src": "24727:82:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -80305,21 +80587,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4877,
+                      "id": 4713,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24393:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "24719:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4890,
+                    "id": 4726,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -80327,38 +80609,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24393:91:7",
+                    "src": "24719:91:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4891,
+                  "id": 4727,
                   "nodeType": "ExpressionStatement",
-                  "src": "24393:91:7"
+                  "src": "24719:91:6"
                 },
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     },
-                    "id": 4895,
+                    "id": 4731,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4892,
+                      "id": 4728,
                       "name": "role",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4874,
-                      "src": "24498:4:7",
+                      "referencedDeclaration": 4710,
+                      "src": "24824:4:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
@@ -80368,18 +80650,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4893,
+                        "id": 4729,
                         "name": "BlacklistPerson",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2182,
-                        "src": "24506:15:7",
+                        "referencedDeclaration": 2006,
+                        "src": "24832:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                          "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                           "typeString": "type(enum Market.BlacklistPerson)"
                         }
                       },
-                      "id": 4894,
+                      "id": 4730,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -80387,13 +80669,13 @@
                       "memberName": "BLACKLIST_WORKER",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24506:32:7",
+                      "src": "24832:32:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       }
                     },
-                    "src": "24498:40:7",
+                    "src": "24824:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -80403,24 +80685,24 @@
                     "condition": {
                       "argumentTypes": null,
                       "commonType": {
-                        "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                        "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                         "typeString": "enum Market.BlacklistPerson"
                       },
-                      "id": 4913,
+                      "id": 4749,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 4910,
+                        "id": 4746,
                         "name": "role",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4874,
-                        "src": "24633:4:7",
+                        "referencedDeclaration": 4710,
+                        "src": "24959:4:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
@@ -80430,18 +80712,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4911,
+                          "id": 4747,
                           "name": "BlacklistPerson",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2182,
-                          "src": "24641:15:7",
+                          "referencedDeclaration": 2006,
+                          "src": "24967:15:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2182_$",
+                            "typeIdentifier": "t_type$_t_enum$_BlacklistPerson_$2006_$",
                             "typeString": "type(enum Market.BlacklistPerson)"
                           }
                         },
-                        "id": 4912,
+                        "id": 4748,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -80449,26 +80731,26 @@
                         "memberName": "BLACKLIST_MASTER",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "24641:32:7",
+                        "src": "24967:32:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                          "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                           "typeString": "enum Market.BlacklistPerson"
                         }
                       },
-                      "src": "24633:40:7",
+                      "src": "24959:40:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4928,
+                    "id": 4764,
                     "nodeType": "IfStatement",
-                    "src": "24629:127:7",
+                    "src": "24955:127:6",
                     "trueBody": {
-                      "id": 4927,
+                      "id": 4763,
                       "nodeType": "Block",
-                      "src": "24675:81:7",
+                      "src": "25001:81:6",
                       "statements": [
                         {
                           "expression": {
@@ -80480,26 +80762,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4917,
+                                    "id": 4753,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "24696:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "25022:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 4919,
+                                  "id": 4755,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4918,
+                                    "id": 4754,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4872,
-                                    "src": "24702:6:7",
+                                    "referencedDeclaration": 4708,
+                                    "src": "25028:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -80510,21 +80792,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24696:13:7",
+                                  "src": "25022:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 4920,
+                                "id": 4756,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "consumerID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2189,
-                                "src": "24696:24:7",
+                                "referencedDeclaration": 2013,
+                                "src": "25022:24:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -80536,26 +80818,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4921,
+                                    "id": 4757,
                                     "name": "deals",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 2342,
-                                    "src": "24722:5:7",
+                                    "referencedDeclaration": 2166,
+                                    "src": "25048:5:6",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                      "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                       "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                     }
                                   },
-                                  "id": 4923,
+                                  "id": 4759,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4922,
+                                    "id": 4758,
                                     "name": "dealID",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4872,
-                                    "src": "24728:6:7",
+                                    "referencedDeclaration": 4708,
+                                    "src": "25054:6:6",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -80566,21 +80848,21 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "24722:13:7",
+                                  "src": "25048:13:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                    "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                     "typeString": "struct Market.Deal storage ref"
                                   }
                                 },
-                                "id": 4924,
+                                "id": 4760,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "masterID",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 2191,
-                                "src": "24722:22:7",
+                                "referencedDeclaration": 2015,
+                                "src": "25048:22:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -80600,32 +80882,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4914,
+                                "id": 4750,
                                 "name": "bl",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2317,
-                                "src": "24689:2:7",
+                                "referencedDeclaration": 2141,
+                                "src": "25015:2:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                  "typeIdentifier": "t_contract$_Blacklist_$985",
                                   "typeString": "contract Blacklist"
                                 }
                               },
-                              "id": 4916,
+                              "id": 4752,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "Add",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 1056,
-                              "src": "24689:6:7",
+                              "referencedDeclaration": 880,
+                              "src": "25015:6:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                                 "typeString": "function (address,address) external returns (bool)"
                               }
                             },
-                            "id": 4925,
+                            "id": 4761,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -80633,26 +80915,26 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "24689:56:7",
+                            "src": "25015:56:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "id": 4926,
+                          "id": 4762,
                           "nodeType": "ExpressionStatement",
-                          "src": "24689:56:7"
+                          "src": "25015:56:6"
                         }
                       ]
                     }
                   },
-                  "id": 4929,
+                  "id": 4765,
                   "nodeType": "IfStatement",
-                  "src": "24494:262:7",
+                  "src": "24820:262:6",
                   "trueBody": {
-                    "id": 4909,
+                    "id": 4745,
                     "nodeType": "Block",
-                    "src": "24540:83:7",
+                    "src": "24866:83:6",
                     "statements": [
                       {
                         "expression": {
@@ -80664,26 +80946,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4899,
+                                  "id": 4735,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24561:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24887:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4901,
+                                "id": 4737,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4900,
+                                  "id": 4736,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4872,
-                                  "src": "24567:6:7",
+                                  "referencedDeclaration": 4708,
+                                  "src": "24893:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -80694,21 +80976,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24561:13:7",
+                                "src": "24887:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4902,
+                              "id": 4738,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "24561:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "24887:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -80720,26 +81002,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4903,
+                                  "id": 4739,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24587:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "24913:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4905,
+                                "id": 4741,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4904,
+                                  "id": 4740,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4872,
-                                  "src": "24593:6:7",
+                                  "referencedDeclaration": 4708,
+                                  "src": "24919:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -80750,21 +81032,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24587:13:7",
+                                "src": "24913:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4906,
+                              "id": 4742,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "24587:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "24913:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -80784,32 +81066,32 @@
                             ],
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4896,
+                              "id": 4732,
                               "name": "bl",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 2317,
-                              "src": "24554:2:7",
+                              "referencedDeclaration": 2141,
+                              "src": "24880:2:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_Blacklist_$1161",
+                                "typeIdentifier": "t_contract$_Blacklist_$985",
                                 "typeString": "contract Blacklist"
                               }
                             },
-                            "id": 4898,
+                            "id": 4734,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "Add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 1056,
-                            "src": "24554:6:7",
+                            "referencedDeclaration": 880,
+                            "src": "24880:6:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$returns$_t_bool_$",
                               "typeString": "function (address,address) external returns (bool)"
                             }
                           },
-                          "id": 4907,
+                          "id": 4743,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -80817,15 +81099,15 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "24554:58:7",
+                          "src": "24880:58:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4908,
+                        "id": 4744,
                         "nodeType": "ExpressionStatement",
-                        "src": "24554:58:7"
+                        "src": "24880:58:6"
                       }
                     ]
                   }
@@ -80833,7 +81115,7 @@
               ]
             },
             "documentation": null,
-            "id": 4931,
+            "id": 4767,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -80841,16 +81123,16 @@
             "name": "AddToBlacklist",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4875,
+              "id": 4711,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4872,
+                  "id": 4708,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4931,
-                  "src": "24300:11:7",
+                  "scope": 4767,
+                  "src": "24626:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -80858,10 +81140,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4871,
+                    "id": 4707,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24300:4:7",
+                    "src": "24626:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -80872,26 +81154,26 @@
                 },
                 {
                   "constant": false,
-                  "id": 4874,
+                  "id": 4710,
                   "name": "role",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4931,
-                  "src": "24313:20:7",
+                  "scope": 4767,
+                  "src": "24639:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                    "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                     "typeString": "enum Market.BlacklistPerson"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 4873,
+                    "id": 4709,
                     "name": "BlacklistPerson",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 2182,
-                    "src": "24313:15:7",
+                    "referencedDeclaration": 2006,
+                    "src": "24639:15:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_BlacklistPerson_$2182",
+                      "typeIdentifier": "t_enum$_BlacklistPerson_$2006",
                       "typeString": "enum Market.BlacklistPerson"
                     }
                   },
@@ -80899,35 +81181,35 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24299:35:7"
+              "src": "24625:35:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4876,
+              "id": 4712,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24344:0:7"
+              "src": "24670:0:6"
             },
-            "scope": 5229,
-            "src": "24276:486:7",
+            "scope": 5065,
+            "src": "24602:486:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5003,
+              "id": 4839,
               "nodeType": "Block",
-              "src": "24817:451:7",
+              "src": "25143:451:6",
               "statements": [
                 {
                   "condition": {
                     "argumentTypes": null,
                     "commonType": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     },
-                    "id": 4942,
+                    "id": 4778,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -80938,26 +81220,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4936,
+                          "id": 4772,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "24831:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25157:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4938,
+                        "id": 4774,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4937,
+                          "id": 4773,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "24837:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25163:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -80968,23 +81250,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "24831:13:7",
+                        "src": "25157:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4939,
+                      "id": 4775,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2205,
-                      "src": "24831:20:7",
+                      "referencedDeclaration": 2029,
+                      "src": "25157:20:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -80994,18 +81276,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4940,
+                        "id": 4776,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2164,
-                        "src": "24855:10:7",
+                        "referencedDeclaration": 1988,
+                        "src": "25181:10:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 4941,
+                      "id": 4777,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -81013,33 +81295,33 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "24855:24:7",
+                      "src": "25181:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "24831:48:7",
+                    "src": "25157:48:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4945,
+                  "id": 4781,
                   "nodeType": "IfStatement",
-                  "src": "24827:85:7",
+                  "src": "25153:85:6",
                   "trueBody": {
-                    "id": 4944,
+                    "id": 4780,
                     "nodeType": "Block",
-                    "src": "24881:31:7",
+                    "src": "25207:31:6",
                     "statements": [
                       {
                         "expression": null,
-                        "functionReturnParameters": 4935,
-                        "id": 4943,
+                        "functionReturnParameters": 4771,
+                        "id": 4779,
                         "nodeType": "Return",
-                        "src": "24895:7:7"
+                        "src": "25221:7:6"
                       }
                     ]
                   }
@@ -81054,10 +81336,10 @@
                           {
                             "argumentTypes": null,
                             "commonType": {
-                              "typeIdentifier": "t_enum$_DealStatus_$2164",
+                              "typeIdentifier": "t_enum$_DealStatus_$1988",
                               "typeString": "enum Market.DealStatus"
                             },
-                            "id": 4953,
+                            "id": 4789,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81068,26 +81350,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4947,
+                                  "id": 4783,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "24930:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25256:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4949,
+                                "id": 4785,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4948,
+                                  "id": 4784,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "24936:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25262:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81098,23 +81380,23 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "24930:13:7",
+                                "src": "25256:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4950,
+                              "id": 4786,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "status",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2205,
-                              "src": "24930:20:7",
+                              "referencedDeclaration": 2029,
+                              "src": "25256:20:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
@@ -81124,18 +81406,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4951,
+                                "id": 4787,
                                 "name": "DealStatus",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2164,
-                                "src": "24954:10:7",
+                                "referencedDeclaration": 1988,
+                                "src": "25280:10:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                                  "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                                   "typeString": "type(enum Market.DealStatus)"
                                 }
                               },
-                              "id": 4952,
+                              "id": 4788,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -81143,27 +81425,27 @@
                               "memberName": "STATUS_ACCEPTED",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "24954:26:7",
+                              "src": "25280:26:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_DealStatus_$2164",
+                                "typeIdentifier": "t_enum$_DealStatus_$1988",
                                 "typeString": "enum Market.DealStatus"
                               }
                             },
-                            "src": "24930:50:7",
+                            "src": "25256:50:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           }
                         ],
-                        "id": 4954,
+                        "id": 4790,
                         "isConstant": false,
                         "isInlineArray": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "TupleExpression",
-                        "src": "24929:52:7",
+                        "src": "25255:52:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -81177,21 +81459,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4946,
+                      "id": 4782,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24921:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "25247:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4955,
+                    "id": 4791,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81199,15 +81481,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24921:61:7",
+                    "src": "25247:61:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4956,
+                  "id": 4792,
                   "nodeType": "ExpressionStatement",
-                  "src": "24921:61:7"
+                  "src": "25247:61:6"
                 },
                 {
                   "expression": {
@@ -81219,7 +81501,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4980,
+                        "id": 4816,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -81230,7 +81512,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4972,
+                          "id": 4808,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -81241,7 +81523,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4964,
+                            "id": 4800,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81250,18 +81532,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4958,
+                                "id": 4794,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "25000:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "25326:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4959,
+                              "id": 4795,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -81269,7 +81551,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25000:10:7",
+                              "src": "25326:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -81283,26 +81565,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4960,
+                                  "id": 4796,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "25014:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25340:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4962,
+                                "id": 4798,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4961,
+                                  "id": 4797,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "25020:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25346:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81313,27 +81595,27 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25014:13:7",
+                                "src": "25340:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4963,
+                              "id": 4799,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "consumerID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2189,
-                              "src": "25014:24:7",
+                              "referencedDeclaration": 2013,
+                              "src": "25340:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25000:38:7",
+                            "src": "25326:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -81347,7 +81629,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 4971,
+                            "id": 4807,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81356,18 +81638,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4965,
+                                "id": 4801,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
-                                "src": "25042:3:7",
+                                "referencedDeclaration": 11599,
+                                "src": "25368:3:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 4966,
+                              "id": 4802,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -81375,7 +81657,7 @@
                               "memberName": "sender",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "25042:10:7",
+                              "src": "25368:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -81389,26 +81671,26 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 4967,
+                                  "id": 4803,
                                   "name": "deals",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 2342,
-                                  "src": "25056:5:7",
+                                  "referencedDeclaration": 2166,
+                                  "src": "25382:5:6",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                     "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                   }
                                 },
-                                "id": 4969,
+                                "id": 4805,
                                 "indexExpression": {
                                   "argumentTypes": null,
-                                  "id": 4968,
+                                  "id": 4804,
                                   "name": "dealID",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4933,
-                                  "src": "25062:6:7",
+                                  "referencedDeclaration": 4769,
+                                  "src": "25388:6:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -81419,33 +81701,33 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "25056:13:7",
+                                "src": "25382:13:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                  "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                   "typeString": "struct Market.Deal storage ref"
                                 }
                               },
-                              "id": 4970,
+                              "id": 4806,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "supplierID",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 2187,
-                              "src": "25056:24:7",
+                              "referencedDeclaration": 2011,
+                              "src": "25382:24:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "25042:38:7",
+                            "src": "25368:38:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25000:80:7",
+                          "src": "25326:80:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -81459,7 +81741,7 @@
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           },
-                          "id": 4979,
+                          "id": 4815,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -81468,18 +81750,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4973,
+                              "id": 4809,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "25084:3:7",
+                              "referencedDeclaration": 11599,
+                              "src": "25410:3:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 4974,
+                            "id": 4810,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -81487,7 +81769,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "25084:10:7",
+                            "src": "25410:10:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -81501,26 +81783,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4975,
+                                "id": 4811,
                                 "name": "deals",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 2342,
-                                "src": "25098:5:7",
+                                "referencedDeclaration": 2166,
+                                "src": "25424:5:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                                   "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                                 }
                               },
-                              "id": 4977,
+                              "id": 4813,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4976,
+                                "id": 4812,
                                 "name": "dealID",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4933,
-                                "src": "25104:6:7",
+                                "referencedDeclaration": 4769,
+                                "src": "25430:6:6",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -81531,33 +81813,33 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "25098:13:7",
+                              "src": "25424:13:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                                "typeIdentifier": "t_struct$_Deal_$2036_storage",
                                 "typeString": "struct Market.Deal storage ref"
                               }
                             },
-                            "id": 4978,
+                            "id": 4814,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "masterID",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 2191,
-                            "src": "25098:22:7",
+                            "referencedDeclaration": 2015,
+                            "src": "25424:22:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "src": "25084:36:7",
+                          "src": "25410:36:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "25000:120:7",
+                        "src": "25326:120:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -81571,21 +81853,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4957,
+                      "id": 4793,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "24992:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "25318:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4981,
+                    "id": 4817,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81593,20 +81875,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "24992:129:7",
+                    "src": "25318:129:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4982,
+                  "id": 4818,
                   "nodeType": "ExpressionStatement",
-                  "src": "24992:129:7"
+                  "src": "25318:129:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4989,
+                    "id": 4825,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81617,26 +81899,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4983,
+                          "id": 4819,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "25131:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25457:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4985,
+                        "id": 4821,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4984,
+                          "id": 4820,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "25137:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25463:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -81647,23 +81929,23 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25131:13:7",
+                        "src": "25457:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4986,
+                      "id": 4822,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "status",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2205,
-                      "src": "25131:20:7",
+                      "referencedDeclaration": 2029,
+                      "src": "25457:20:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
@@ -81673,18 +81955,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4987,
+                        "id": 4823,
                         "name": "DealStatus",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2164,
-                        "src": "25154:10:7",
+                        "referencedDeclaration": 1988,
+                        "src": "25480:10:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$2164_$",
+                          "typeIdentifier": "t_type$_t_enum$_DealStatus_$1988_$",
                           "typeString": "type(enum Market.DealStatus)"
                         }
                       },
-                      "id": 4988,
+                      "id": 4824,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -81692,26 +81974,26 @@
                       "memberName": "STATUS_CLOSED",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25154:24:7",
+                      "src": "25480:24:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_enum$_DealStatus_$2164",
+                        "typeIdentifier": "t_enum$_DealStatus_$1988",
                         "typeString": "enum Market.DealStatus"
                       }
                     },
-                    "src": "25131:47:7",
+                    "src": "25457:47:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_DealStatus_$2164",
+                      "typeIdentifier": "t_enum$_DealStatus_$1988",
                       "typeString": "enum Market.DealStatus"
                     }
                   },
-                  "id": 4990,
+                  "id": 4826,
                   "nodeType": "ExpressionStatement",
-                  "src": "25131:47:7"
+                  "src": "25457:47:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4997,
+                    "id": 4833,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81722,26 +82004,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4991,
+                          "id": 4827,
                           "name": "deals",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2342,
-                          "src": "25188:5:7",
+                          "referencedDeclaration": 2166,
+                          "src": "25514:5:6",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2212_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Deal_$2036_storage_$",
                             "typeString": "mapping(uint256 => struct Market.Deal storage ref)"
                           }
                         },
-                        "id": 4993,
+                        "id": 4829,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4992,
+                          "id": 4828,
                           "name": "dealID",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4933,
-                          "src": "25194:6:7",
+                          "referencedDeclaration": 4769,
+                          "src": "25520:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -81752,21 +82034,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "25188:13:7",
+                        "src": "25514:13:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Deal_$2212_storage",
+                          "typeIdentifier": "t_struct$_Deal_$2036_storage",
                           "typeString": "struct Market.Deal storage ref"
                         }
                       },
-                      "id": 4994,
+                      "id": 4830,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "endTime",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 2203,
-                      "src": "25188:21:7",
+                      "referencedDeclaration": 2027,
+                      "src": "25514:21:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -81778,18 +82060,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4995,
+                        "id": 4831,
                         "name": "block",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11305,
-                        "src": "25212:5:7",
+                        "referencedDeclaration": 11589,
+                        "src": "25538:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_block",
                           "typeString": "block"
                         }
                       },
-                      "id": 4996,
+                      "id": 4832,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -81797,21 +82079,21 @@
                       "memberName": "timestamp",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25212:15:7",
+                      "src": "25538:15:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25188:39:7",
+                    "src": "25514:39:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4998,
+                  "id": 4834,
                   "nodeType": "ExpressionStatement",
-                  "src": "25188:39:7"
+                  "src": "25514:39:6"
                 },
                 {
                   "eventCall": {
@@ -81819,12 +82101,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5000,
+                        "id": 4836,
                         "name": "dealID",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4933,
-                        "src": "25254:6:7",
+                        "referencedDeclaration": 4769,
+                        "src": "25580:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -81838,18 +82120,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4999,
+                      "id": 4835,
                       "name": "DealUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2268,
-                      "src": "25242:11:7",
+                      "referencedDeclaration": 2092,
+                      "src": "25568:11:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5001,
+                    "id": 4837,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -81857,20 +82139,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25242:19:7",
+                    "src": "25568:19:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5002,
+                  "id": 4838,
                   "nodeType": "EmitStatement",
-                  "src": "25237:24:7"
+                  "src": "25563:24:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5004,
+            "id": 4840,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -81878,16 +82160,16 @@
             "name": "InternalCloseDeal",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4934,
+              "id": 4770,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4933,
+                  "id": 4769,
                   "name": "dealID",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5004,
-                  "src": "24795:11:7",
+                  "scope": 4840,
+                  "src": "25121:11:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -81895,10 +82177,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4932,
+                    "id": 4768,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "24795:4:7",
+                    "src": "25121:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -81908,39 +82190,39 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "24794:13:7"
+              "src": "25120:13:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4935,
+              "id": 4771,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "24817:0:7"
+              "src": "25143:0:6"
             },
-            "scope": 5229,
-            "src": "24768:500:7",
+            "scope": 5065,
+            "src": "25094:500:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5046,
+              "id": 4882,
               "nodeType": "Block",
-              "src": "25355:215:7",
+              "src": "25681:215:6",
               "statements": [
                 {
                   "assignments": [
-                    5016
+                    4852
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5016,
+                      "id": 4852,
                       "name": "benchmarks",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5047,
-                      "src": "25365:26:7",
+                      "scope": 4883,
+                      "src": "25691:26:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -81949,19 +82231,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5014,
+                          "id": 4850,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25365:6:7",
+                          "src": "25691:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5015,
+                        "id": 4851,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25365:8:7",
+                        "src": "25691:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
@@ -81971,18 +82253,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5022,
+                  "id": 4858,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5020,
+                        "id": 4856,
                         "name": "benchmarksQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2332,
-                        "src": "25407:18:7",
+                        "referencedDeclaration": 2156,
+                        "src": "25733:18:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -81996,39 +82278,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5019,
+                      "id": 4855,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25394:12:7",
+                      "src": "25720:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint64_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint64[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5017,
+                          "id": 4853,
                           "name": "uint64",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25398:6:7",
+                          "src": "25724:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5018,
+                        "id": 4854,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25398:8:7",
+                        "src": "25724:8:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                           "typeString": "uint64[]"
                         }
                       }
                     },
-                    "id": 5021,
+                    "id": 4857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -82036,25 +82318,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25394:32:7",
+                    "src": "25720:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory",
                       "typeString": "uint64[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25365:61:7"
+                  "src": "25691:61:6"
                 },
                 {
                   "body": {
-                    "id": 5042,
+                    "id": 4878,
                     "nodeType": "Block",
-                    "src": "25482:55:7",
+                    "src": "25808:55:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5040,
+                          "id": 4876,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -82063,26 +82345,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5034,
+                              "id": 4870,
                               "name": "benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5016,
-                              "src": "25496:10:7",
+                              "referencedDeclaration": 4852,
+                              "src": "25822:10:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 5036,
+                            "id": 4872,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5035,
+                              "id": 4871,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5024,
-                              "src": "25507:1:7",
+                              "referencedDeclaration": 4860,
+                              "src": "25833:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82093,7 +82375,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25496:13:7",
+                            "src": "25822:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
@@ -82105,26 +82387,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5037,
+                              "id": 4873,
                               "name": "_benchmarks",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5007,
-                              "src": "25512:11:7",
+                              "referencedDeclaration": 4843,
+                              "src": "25838:11:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                                 "typeString": "uint64[] memory"
                               }
                             },
-                            "id": 5039,
+                            "id": 4875,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5038,
+                              "id": 4874,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5024,
-                              "src": "25524:1:7",
+                              "referencedDeclaration": 4860,
+                              "src": "25850:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82135,21 +82417,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25512:14:7",
+                            "src": "25838:14:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint64",
                               "typeString": "uint64"
                             }
                           },
-                          "src": "25496:30:7",
+                          "src": "25822:30:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint64",
                             "typeString": "uint64"
                           }
                         },
-                        "id": 5041,
+                        "id": 4877,
                         "nodeType": "ExpressionStatement",
-                        "src": "25496:30:7"
+                        "src": "25822:30:6"
                       }
                     ]
                   },
@@ -82159,19 +82441,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5030,
+                    "id": 4866,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5027,
+                      "id": 4863,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5024,
-                      "src": "25453:1:7",
+                      "referencedDeclaration": 4860,
+                      "src": "25779:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -82183,18 +82465,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5028,
+                        "id": 4864,
                         "name": "_benchmarks",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5007,
-                        "src": "25457:11:7",
+                        "referencedDeclaration": 4843,
+                        "src": "25783:11:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                           "typeString": "uint64[] memory"
                         }
                       },
-                      "id": 5029,
+                      "id": 4865,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82202,31 +82484,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25457:18:7",
+                      "src": "25783:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25453:22:7",
+                    "src": "25779:22:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5043,
+                  "id": 4879,
                   "initializationExpression": {
                     "assignments": [
-                      5024
+                      4860
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 5024,
+                        "id": 4860,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 5047,
-                        "src": "25441:6:7",
+                        "scope": 4883,
+                        "src": "25767:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -82234,10 +82516,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 5023,
+                          "id": 4859,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25441:4:7",
+                          "src": "25767:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -82247,18 +82529,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 5026,
+                    "id": 4862,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5025,
+                      "id": 4861,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25450:1:7",
+                      "src": "25776:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -82267,12 +82549,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25441:10:7"
+                    "src": "25767:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 5032,
+                      "id": 4868,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82280,15 +82562,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25477:3:7",
+                      "src": "25803:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 5031,
+                        "id": 4867,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5024,
-                        "src": "25477:1:7",
+                        "referencedDeclaration": 4860,
+                        "src": "25803:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82299,36 +82581,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 5033,
+                    "id": 4869,
                     "nodeType": "ExpressionStatement",
-                    "src": "25477:3:7"
+                    "src": "25803:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25436:101:7"
+                  "src": "25762:101:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5044,
+                    "id": 4880,
                     "name": "benchmarks",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5016,
-                    "src": "25553:10:7",
+                    "referencedDeclaration": 4852,
+                    "src": "25879:10:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_memory_ptr",
                       "typeString": "uint64[] memory"
                     }
                   },
-                  "functionReturnParameters": 5012,
-                  "id": 5045,
+                  "functionReturnParameters": 4848,
+                  "id": 4881,
                   "nodeType": "Return",
-                  "src": "25546:17:7"
+                  "src": "25872:17:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5047,
+            "id": 4883,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -82336,16 +82618,16 @@
             "name": "ResizeBenchmarks",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5008,
+              "id": 4844,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5007,
+                  "id": 4843,
                   "name": "_benchmarks",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5047,
-                  "src": "25300:20:7",
+                  "scope": 4883,
+                  "src": "25626:20:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82354,19 +82636,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5005,
+                      "id": 4841,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25300:6:7",
+                      "src": "25626:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 5006,
+                    "id": 4842,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25300:8:7",
+                    "src": "25626:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -82376,20 +82658,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25299:22:7"
+              "src": "25625:22:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5012,
+              "id": 4848,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5011,
+                  "id": 4847,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5047,
-                  "src": "25345:8:7",
+                  "scope": 4883,
+                  "src": "25671:8:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82398,19 +82680,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5009,
+                      "id": 4845,
                       "name": "uint64",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25345:6:7",
+                      "src": "25671:6:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint64",
                         "typeString": "uint64"
                       }
                     },
-                    "id": 5010,
+                    "id": 4846,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25345:8:7",
+                    "src": "25671:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint64_$dyn_storage_ptr",
                       "typeString": "uint64[]"
@@ -82420,32 +82702,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25344:10:7"
+              "src": "25670:10:6"
             },
-            "scope": 5229,
-            "src": "25274:296:7",
+            "scope": 5065,
+            "src": "25600:296:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5089,
+              "id": 4925,
               "nodeType": "Block",
-              "src": "25649:199:7",
+              "src": "25975:199:6",
               "statements": [
                 {
                   "assignments": [
-                    5059
+                    4895
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 5059,
+                      "id": 4895,
                       "name": "netflags",
                       "nodeType": "VariableDeclaration",
-                      "scope": 5090,
-                      "src": "25659:22:7",
+                      "scope": 4926,
+                      "src": "25985:22:6",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -82454,19 +82736,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5057,
+                          "id": 4893,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25659:4:7",
+                          "src": "25985:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5058,
+                        "id": 4894,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25659:6:7",
+                        "src": "25985:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
@@ -82476,18 +82758,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 5065,
+                  "id": 4901,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5063,
+                        "id": 4899,
                         "name": "netflagsQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2334,
-                        "src": "25695:16:7",
+                        "referencedDeclaration": 2158,
+                        "src": "26021:16:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82501,39 +82783,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5062,
+                      "id": 4898,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "25684:10:7",
+                      "src": "26010:10:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (bool[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 5060,
+                          "id": 4896,
                           "name": "bool",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25688:4:7",
+                          "src": "26014:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5061,
+                        "id": 4897,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "25688:6:7",
+                        "src": "26014:6:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                           "typeString": "bool[]"
                         }
                       }
                     },
-                    "id": 5064,
+                    "id": 4900,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -82541,25 +82823,25 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "25684:28:7",
+                    "src": "26010:28:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory",
                       "typeString": "bool[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "25659:53:7"
+                  "src": "25985:53:6"
                 },
                 {
                   "body": {
-                    "id": 5085,
+                    "id": 4921,
                     "nodeType": "Block",
-                    "src": "25766:51:7",
+                    "src": "26092:51:6",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 5083,
+                          "id": 4919,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -82568,26 +82850,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5077,
+                              "id": 4913,
                               "name": "netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5059,
-                              "src": "25780:8:7",
+                              "referencedDeclaration": 4895,
+                              "src": "26106:8:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 5079,
+                            "id": 4915,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5078,
+                              "id": 4914,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5067,
-                              "src": "25789:1:7",
+                              "referencedDeclaration": 4903,
+                              "src": "26115:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82598,7 +82880,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "25780:11:7",
+                            "src": "26106:11:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -82610,26 +82892,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 5080,
+                              "id": 4916,
                               "name": "_netflags",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5050,
-                              "src": "25794:9:7",
+                              "referencedDeclaration": 4886,
+                              "src": "26120:9:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                                 "typeString": "bool[] memory"
                               }
                             },
-                            "id": 5082,
+                            "id": 4918,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 5081,
+                              "id": 4917,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 5067,
-                              "src": "25804:1:7",
+                              "referencedDeclaration": 4903,
+                              "src": "26130:1:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -82640,21 +82922,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "25794:12:7",
+                            "src": "26120:12:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "25780:26:7",
+                          "src": "26106:26:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 5084,
+                        "id": 4920,
                         "nodeType": "ExpressionStatement",
-                        "src": "25780:26:7"
+                        "src": "26106:26:6"
                       }
                     ]
                   },
@@ -82664,19 +82946,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 5073,
+                    "id": 4909,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 5070,
+                      "id": 4906,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5067,
-                      "src": "25739:1:7",
+                      "referencedDeclaration": 4903,
+                      "src": "26065:1:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -82688,18 +82970,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5071,
+                        "id": 4907,
                         "name": "_netflags",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5050,
-                        "src": "25743:9:7",
+                        "referencedDeclaration": 4886,
+                        "src": "26069:9:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                           "typeString": "bool[] memory"
                         }
                       },
-                      "id": 5072,
+                      "id": 4908,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82707,31 +82989,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "25743:16:7",
+                      "src": "26069:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "25739:20:7",
+                    "src": "26065:20:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5086,
+                  "id": 4922,
                   "initializationExpression": {
                     "assignments": [
-                      5067
+                      4903
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 5067,
+                        "id": 4903,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 5090,
-                        "src": "25727:6:7",
+                        "scope": 4926,
+                        "src": "26053:6:6",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -82739,10 +83021,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 5066,
+                          "id": 4902,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "25727:4:7",
+                          "src": "26053:4:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -82752,18 +83034,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 5069,
+                    "id": 4905,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 5068,
+                      "id": 4904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "25736:1:7",
+                      "src": "26062:1:6",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -82772,12 +83054,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "25727:10:7"
+                    "src": "26053:10:6"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 5075,
+                      "id": 4911,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -82785,15 +83067,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "25761:3:7",
+                      "src": "26087:3:6",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 5074,
+                        "id": 4910,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5067,
-                        "src": "25761:1:7",
+                        "referencedDeclaration": 4903,
+                        "src": "26087:1:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -82804,36 +83086,36 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 5076,
+                    "id": 4912,
                     "nodeType": "ExpressionStatement",
-                    "src": "25761:3:7"
+                    "src": "26087:3:6"
                   },
                   "nodeType": "ForStatement",
-                  "src": "25722:95:7"
+                  "src": "26048:95:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5087,
+                    "id": 4923,
                     "name": "netflags",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 5059,
-                    "src": "25833:8:7",
+                    "referencedDeclaration": 4895,
+                    "src": "26159:8:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr",
                       "typeString": "bool[] memory"
                     }
                   },
-                  "functionReturnParameters": 5055,
-                  "id": 5088,
+                  "functionReturnParameters": 4891,
+                  "id": 4924,
                   "nodeType": "Return",
-                  "src": "25826:15:7"
+                  "src": "26152:15:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5090,
+            "id": 4926,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -82841,16 +83123,16 @@
             "name": "ResizeNetflags",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5051,
+              "id": 4887,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5050,
+                  "id": 4886,
                   "name": "_netflags",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5090,
-                  "src": "25600:16:7",
+                  "scope": 4926,
+                  "src": "25926:16:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82859,19 +83141,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5048,
+                      "id": 4884,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25600:4:7",
+                      "src": "25926:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 5049,
+                    "id": 4885,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25600:6:7",
+                    "src": "25926:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -82881,20 +83163,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25599:18:7"
+              "src": "25925:18:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5055,
+              "id": 4891,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5054,
+                  "id": 4890,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5090,
-                  "src": "25641:6:7",
+                  "scope": 4926,
+                  "src": "25967:6:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -82903,19 +83185,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 5052,
+                      "id": 4888,
                       "name": "bool",
                       "nodeType": "ElementaryTypeName",
-                      "src": "25641:4:7",
+                      "src": "25967:4:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
-                    "id": 5053,
+                    "id": 4889,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "25641:6:7",
+                    "src": "25967:6:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr",
                       "typeString": "bool[]"
@@ -82925,38 +83207,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25640:8:7"
+              "src": "25966:8:6"
             },
-            "scope": 5229,
-            "src": "25576:272:7",
+            "scope": 5065,
+            "src": "25902:272:6",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 5107,
+              "id": 4943,
               "nodeType": "Block",
-              "src": "25953:66:7",
+              "src": "26279:66:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5103,
+                    "id": 4939,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5099,
+                      "id": 4935,
                       "name": "pr",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2321,
-                      "src": "25963:2:7",
+                      "referencedDeclaration": 2145,
+                      "src": "26289:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
@@ -82967,12 +83249,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5101,
+                          "id": 4937,
                           "name": "_newPR",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5092,
-                          "src": "25984:6:7",
+                          "referencedDeclaration": 4928,
+                          "src": "26310:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -82986,18 +83268,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5100,
+                        "id": 4936,
                         "name": "ProfileRegistry",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10035,
-                        "src": "25968:15:7",
+                        "referencedDeclaration": 10881,
+                        "src": "26294:15:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10035_$",
+                          "typeIdentifier": "t_type$_t_contract$_ProfileRegistry_$10881_$",
                           "typeString": "type(contract ProfileRegistry)"
                         }
                       },
-                      "id": 5102,
+                      "id": 4938,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83005,34 +83287,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "25968:23:7",
+                      "src": "26294:23:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                        "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                         "typeString": "contract ProfileRegistry"
                       }
                     },
-                    "src": "25963:28:7",
+                    "src": "26289:28:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_ProfileRegistry_$10035",
+                      "typeIdentifier": "t_contract$_ProfileRegistry_$10881",
                       "typeString": "contract ProfileRegistry"
                     }
                   },
-                  "id": 5104,
+                  "id": 4940,
                   "nodeType": "ExpressionStatement",
-                  "src": "25963:28:7"
+                  "src": "26289:28:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5105,
+                    "id": 4941,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26008:4:7",
+                    "src": "26334:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83040,52 +83322,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5098,
-                  "id": 5106,
+                  "functionReturnParameters": 4934,
+                  "id": 4942,
                   "nodeType": "Return",
-                  "src": "26001:11:7"
+                  "src": "26327:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5108,
+            "id": 4944,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5095,
+                "id": 4931,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5094,
+                  "id": 4930,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "25921:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26254:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "25921:9:7"
+                "src": "26254:9:6"
               }
             ],
             "name": "SetProfileRegistryAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5093,
+              "id": 4929,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5092,
+                  "id": 4928,
                   "name": "_newPR",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5108,
-                  "src": "25905:14:7",
+                  "scope": 4944,
+                  "src": "26231:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83093,10 +83375,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5091,
+                    "id": 4927,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25905:7:7",
+                    "src": "26231:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83106,20 +83388,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25904:16:7"
+              "src": "26230:16:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5098,
+              "id": 4934,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5097,
+                  "id": 4933,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5108,
-                  "src": "25947:4:7",
+                  "scope": 4944,
+                  "src": "26273:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83127,10 +83409,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5096,
+                    "id": 4932,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "25947:4:7",
+                    "src": "26273:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83140,38 +83422,38 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "25946:6:7"
+              "src": "26272:6:6"
             },
-            "scope": 5229,
-            "src": "25870:149:7",
+            "scope": 5065,
+            "src": "26196:149:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5125,
+              "id": 4961,
               "nodeType": "Block",
-              "src": "26102:60:7",
+              "src": "26428:60:6",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5121,
+                    "id": 4957,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5117,
+                      "id": 4953,
                       "name": "bl",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2317,
-                      "src": "26112:2:7",
+                      "referencedDeclaration": 2141,
+                      "src": "26438:2:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
@@ -83182,12 +83464,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5119,
+                          "id": 4955,
                           "name": "_newBL",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5110,
-                          "src": "26127:6:7",
+                          "referencedDeclaration": 4946,
+                          "src": "26453:6:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -83201,18 +83483,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5118,
+                        "id": 4954,
                         "name": "Blacklist",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 1161,
-                        "src": "26117:9:7",
+                        "referencedDeclaration": 985,
+                        "src": "26443:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$1161_$",
+                          "typeIdentifier": "t_type$_t_contract$_Blacklist_$985_$",
                           "typeString": "type(contract Blacklist)"
                         }
                       },
-                      "id": 5120,
+                      "id": 4956,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83220,34 +83502,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26117:17:7",
+                      "src": "26443:17:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_Blacklist_$1161",
+                        "typeIdentifier": "t_contract$_Blacklist_$985",
                         "typeString": "contract Blacklist"
                       }
                     },
-                    "src": "26112:22:7",
+                    "src": "26438:22:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_Blacklist_$1161",
+                      "typeIdentifier": "t_contract$_Blacklist_$985",
                       "typeString": "contract Blacklist"
                     }
                   },
-                  "id": 5122,
+                  "id": 4958,
                   "nodeType": "ExpressionStatement",
-                  "src": "26112:22:7"
+                  "src": "26438:22:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5123,
+                    "id": 4959,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26151:4:7",
+                    "src": "26477:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83255,52 +83537,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5116,
-                  "id": 5124,
+                  "functionReturnParameters": 4952,
+                  "id": 4960,
                   "nodeType": "Return",
-                  "src": "26144:11:7"
+                  "src": "26470:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5126,
+            "id": 4962,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5113,
+                "id": 4949,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5112,
+                  "id": 4948,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26070:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26403:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26070:9:7"
+                "src": "26403:9:6"
               }
             ],
             "name": "SetBlacklistAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5111,
+              "id": 4947,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5110,
+                  "id": 4946,
                   "name": "_newBL",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5126,
-                  "src": "26054:14:7",
+                  "scope": 4962,
+                  "src": "26380:14:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83308,10 +83590,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5109,
+                    "id": 4945,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26054:7:7",
+                    "src": "26380:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83321,20 +83603,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26053:16:7"
+              "src": "26379:16:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5116,
+              "id": 4952,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5115,
+                  "id": 4951,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5126,
-                  "src": "26096:4:7",
+                  "scope": 4962,
+                  "src": "26422:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83342,10 +83624,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5114,
+                    "id": 4950,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26096:4:7",
+                    "src": "26422:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83355,19 +83637,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26095:6:7"
+              "src": "26421:6:6"
             },
-            "scope": 5229,
-            "src": "26025:137:7",
+            "scope": 5065,
+            "src": "26351:137:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5153,
+              "id": 4989,
               "nodeType": "Block",
-              "src": "26246:131:7",
+              "src": "26572:131:6",
               "statements": [
                 {
                   "expression": {
@@ -83379,7 +83661,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5142,
+                        "id": 4978,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -83394,12 +83676,12 @@
                               "arguments": [
                                 {
                                   "argumentTypes": null,
-                                  "id": 5137,
+                                  "id": 4973,
                                   "name": "_newOracle",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 5128,
-                                  "src": "26274:10:7",
+                                  "referencedDeclaration": 4964,
+                                  "src": "26600:10:6",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -83413,18 +83695,18 @@
                                     "typeString": "address"
                                   }
                                 ],
-                                "id": 5136,
+                                "id": 4972,
                                 "name": "OracleUSD",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 8677,
-                                "src": "26264:9:7",
+                                "referencedDeclaration": 9523,
+                                "src": "26590:9:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                                  "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                                   "typeString": "type(contract OracleUSD)"
                                 }
                               },
-                              "id": 5138,
+                              "id": 4974,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -83432,27 +83714,27 @@
                               "lValueRequested": false,
                               "names": [],
                               "nodeType": "FunctionCall",
-                              "src": "26264:21:7",
+                              "src": "26590:21:6",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                                "typeIdentifier": "t_contract$_OracleUSD_$9523",
                                 "typeString": "contract OracleUSD"
                               }
                             },
-                            "id": 5139,
+                            "id": 4975,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "getCurrentPrice",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 8676,
-                            "src": "26264:37:7",
+                            "referencedDeclaration": 9522,
+                            "src": "26590:37:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$",
                               "typeString": "function () view external returns (uint256)"
                             }
                           },
-                          "id": 5140,
+                          "id": 4976,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -83460,7 +83742,7 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "26264:39:7",
+                          "src": "26590:39:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -83471,14 +83753,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 5141,
+                          "id": 4977,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "26307:1:7",
+                          "src": "26633:1:6",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -83486,7 +83768,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "26264:44:7",
+                        "src": "26590:44:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -83500,21 +83782,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5135,
+                      "id": 4971,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26256:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "26582:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5143,
+                    "id": 4979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83522,34 +83804,34 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26256:53:7",
+                    "src": "26582:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5144,
+                  "id": 4980,
                   "nodeType": "ExpressionStatement",
-                  "src": "26256:53:7"
+                  "src": "26582:53:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5149,
+                    "id": 4985,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5145,
+                      "id": 4981,
                       "name": "oracle",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2319,
-                      "src": "26319:6:7",
+                      "referencedDeclaration": 2143,
+                      "src": "26645:6:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
@@ -83560,12 +83842,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 5147,
+                          "id": 4983,
                           "name": "_newOracle",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5128,
-                          "src": "26338:10:7",
+                          "referencedDeclaration": 4964,
+                          "src": "26664:10:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -83579,18 +83861,18 @@
                             "typeString": "address"
                           }
                         ],
-                        "id": 5146,
+                        "id": 4982,
                         "name": "OracleUSD",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8677,
-                        "src": "26328:9:7",
+                        "referencedDeclaration": 9523,
+                        "src": "26654:9:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$8677_$",
+                          "typeIdentifier": "t_type$_t_contract$_OracleUSD_$9523_$",
                           "typeString": "type(contract OracleUSD)"
                         }
                       },
-                      "id": 5148,
+                      "id": 4984,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -83598,34 +83880,34 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "26328:21:7",
+                      "src": "26654:21:6",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                        "typeIdentifier": "t_contract$_OracleUSD_$9523",
                         "typeString": "contract OracleUSD"
                       }
                     },
-                    "src": "26319:30:7",
+                    "src": "26645:30:6",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_contract$_OracleUSD_$8677",
+                      "typeIdentifier": "t_contract$_OracleUSD_$9523",
                       "typeString": "contract OracleUSD"
                     }
                   },
-                  "id": 5150,
+                  "id": 4986,
                   "nodeType": "ExpressionStatement",
-                  "src": "26319:30:7"
+                  "src": "26645:30:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5151,
+                    "id": 4987,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26366:4:7",
+                    "src": "26692:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83633,52 +83915,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5134,
-                  "id": 5152,
+                  "functionReturnParameters": 4970,
+                  "id": 4988,
                   "nodeType": "Return",
-                  "src": "26359:11:7"
+                  "src": "26685:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5154,
+            "id": 4990,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5131,
+                "id": 4967,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5130,
+                  "id": 4966,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26214:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26547:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26214:9:7"
+                "src": "26547:9:6"
               }
             ],
             "name": "SetOracleAddress",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5129,
+              "id": 4965,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5128,
+                  "id": 4964,
                   "name": "_newOracle",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5154,
-                  "src": "26194:18:7",
+                  "scope": 4990,
+                  "src": "26520:18:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83686,10 +83968,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 5127,
+                    "id": 4963,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26194:7:7",
+                    "src": "26520:7:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -83699,20 +83981,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26193:20:7"
+              "src": "26519:20:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5134,
+              "id": 4970,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5133,
+                  "id": 4969,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5154,
-                  "src": "26240:4:7",
+                  "scope": 4990,
+                  "src": "26566:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -83720,10 +84002,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5132,
+                    "id": 4968,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26240:4:7",
+                    "src": "26566:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -83733,19 +84015,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26239:6:7"
+              "src": "26565:6:6"
             },
-            "scope": 5229,
-            "src": "26168:209:7",
+            "scope": 5065,
+            "src": "26494:209:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5179,
+              "id": 5015,
               "nodeType": "Block",
-              "src": "26465:172:7",
+              "src": "26791:172:6",
               "statements": [
                 {
                   "expression": {
@@ -83757,19 +84039,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5166,
+                        "id": 5002,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5164,
+                          "id": 5000,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5156,
-                          "src": "26483:12:7",
+                          "referencedDeclaration": 4992,
+                          "src": "26809:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -83779,18 +84061,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5165,
+                          "id": 5001,
                           "name": "benchmarksQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2332,
-                          "src": "26498:18:7",
+                          "referencedDeclaration": 2156,
+                          "src": "26824:18:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26483:33:7",
+                        "src": "26809:33:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -83804,21 +84086,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5163,
+                      "id": 4999,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26475:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "26801:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5167,
+                    "id": 5003,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83826,15 +84108,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26475:42:7",
+                    "src": "26801:42:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5168,
+                  "id": 5004,
                   "nodeType": "ExpressionStatement",
-                  "src": "26475:42:7"
+                  "src": "26801:42:6"
                 },
                 {
                   "eventCall": {
@@ -83842,12 +84124,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5170,
+                        "id": 5006,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5156,
-                        "src": "26553:12:7",
+                        "referencedDeclaration": 4992,
+                        "src": "26879:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -83861,18 +84143,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5169,
+                      "id": 5005,
                       "name": "NumBenchmarksUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2304,
-                      "src": "26532:20:7",
+                      "referencedDeclaration": 2128,
+                      "src": "26858:20:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5171,
+                    "id": 5007,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -83880,32 +84162,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26532:34:7",
+                    "src": "26858:34:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5172,
+                  "id": 5008,
                   "nodeType": "EmitStatement",
-                  "src": "26527:39:7"
+                  "src": "26853:39:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5175,
+                    "id": 5011,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5173,
+                      "id": 5009,
                       "name": "benchmarksQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2332,
-                      "src": "26576:18:7",
+                      "referencedDeclaration": 2156,
+                      "src": "26902:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -83915,39 +84197,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5174,
+                      "id": 5010,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5156,
-                      "src": "26597:12:7",
+                      "referencedDeclaration": 4992,
+                      "src": "26923:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26576:33:7",
+                    "src": "26902:33:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5176,
+                  "id": 5012,
                   "nodeType": "ExpressionStatement",
-                  "src": "26576:33:7"
+                  "src": "26902:33:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5177,
+                    "id": 5013,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26626:4:7",
+                    "src": "26952:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -83955,52 +84237,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5162,
-                  "id": 5178,
+                  "functionReturnParameters": 4998,
+                  "id": 5014,
                   "nodeType": "Return",
-                  "src": "26619:11:7"
+                  "src": "26945:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5180,
+            "id": 5016,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5159,
+                "id": 4995,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5158,
+                  "id": 4994,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26433:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "26766:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26433:9:7"
+                "src": "26766:9:6"
               }
             ],
             "name": "SetBenchmarksQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5157,
+              "id": 4993,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5156,
+                  "id": 4992,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5180,
-                  "src": "26414:17:7",
+                  "scope": 5016,
+                  "src": "26740:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84008,10 +84290,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5155,
+                    "id": 4991,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26414:4:7",
+                    "src": "26740:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -84021,20 +84303,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26413:19:7"
+              "src": "26739:19:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5162,
+              "id": 4998,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5161,
+                  "id": 4997,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5180,
-                  "src": "26459:4:7",
+                  "scope": 5016,
+                  "src": "26785:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84042,10 +84324,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5160,
+                    "id": 4996,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26459:4:7",
+                    "src": "26785:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -84055,19 +84337,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26458:6:7"
+              "src": "26784:6:6"
             },
-            "scope": 5229,
-            "src": "26383:254:7",
+            "scope": 5065,
+            "src": "26709:254:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5205,
+              "id": 5041,
               "nodeType": "Block",
-              "src": "26723:166:7",
+              "src": "27049:166:6",
               "statements": [
                 {
                   "expression": {
@@ -84079,19 +84361,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 5192,
+                        "id": 5028,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 5190,
+                          "id": 5026,
                           "name": "_newQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 5182,
-                          "src": "26741:12:7",
+                          "referencedDeclaration": 5018,
+                          "src": "27067:12:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -84101,18 +84383,18 @@
                         "operator": ">",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 5191,
+                          "id": 5027,
                           "name": "netflagsQuantity",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 2334,
-                          "src": "26756:16:7",
+                          "referencedDeclaration": 2158,
+                          "src": "27082:16:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "26741:31:7",
+                        "src": "27067:31:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -84126,21 +84408,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 5189,
+                      "id": 5025,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "26733:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "27059:7:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 5193,
+                    "id": 5029,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84148,15 +84430,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26733:40:7",
+                    "src": "27059:40:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5194,
+                  "id": 5030,
                   "nodeType": "ExpressionStatement",
-                  "src": "26733:40:7"
+                  "src": "27059:40:6"
                 },
                 {
                   "eventCall": {
@@ -84164,12 +84446,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5196,
+                        "id": 5032,
                         "name": "_newQuantity",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 5182,
-                        "src": "26807:12:7",
+                        "referencedDeclaration": 5018,
+                        "src": "27133:12:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -84183,18 +84465,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 5195,
+                      "id": 5031,
                       "name": "NumNetflagsUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2308,
-                      "src": "26788:18:7",
+                      "referencedDeclaration": 2132,
+                      "src": "27114:18:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 5197,
+                    "id": 5033,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84202,32 +84484,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26788:32:7",
+                    "src": "27114:32:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5198,
+                  "id": 5034,
                   "nodeType": "EmitStatement",
-                  "src": "26783:37:7"
+                  "src": "27109:37:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 5201,
+                    "id": 5037,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 5199,
+                      "id": 5035,
                       "name": "netflagsQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 2334,
-                      "src": "26830:16:7",
+                      "referencedDeclaration": 2158,
+                      "src": "27156:16:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -84237,39 +84519,39 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 5200,
+                      "id": 5036,
                       "name": "_newQuantity",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 5182,
-                      "src": "26849:12:7",
+                      "referencedDeclaration": 5018,
+                      "src": "27175:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "26830:31:7",
+                    "src": "27156:31:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 5202,
+                  "id": 5038,
                   "nodeType": "ExpressionStatement",
-                  "src": "26830:31:7"
+                  "src": "27156:31:6"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 5203,
+                    "id": 5039,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "26878:4:7",
+                    "src": "27204:4:6",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -84277,52 +84559,52 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 5188,
-                  "id": 5204,
+                  "functionReturnParameters": 5024,
+                  "id": 5040,
                   "nodeType": "Return",
-                  "src": "26871:11:7"
+                  "src": "27197:11:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5206,
+            "id": 5042,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5185,
+                "id": 5021,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5184,
+                  "id": 5020,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26691:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "27024:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26691:9:7"
+                "src": "27024:9:6"
               }
             ],
             "name": "SetNetflagsQuantity",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5183,
+              "id": 5019,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5182,
+                  "id": 5018,
                   "name": "_newQuantity",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5206,
-                  "src": "26672:17:7",
+                  "scope": 5042,
+                  "src": "26998:17:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84330,10 +84612,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 5181,
+                    "id": 5017,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26672:4:7",
+                    "src": "26998:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -84343,20 +84625,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26671:19:7"
+              "src": "26997:19:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5188,
+              "id": 5024,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 5187,
+                  "id": 5023,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 5206,
-                  "src": "26717:4:7",
+                  "scope": 5042,
+                  "src": "27043:4:6",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -84364,10 +84646,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 5186,
+                    "id": 5022,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "26717:4:7",
+                    "src": "27043:4:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -84377,19 +84659,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "26716:6:7"
+              "src": "27042:6:6"
             },
-            "scope": 5229,
-            "src": "26643:246:7",
+            "scope": 5065,
+            "src": "26969:246:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 5227,
+              "id": 5063,
               "nodeType": "Block",
-              "src": "26934:99:7",
+              "src": "27260:99:6",
               "statements": [
                 {
                   "expression": {
@@ -84397,12 +84679,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5214,
+                        "id": 5050,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "26959:5:7",
+                        "referencedDeclaration": 11084,
+                        "src": "27285:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -84416,14 +84698,14 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 5218,
+                                "id": 5054,
                                 "name": "this",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11366,
-                                "src": "26990:4:7",
+                                "referencedDeclaration": 11646,
+                                "src": "27316:4:6",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_contract$_Market_$5229",
+                                  "typeIdentifier": "t_contract$_Market_$5065",
                                   "typeString": "contract Market"
                                 }
                               }
@@ -84431,24 +84713,24 @@
                             "expression": {
                               "argumentTypes": [
                                 {
-                                  "typeIdentifier": "t_contract$_Market_$5229",
+                                  "typeIdentifier": "t_contract$_Market_$5065",
                                   "typeString": "contract Market"
                                 }
                               ],
-                              "id": 5217,
+                              "id": 5053,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "lValueRequested": false,
                               "nodeType": "ElementaryTypeNameExpression",
-                              "src": "26982:7:7",
+                              "src": "27308:7:6",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_type$_t_address_$",
                                 "typeString": "type(address)"
                               },
                               "typeName": "address"
                             },
-                            "id": 5219,
+                            "id": 5055,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -84456,7 +84738,7 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "26982:13:7",
+                            "src": "27308:13:6",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -84472,32 +84754,32 @@
                           ],
                           "expression": {
                             "argumentTypes": null,
-                            "id": 5215,
+                            "id": 5051,
                             "name": "token",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 2315,
-                            "src": "26966:5:7",
+                            "referencedDeclaration": 2139,
+                            "src": "27292:5:6",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_contract$_SNM_$10080",
+                              "typeIdentifier": "t_contract$_SNM_$10926",
                               "typeString": "contract SNM"
                             }
                           },
-                          "id": 5216,
+                          "id": 5052,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "balanceOf",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 10977,
-                          "src": "26966:15:7",
+                          "referencedDeclaration": 11261,
+                          "src": "27292:15:6",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$",
                             "typeString": "function (address) view external returns (uint256)"
                           }
                         },
-                        "id": 5220,
+                        "id": 5056,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -84505,7 +84787,7 @@
                         "lValueRequested": false,
                         "names": [],
                         "nodeType": "FunctionCall",
-                        "src": "26966:30:7",
+                        "src": "27292:30:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -84525,32 +84807,32 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 5211,
+                        "id": 5047,
                         "name": "token",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 2315,
-                        "src": "26944:5:7",
+                        "referencedDeclaration": 2139,
+                        "src": "27270:5:6",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_contract$_SNM_$10080",
+                          "typeIdentifier": "t_contract$_SNM_$10926",
                           "typeString": "contract SNM"
                         }
                       },
-                      "id": 5213,
+                      "id": 5049,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "memberName": "transfer",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 10965,
-                      "src": "26944:14:7",
+                      "referencedDeclaration": 11249,
+                      "src": "27270:14:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (address,uint256) external returns (bool)"
                       }
                     },
-                    "id": 5221,
+                    "id": 5057,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84558,15 +84840,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "26944:53:7",
+                    "src": "27270:53:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 5222,
+                  "id": 5058,
                   "nodeType": "ExpressionStatement",
-                  "src": "26944:53:7"
+                  "src": "27270:53:6"
                 },
                 {
                   "expression": {
@@ -84574,12 +84856,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 5224,
+                        "id": 5060,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "27020:5:7",
+                        "referencedDeclaration": 11084,
+                        "src": "27346:5:6",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -84593,18 +84875,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 5223,
+                      "id": 5059,
                       "name": "selfdestruct",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11323,
-                      "src": "27007:12:7",
+                      "referencedDeclaration": 11607,
+                      "src": "27333:12:6",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_selfdestruct_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 5225,
+                    "id": 5061,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -84612,71 +84894,71 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "27007:19:7",
+                    "src": "27333:19:6",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 5226,
+                  "id": 5062,
                   "nodeType": "ExpressionStatement",
-                  "src": "27007:19:7"
+                  "src": "27333:19:6"
                 }
               ]
             },
             "documentation": null,
-            "id": 5228,
+            "id": 5064,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 5209,
+                "id": 5045,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 5208,
+                  "id": 5044,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "26917:9:7",
+                  "referencedDeclaration": 11114,
+                  "src": "27250:9:6",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "26917:9:7"
+                "src": "27250:9:6"
               }
             ],
             "name": "KillMarket",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 5207,
+              "id": 5043,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26914:2:7"
+              "src": "27240:2:6"
             },
             "payable": false,
             "returnParameters": {
-              "id": 5210,
+              "id": 5046,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "26934:0:7"
+              "src": "27260:0:6"
             },
-            "scope": 5229,
-            "src": "26895:138:7",
+            "scope": 5065,
+            "src": "27221:138:6",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 5230,
-        "src": "254:26781:7"
+        "scope": 5066,
+        "src": "254:27107:6"
       }
     ],
-    "src": "0:27036:7"
+    "src": "0:27362:6"
   },
   "compiler": {
     "name": "solc",
@@ -84892,10 +85174,10 @@
         }
       },
       "links": {},
-      "address": "0x18c3b1fd2688f9ca20fab36ed9fbe9210e64a4ae",
-      "transactionHash": "0x129d14e9e77585ad347f9ec82f30d41e0d3e95154afaedcedf9c68079bfa5487"
+      "address": "0xdaef18e1e98c76427c9fff2048fc908b15a35e40",
+      "transactionHash": "0x30e5cb503c0246afa3aad8f5330778391878c9c67084c884f8ff1922e0b8c8f4"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:40.027Z"
+  "updatedAt": "2019-01-11T16:09:31.252Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Migrations.json b/blockchain/source/migration_artifacts/contracts/Migrations.json
index aa7a6b9c9..2d695402c 100644
--- a/blockchain/source/migration_artifacts/contracts/Migrations.json
+++ b/blockchain/source/migration_artifacts/contracts/Migrations.json
@@ -1264,8 +1264,8 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x0857b72763dbe64e007c3d7f49ced6de2f50640b",
-      "transactionHash": "0x5beea4e928df8d21630a26db7d886538e90ee9bc25fc7ac5549ca2921a4a6b5c"
+      "address": "0x85225614d1689cb4565f1d2a21268b8fe78aaac8",
+      "transactionHash": "0xb626759ee107602740bf30e0f562365b508c7d0afb85653d1aa68f23885b6366"
     },
     "444": {
       "events": {},
@@ -1276,10 +1276,10 @@
     "4242": {
       "events": {},
       "links": {},
-      "address": "0xc316eebe2001f1e7563c7b8392b94bbbca42e7c5",
-      "transactionHash": "0xf31c5a6f4b411f9e0468835def5934dc57d4a689c0c7dca14b64f20d58bfb344"
+      "address": "0xc660ec1f81703e2dfb6496949a3695e4d74ee8fa",
+      "transactionHash": "0x1d58cabb55b9e03bba47c63708af2626078ddaf7a1583500744bf8d9ef2adf51"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.409Z"
+  "updatedAt": "2019-01-11T16:10:01.965Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
index 35227a0a4..98e09a920 100644
--- a/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
+++ b/blockchain/source/migration_artifacts/contracts/MultiSigWallet.json
@@ -533,24 +533,24 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b50604051620016d5380380620016d583398101604052805160208201519101805190919060009082603282118015906200004b5750818111155b80156200005757508015155b80156200006357508115155b15156200006f57600080fd5b600092505b845183101562000147576002600086858151811015156200009157fe5b6020908102909101810151600160a060020a031682528101919091526040016000205460ff16158015620000e757508483815181101515620000cf57fe5b90602001906020020151600160a060020a0316600014155b1515620000f357600080fd5b60016002600087868151811015156200010857fe5b602090810291909101810151600160a060020a03168252810191909152604001600020805460ff19169115159190911790556001929092019162000074565b84516200015c9060039060208801906200016e565b50505060049190915550620002029050565b828054828255906000526020600020908101928215620001c6579160200282015b82811115620001c65782518254600160a060020a031916600160a060020a039091161782556020909201916001909101906200018f565b50620001d4929150620001d8565b5090565b620001ff91905b80821115620001d4578054600160a060020a0319168155600101620001df565b90565b6114c380620002126000396000f30060806040526004361061011c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025e7c27811461015e578063173825d91461019257806320ea8d86146101b35780632f54bf6e146101cb5780633411c81c1461020057806354741525146102245780637065cb4814610255578063784547a7146102765780638b51d13f1461028e5780639ace38c2146102a6578063a0e67e2b14610361578063a8abe69a146103c6578063b5dc40c3146103eb578063b77bf60014610403578063ba51a6df14610418578063c01a8c8414610430578063c642747414610448578063d74f8edd146104b1578063dc8452cd146104c6578063e20056e6146104db578063ee22610b14610502575b600034111561015c5760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016a57600080fd5b5061017660043561051a565b60408051600160a060020a039092168252519081900360200190f35b34801561019e57600080fd5b5061015c600160a060020a0360043516610542565b3480156101bf57600080fd5b5061015c6004356106b9565b3480156101d757600080fd5b506101ec600160a060020a0360043516610773565b604080519115158252519081900360200190f35b34801561020c57600080fd5b506101ec600435600160a060020a0360243516610788565b34801561023057600080fd5b50610243600435151560243515156107a8565b60408051918252519081900360200190f35b34801561026157600080fd5b5061015c600160a060020a0360043516610814565b34801561028257600080fd5b506101ec600435610939565b34801561029a57600080fd5b506102436004356109bd565b3480156102b257600080fd5b506102be600435610a2c565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b8381101561032357818101518382015260200161030b565b50505050905090810190601f1680156103505780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036d57600080fd5b50610376610aea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103b257818101518382015260200161039a565b505050509050019250505060405180910390f35b3480156103d257600080fd5b5061037660043560243560443515156064351515610b4d565b3480156103f757600080fd5b50610376600435610c86565b34801561040f57600080fd5b50610243610dff565b34801561042457600080fd5b5061015c600435610e05565b34801561043c57600080fd5b5061015c600435610e84565b34801561045457600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610243948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610f4f9650505050505050565b3480156104bd57600080fd5b50610243610f6e565b3480156104d257600080fd5b50610243610f73565b3480156104e757600080fd5b5061015c600160a060020a0360043581169060243516610f79565b34801561050e57600080fd5b5061015c600435611103565b600380548290811061052857fe5b600091825260209091200154600160a060020a0316905081565b600033301461055057600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561057957600080fd5b600160a060020a0383166000908152600260205260408120805460ff1916905591505b600354600019018210156106545782600160a060020a03166003838154811015156105c357fe5b600091825260209091200154600160a060020a03161415610649576003805460001981019081106105f057fe5b60009182526020909120015460038054600160a060020a03909216918490811061061657fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550610654565b60019091019061059c565b60038054600019019061066790826113d6565b5060035460045411156106805760035461068090610e05565b604051600160a060020a038416907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a2505050565b3360008181526002602052604090205460ff1615156106d757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561070357600080fd5b600084815260208190526040902060030154849060ff161561072457600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561080d578380156107d5575060008181526020819052604090206003015460ff16155b806107f957508280156107f9575060008181526020819052604090206003015460ff165b15610805576001820191505b6001016107ac565b5092915050565b33301461082057600080fd5b600160a060020a038116600090815260026020526040902054819060ff161561084857600080fd5b81600160a060020a038116151561085e57600080fd5b6003805490506001016004546032821115801561087b5750818111155b801561088657508015155b801561089157508115155b151561089c57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b6003548110156109b6576000848152600160205260408120600380549192918490811061096757fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff161561099b576001820191505b6004548214156109ae57600192506109b6565b60010161093e565b5050919050565b6000805b600354811015610a2657600083815260016020526040812060038054919291849081106109ea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610a1e576001820191505b6001016109c1565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610ad75780601f10610aac57610100808354040283529160200191610ad7565b820191906000526020600020905b815481529060010190602001808311610aba57829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610b4257602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b24575b505050505090505b90565b606080600080600554604051908082528060200260200182016040528015610b7f578160200160208202803883390190505b50925060009150600090505b600554811015610c0657858015610bb4575060008181526020819052604090206003015460ff16155b80610bd85750848015610bd8575060008181526020819052604090206003015460ff165b15610bfe57808383815181101515610bec57fe5b60209081029091010152600191909101905b600101610b8b565b878703604051908082528060200260200182016040528015610c32578160200160208202803883390190505b5093508790505b86811015610c7b578281815181101515610c4f57fe5b9060200190602002015184898303815181101515610c6957fe5b60209081029091010152600101610c39565b505050949350505050565b606080600080600380549050604051908082528060200260200182016040528015610cbb578160200160208202803883390190505b50925060009150600090505b600354811015610d785760008581526001602052604081206003805491929184908110610cf057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610d70576003805482908110610d2b57fe5b6000918252602090912001548351600160a060020a0390911690849084908110610d5157fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610cc7565b81604051908082528060200260200182016040528015610da2578160200160208202803883390190505b509350600090505b81811015610df7578281815181101515610dc057fe5b906020019060200201518482815181101515610dd857fe5b600160a060020a03909216602092830290910190910152600101610daa565b505050919050565b60055481565b333014610e1157600080fd5b6003548160328211801590610e265750818111155b8015610e3157508015155b8015610e3c57508115155b1515610e4757600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff161515610ea257600080fd5b6000828152602081905260409020548290600160a060020a03161515610ec757600080fd5b60008381526001602090815260408083203380855292529091205484919060ff1615610ef257600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a3610f4885611103565b5050505050565b6000610f5c8484846112c3565b9050610f6781610e84565b9392505050565b603281565b60045481565b6000333014610f8757600080fd5b600160a060020a038316600090815260026020526040902054839060ff161515610fb057600080fd5b600160a060020a038316600090815260026020526040902054839060ff1615610fd857600080fd5b600092505b6003548310156110695784600160a060020a031660038481548110151561100057fe5b600091825260209091200154600160a060020a0316141561105e578360038481548110151561102b57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550611069565b600190920191610fdd565b600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604081205490919060ff16151561112457600080fd5b60008381526001602090815260408083203380855292529091205484919060ff16151561115057600080fd5b600085815260208190526040902060030154859060ff161561117157600080fd5b61117a86610939565b156112bb576000868152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f60001997831615610100029790970190911692909204948501879004870282018701909752838152939a5061124e95600160a060020a03909216949093919083908301828280156112445780601f1061121957610100808354040283529160200191611244565b820191906000526020600020905b81548152906001019060200180831161122757829003601f168201915b50505050506113b3565b156112835760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a26112bb565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038501805460ff191690555b505050505050565b600083600160a060020a03811615156112db57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff19169416939093178355516001830155925180519496509193909261135b9260028501929101906113ff565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b8154818355818111156113fa576000838152602090206113fa91810190830161147d565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061144057805160ff191683800117855561146d565b8280016001018555821561146d579182015b8281111561146d578251825591602001919060010190611452565b5061147992915061147d565b5090565b610b4a91905b8082111561147957600081556001016114835600a165627a7a72305820657b94e5aec29e0181ec8cd76465fddf57bce25a30e69ade8cc098b949dffd840029",
-  "deployedBytecode": "0x60806040526004361061011c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025e7c27811461015e578063173825d91461019257806320ea8d86146101b35780632f54bf6e146101cb5780633411c81c1461020057806354741525146102245780637065cb4814610255578063784547a7146102765780638b51d13f1461028e5780639ace38c2146102a6578063a0e67e2b14610361578063a8abe69a146103c6578063b5dc40c3146103eb578063b77bf60014610403578063ba51a6df14610418578063c01a8c8414610430578063c642747414610448578063d74f8edd146104b1578063dc8452cd146104c6578063e20056e6146104db578063ee22610b14610502575b600034111561015c5760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016a57600080fd5b5061017660043561051a565b60408051600160a060020a039092168252519081900360200190f35b34801561019e57600080fd5b5061015c600160a060020a0360043516610542565b3480156101bf57600080fd5b5061015c6004356106b9565b3480156101d757600080fd5b506101ec600160a060020a0360043516610773565b604080519115158252519081900360200190f35b34801561020c57600080fd5b506101ec600435600160a060020a0360243516610788565b34801561023057600080fd5b50610243600435151560243515156107a8565b60408051918252519081900360200190f35b34801561026157600080fd5b5061015c600160a060020a0360043516610814565b34801561028257600080fd5b506101ec600435610939565b34801561029a57600080fd5b506102436004356109bd565b3480156102b257600080fd5b506102be600435610a2c565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b8381101561032357818101518382015260200161030b565b50505050905090810190601f1680156103505780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036d57600080fd5b50610376610aea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103b257818101518382015260200161039a565b505050509050019250505060405180910390f35b3480156103d257600080fd5b5061037660043560243560443515156064351515610b4d565b3480156103f757600080fd5b50610376600435610c86565b34801561040f57600080fd5b50610243610dff565b34801561042457600080fd5b5061015c600435610e05565b34801561043c57600080fd5b5061015c600435610e84565b34801561045457600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610243948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610f4f9650505050505050565b3480156104bd57600080fd5b50610243610f6e565b3480156104d257600080fd5b50610243610f73565b3480156104e757600080fd5b5061015c600160a060020a0360043581169060243516610f79565b34801561050e57600080fd5b5061015c600435611103565b600380548290811061052857fe5b600091825260209091200154600160a060020a0316905081565b600033301461055057600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561057957600080fd5b600160a060020a0383166000908152600260205260408120805460ff1916905591505b600354600019018210156106545782600160a060020a03166003838154811015156105c357fe5b600091825260209091200154600160a060020a03161415610649576003805460001981019081106105f057fe5b60009182526020909120015460038054600160a060020a03909216918490811061061657fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550610654565b60019091019061059c565b60038054600019019061066790826113d6565b5060035460045411156106805760035461068090610e05565b604051600160a060020a038416907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a2505050565b3360008181526002602052604090205460ff1615156106d757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561070357600080fd5b600084815260208190526040902060030154849060ff161561072457600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561080d578380156107d5575060008181526020819052604090206003015460ff16155b806107f957508280156107f9575060008181526020819052604090206003015460ff165b15610805576001820191505b6001016107ac565b5092915050565b33301461082057600080fd5b600160a060020a038116600090815260026020526040902054819060ff161561084857600080fd5b81600160a060020a038116151561085e57600080fd5b6003805490506001016004546032821115801561087b5750818111155b801561088657508015155b801561089157508115155b151561089c57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b6003548110156109b6576000848152600160205260408120600380549192918490811061096757fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff161561099b576001820191505b6004548214156109ae57600192506109b6565b60010161093e565b5050919050565b6000805b600354811015610a2657600083815260016020526040812060038054919291849081106109ea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610a1e576001820191505b6001016109c1565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610ad75780601f10610aac57610100808354040283529160200191610ad7565b820191906000526020600020905b815481529060010190602001808311610aba57829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610b4257602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b24575b505050505090505b90565b606080600080600554604051908082528060200260200182016040528015610b7f578160200160208202803883390190505b50925060009150600090505b600554811015610c0657858015610bb4575060008181526020819052604090206003015460ff16155b80610bd85750848015610bd8575060008181526020819052604090206003015460ff165b15610bfe57808383815181101515610bec57fe5b60209081029091010152600191909101905b600101610b8b565b878703604051908082528060200260200182016040528015610c32578160200160208202803883390190505b5093508790505b86811015610c7b578281815181101515610c4f57fe5b9060200190602002015184898303815181101515610c6957fe5b60209081029091010152600101610c39565b505050949350505050565b606080600080600380549050604051908082528060200260200182016040528015610cbb578160200160208202803883390190505b50925060009150600090505b600354811015610d785760008581526001602052604081206003805491929184908110610cf057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610d70576003805482908110610d2b57fe5b6000918252602090912001548351600160a060020a0390911690849084908110610d5157fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610cc7565b81604051908082528060200260200182016040528015610da2578160200160208202803883390190505b509350600090505b81811015610df7578281815181101515610dc057fe5b906020019060200201518482815181101515610dd857fe5b600160a060020a03909216602092830290910190910152600101610daa565b505050919050565b60055481565b333014610e1157600080fd5b6003548160328211801590610e265750818111155b8015610e3157508015155b8015610e3c57508115155b1515610e4757600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff161515610ea257600080fd5b6000828152602081905260409020548290600160a060020a03161515610ec757600080fd5b60008381526001602090815260408083203380855292529091205484919060ff1615610ef257600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a3610f4885611103565b5050505050565b6000610f5c8484846112c3565b9050610f6781610e84565b9392505050565b603281565b60045481565b6000333014610f8757600080fd5b600160a060020a038316600090815260026020526040902054839060ff161515610fb057600080fd5b600160a060020a038316600090815260026020526040902054839060ff1615610fd857600080fd5b600092505b6003548310156110695784600160a060020a031660038481548110151561100057fe5b600091825260209091200154600160a060020a0316141561105e578360038481548110151561102b57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550611069565b600190920191610fdd565b600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604081205490919060ff16151561112457600080fd5b60008381526001602090815260408083203380855292529091205484919060ff16151561115057600080fd5b600085815260208190526040902060030154859060ff161561117157600080fd5b61117a86610939565b156112bb576000868152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f60001997831615610100029790970190911692909204948501879004870282018701909752838152939a5061124e95600160a060020a03909216949093919083908301828280156112445780601f1061121957610100808354040283529160200191611244565b820191906000526020600020905b81548152906001019060200180831161122757829003601f168201915b50505050506113b3565b156112835760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a26112bb565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038501805460ff191690555b505050505050565b600083600160a060020a03811615156112db57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff19169416939093178355516001830155925180519496509193909261135b9260028501929101906113ff565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b8154818355818111156113fa576000838152602090206113fa91810190830161147d565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061144057805160ff191683800117855561146d565b8280016001018555821561146d579182015b8281111561146d578251825591602001919060010190611452565b5061147992915061147d565b5090565b610b4a91905b8082111561147957600081556001016114835600a165627a7a72305820657b94e5aec29e0181ec8cd76465fddf57bce25a30e69ade8cc098b949dffd840029",
-  "sourceMap": "187:12408:7:-;;;2783:349;8:9:-1;5:2;;;30:1;27;20:12;5:2;2783:349:7;;;;;;;;;;;;;;;;;;;;;;2874:14;;2783:349;;;2920:6;;2783:349;820:2;2250:29;;;;;:56;;;2296:10;2283:9;:23;;2250:56;:74;;;;-1:-1:-1;2310:14:7;;;2250:74;:93;;;;-1:-1:-1;2328:15:7;;;2250:93;2242:102;;;;;;;;2929:1;2920:10;;2915:155;2936:7;:14;2932:1;:18;2915:155;;;2980:7;:19;2988:7;2996:1;2988:10;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2980:19:7;;;;;;;;;;;-1:-1:-1;2980:19:7;;;;2979:20;:39;;;;;3003:7;3011:1;3003:10;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3003:15:7;3017:1;3003:15;;2979:39;2971:48;;;;;;;;3055:4;3033:7;:19;3041:7;3049:1;3041:10;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3033:19:7;;;;;;;;;;;-1:-1:-1;3033:19:7;:26;;-1:-1:-1;;3033:26:7;;;;;;;;;;-1:-1:-1;2952:3:7;;;;;2915:155;;;3079:16;;;;:6;;:16;;;;;:::i;:::-;-1:-1:-1;;;3105:8:7;:20;;;;-1:-1:-1;187:12408:7;;-1:-1:-1;187:12408:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;187:12408:7;-1:-1:-1;;;;;187:12408:7;;;;;;;;;;;-1:-1:-1;187:12408:7;;;;;;;-1:-1:-1;187:12408:7;;;-1:-1:-1;187:12408:7;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;;;;;187:12408:7;;;;;;;;;:::o;:::-;;;;;;;",
-  "deployedSourceMap": "187:12408:7:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2488:1;2476:9;:13;2472:61;;;2503:30;;;2523:9;2503:30;;;;2511:10;;2503:30;;;;;;;;;;2472:61;187:12408;1027:23;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1027:23:7;;;;;;;;;-1:-1:-1;;;;;1027:23:7;;;;;;;;;;;;;;3639:452;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3639:452:7;-1:-1:-1;;;;;3639:452:7;;;;;6149:275;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6149:275:7;;;;;982:39;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;982:39:7;-1:-1:-1;;;;;982:39:7;;;;;;;;;;;;;;;;;;;;;;;914:62;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;914:62:7;;;-1:-1:-1;;;;;914:62:7;;;;;10334:308;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10334:308:7;;;;;;;;;;;;;;;;;;;;;;;;;;;3259:257;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3259:257:7;-1:-1:-1;;;;;3259:257:7;;;;;8506:329;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;8506:329:7;;;;;9812:260;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;9812:260:7;;;;;860:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;860:48:7;;;;;;;;;;-1:-1:-1;;;;;860:48:7;-1:-1:-1;;;;;860:48:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;860:48:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10726:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10726:103:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;10726:103:7;;;;;;;;;;;;;;;;;11928:665;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;11928:665:7;;;;;;;;;;;;;;;11008:571;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;11008:571:7;;;;;1082:28;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1082:28:7;;;;4901:195;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4901:195:7;;;;;5697:328;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5697:328:7;;;;;5355:236;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5355:236:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5355:236:7;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5355:236:7;;-1:-1:-1;5355:236:7;;-1:-1:-1;;;;;;;5355:236:7;781:41;;8:9:-1;5:2;;;30:1;27;20:12;5:2;781:41:7;;;;1056:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1056:20:7;;;;4293:437;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4293:437:7;-1:-1:-1;;;;;4293:437:7;;;;;;;;;;6538:570;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6538:570:7;;;;;1027:23;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1027:23:7;;-1:-1:-1;1027:23:7;:::o;3639:452::-;3775:6;1314:10;1336:4;1314:27;1306:36;;;;;;-1:-1:-1;;;;;1520:14:7;;;;;;:7;:14;;;;;;3717:5;;1520:14;;1512:23;;;;;;;;-1:-1:-1;;;;;3738:14:7;;3755:5;3738:14;;;:7;:14;;;;;:22;;-1:-1:-1;;3738:22:7;;;3755:5;-1:-1:-1;3770:174:7;3791:6;:13;-1:-1:-1;;3791:17:7;3787:21;;3770:174;;;3844:5;-1:-1:-1;;;;;3831:18:7;:6;3838:1;3831:9;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3831:9:7;:18;3827:117;;;3881:6;3888:13;;-1:-1:-1;;3888:17:7;;;3881:25;;;;;;;;;;;;;;;;3869:6;:9;;-1:-1:-1;;;;;3881:25:7;;;;3876:1;;3869:9;;;;;;;;;;;;;;:37;;;;;-1:-1:-1;;;;;3869:37:7;;;;;-1:-1:-1;;;;;3869:37:7;;;;;;3924:5;;3827:117;3810:3;;;;;3770:174;;;3953:6;:18;;-1:-1:-1;;3953:18:7;;;;;;:::i;:::-;-1:-1:-1;3996:6:7;:13;3985:8;;:24;3981:74;;;4041:6;:13;4023:32;;:17;:32::i;:::-;4065:19;;-1:-1:-1;;;;;4065:19:7;;;;;;;;1352:1;3639:452;;:::o;6149:275::-;6224:10;1520:14;;;;:7;:14;;;;;;;;1512:23;;;;;;;;1765:28;;;;:13;:28;;;;;;;;6265:10;1765:35;;;;;;;;;6250:13;;6265:10;1765:35;;1757:44;;;;;;;;2021:12;:27;;;;;;;;;;:36;;;6293:13;;2021:36;;2020:37;2012:46;;;;;;6365:5;6322:28;;;:13;:28;;;;;;;;6351:10;6322:40;;;;;;;;:48;;-1:-1:-1;;6322:48:7;;;6380:37;6336:13;;6380:37;;;1811:1;1545;;6149:275;;:::o;982:39::-;;;;;;;;;;;;;;;:::o;914:62::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;10334:308::-;10429:10;;10455:181;10476:16;;10472:1;:20;10455:181;;;10515:7;:36;;;;-1:-1:-1;10527:12:7;:15;;;;;;;;;;:24;;;;;10526:25;10515:36;:76;;;;10555:8;:36;;;;-1:-1:-1;10567:12:7;:15;;;;;;;;;;:24;;;;;10555:36;10511:125;;;10620:1;10611:10;;;;10511:125;10494:3;;10455:181;;;10334:308;;;;;:::o;3259:257::-;1314:10;1336:4;1314:27;1306:36;;;;;;-1:-1:-1;;;;;1427:14:7;;;;;;:7;:14;;;;;;3340:5;;1427:14;;1426:15;1418:24;;;;;;3359:5;-1:-1:-1;;;;;2135:13:7;;;;2127:22;;;;;;3387:6;:13;;;;3403:1;3387:17;3406:8;;820:2;2250:10;:29;;:56;;;;;2296:10;2283:9;:23;;2250:56;:74;;;;-1:-1:-1;2310:14:7;;;2250:74;:93;;;;-1:-1:-1;2328:15:7;;;2250:93;2242:102;;;;;;;;-1:-1:-1;;;;;3430:14:7;;;;;;:7;:14;;;;;;:21;;-1:-1:-1;;3430:21:7;3447:4;3430:21;;;;;;3461:6;27:10:-1;;23:18;;;45:23;;3461:18:7;;;;;;-1:-1:-1;;3461:18:7;;;;;3489:20;;;3430:14;3489:20;2159:1;;1452;1352;3259:257;:::o;8506:329::-;8584:4;;;8628:201;8649:6;:13;8645:17;;8628:201;;;8687:28;;;;:13;:28;;;;;8716:6;:9;;8687:28;;;8723:1;;8716:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;8716:9:7;8687:39;;;;;;;;;;;;;;;8683:71;;;8753:1;8744:10;;;;8683:71;8781:8;;8772:5;:17;8768:50;;;8814:4;8807:11;;;;8768:50;8664:3;;8628:201;;;8506:329;;;;;:::o;9812:260::-;9899:10;;9925:141;9946:6;:13;9942:17;;9925:141;;;9982:28;;;;:13;:28;;;;;10011:6;:9;;9982:28;;;10018:1;;10011:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;10011:9:7;9982:39;;;;;;;;;;;;;;;9978:88;;;10050:1;10041:10;;;;9978:88;9961:3;;9925:141;;;9812:260;;;;:::o;860:48::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;860:48:7;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;860:48:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;860:48:7;;;;;;;-1:-1:-1;;860:48:7;;;:::o;10726:103::-;10784:9;10816:6;10809:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;10809:13:7;;;;;;;;;;;;;;;;;;;;;;;10726:103;;:::o;11928:665::-;12041:22;12079:32;12152:10;12176:6;12125:16;;12114:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;12114:28:7;;12079:63;;12165:1;12152:14;;12201:1;12197:5;;12192:247;12208:16;;12204:1;:20;12192:247;;;12247:7;:36;;;;-1:-1:-1;12259:12:7;:15;;;;;;;;;;:24;;;;;12258:25;12247:36;:88;;;;12299:8;:36;;;;-1:-1:-1;12311:12:7;:15;;;;;;;;;;:24;;;;;12299:36;12243:196;;;12395:1;12367:18;12386:5;12367:25;;;;;;;;;;;;;;;;;;:29;12423:1;12414:10;;;;;12243:196;12226:3;;12192:247;;;12482:4;12477:2;:9;12466:21;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;12466:21:7;;12448:39;;12506:4;12502:8;;12497:89;12516:2;12512:1;:6;12497:89;;;12565:18;12584:1;12565:21;;;;;;;;;;;;;;;;;;12537:15;12557:4;12553:1;:8;12537:25;;;;;;;;;;;;;;;;;;:49;12520:3;;12497:89;;;11928:665;;;;;;;;;:::o;11008:571::-;11091:24;11131:34;11206:10;11230:6;11182;:13;;;;11168:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;11168:28:7;;11131:65;;11219:1;11206:14;;11255:1;11251:5;;11246:190;11262:6;:13;11258:17;;11246:190;;;11298:28;;;;:13;:28;;;;;11327:6;:9;;11298:28;;;11334:1;;11327:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;11327:9:7;11298:39;;;;;;;;;;;;;;;11294:142;;;11384:6;:9;;11391:1;;11384:9;;;;;;;;;;;;;;;;11357:24;;-1:-1:-1;;;;;11384:9:7;;;;11357:17;;11375:5;;11357:24;;;;;;-1:-1:-1;;;;;11357:36:7;;;:24;;;;;;;;;;:36;11420:1;11411:10;;;;;11294:142;11277:3;;11246:190;;;11476:5;11462:20;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;11462:20:7;;11445:37;;11501:1;11497:5;;11492:80;11508:5;11504:1;:9;11492:80;;;11552:17;11570:1;11552:20;;;;;;;;;;;;;;;;;;11532:14;11547:1;11532:17;;;;;;;;;;-1:-1:-1;;;;;11532:40:7;;;:17;;;;;;;;;;:40;11515:3;;11492:80;;;11008:571;;;;;;:::o;1082:28::-;;;;:::o;4901:195::-;1314:10;1336:4;1314:27;1306:36;;;;;;4991:6;:13;5006:9;820:2;2250:29;;;;;:56;;;2296:10;2283:9;:23;;2250:56;:74;;;;-1:-1:-1;2310:14:7;;;2250:74;:93;;;;-1:-1:-1;2328:15:7;;;2250:93;2242:102;;;;;;;;5031:8;:20;;;5061:28;;;;;;;;;;;;;;;;;1352:1;;4901:195;:::o;5697:328::-;5772:10;1520:14;;;;:7;:14;;;;;;;;1512:23;;;;;;;;1624:12;:27;;;;;;;;;;:39;5806:13;;-1:-1:-1;;;;;1624:39:7;:44;;1616:53;;;;;;1901:28;;;;:13;:28;;;;;;;;5853:10;1901:35;;;;;;;;;5838:13;;5853:10;1901:35;;1900:36;1892:45;;;;;;5879:28;;;;5922:4;5879:28;;;;;;;;5908:10;5879:40;;;;;;;;:47;;-1:-1:-1;;5879:47:7;;;;;;;5936:39;;5893:13;;5936:39;;;5985:33;6004:13;5985:18;:33::i;:::-;1679:1;;1545;5697:328;;:::o;5355:236::-;5451:18;5501:40;5516:11;5529:5;5536:4;5501:14;:40::i;:::-;5485:56;;5551:33;5570:13;5551:18;:33::i;:::-;5355:236;;;;;:::o;781:41::-;820:2;781:41;:::o;1056:20::-;;;;:::o;4293:437::-;4448:6;1314:10;1336:4;1314:27;1306:36;;;;;;-1:-1:-1;;;;;1520:14:7;;;;;;:7;:14;;;;;;4390:5;;1520:14;;1512:23;;;;;;;;-1:-1:-1;;;;;1427:14:7;;;;;;:7;:14;;;;;;4419:8;;1427:14;;1426:15;1418:24;;;;;;4457:1;4448:10;;4443:153;4464:6;:13;4460:17;;4443:153;;;4513:5;-1:-1:-1;;;;;4500:18:7;:6;4507:1;4500:9;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;4500:9:7;:18;4496:100;;;4550:8;4538:6;4545:1;4538:9;;;;;;;;;;;;;;;;;;:20;;;;;-1:-1:-1;;;;;4538:20:7;;;;;-1:-1:-1;;;;;4538:20:7;;;;;;4576:5;;4496:100;4479:3;;;;;4443:153;;;-1:-1:-1;;;;;4605:14:7;;;4622:5;4605:14;;;:7;:14;;;;;;:22;;-1:-1:-1;;4605:22:7;;;;;;4637:17;;;;;;;;:24;;;;;4605:22;4637:24;;;;4671:19;;4605:14;;4671:19;;;4700:23;;-1:-1:-1;;;;;4700:23:7;;;;;;;;1545:1;1352;4293:437;;;:::o;6538:570::-;6613:10;6757:23;1520:14;;;:7;:14;;;;;;6757:23;;6613:10;1520:14;;1512:23;;;;;;;;1765:28;;;;:13;:28;;;;;;;;6654:10;1765:35;;;;;;;;;6639:13;;6654:10;1765:35;;1757:44;;;;;;;;2021:12;:27;;;;;;;;;;:36;;;6682:13;;2021:36;;2020:37;2012:46;;;;;;6715:26;6727:13;6715:11;:26::i;:::-;6711:391;;;6783:12;:27;;;;;;;;;;;;6824:12;;;:19;;-1:-1:-1;;6824:19:7;6839:4;6824:19;;;;;;6875:15;;6892:9;;;;6903:8;;;;:15;;6861:68;;;-1:-1:-1;;6903:15:7;;;;6824:19;6903:15;;;;;;;;;;;;6861:68;;;;;;;;;;;;;;;;;;6783:27;;-1:-1:-1;6861:68:7;;-1:-1:-1;;;;;6875:15:7;;;;6892:9;;6861:68;6903:8;:15;;6861:68;;6903:8;:15;6861:68;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:13;:68::i;:::-;6857:235;;;6947:24;;6957:13;;6947:24;;;;;6857:235;;;7008:31;;7025:13;;7008:31;;;;;7057:12;;;:20;;-1:-1:-1;;7057:20:7;;;6857:235;1811:1;1545;;6538:570;;;:::o;9168:447::-;9288:18;9262:11;-1:-1:-1;;;;;2135:13:7;;;;2127:22;;;;;;9338:16;;9394:148;;;;;;;;-1:-1:-1;;;;;9394:148:7;;;;;;;;;;;;;;;;;;-1:-1:-1;9394:148:7;;;;;;9364:27;;;;;;;;;;:178;;;;-1:-1:-1;;9364:178:7;;;;;;;;;;-1:-1:-1;9364:178:7;;;;;;;9338:16;;-1:-1:-1;9394:148:7;;9364:27;;:178;;;;;;;;;;:::i;:::-;-1:-1:-1;9364:178:7;;;;;;;;;;;;-1:-1:-1;;9364:178:7;;;;;;;;;;9552:16;:21;;-1:-1:-1;9552:21:7;;;9583:25;;9594:13;;9583:25;;-1:-1:-1;;9583:25:7;9168:447;;;;;;:::o;7285:1070::-;7387:4;7403:11;7513:4;7507:11;7646:2;7640:4;7636:13;8228:1;8213;8116:10;8101:1;8082:5;8057:11;7764:5;7759:3;7755:15;7737:579;7727:589;7285:1070;-1:-1:-1;;;;;;;;7285:1070:7:o;187:12408::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;187:12408:7;;;-1:-1:-1;187:12408:7;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;",
-  "source": "pragma solidity ^0.4.15;\n\n\n/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.\n/// @author Stefan George - <stefan.george@consensys.net>\ncontract MultiSigWallet {\n\n    /*\n     *  Events\n     */\n    event Confirmation(address indexed sender, uint indexed transactionId);\n    event Revocation(address indexed sender, uint indexed transactionId);\n    event Submission(uint indexed transactionId);\n    event Execution(uint indexed transactionId);\n    event ExecutionFailure(uint indexed transactionId);\n    event Deposit(address indexed sender, uint value);\n    event OwnerAddition(address indexed owner);\n    event OwnerRemoval(address indexed owner);\n    event RequirementChange(uint required);\n\n    /*\n     *  Constants\n     */\n    uint constant public MAX_OWNER_COUNT = 50;\n\n    /*\n     *  Storage\n     */\n    mapping(uint => Transaction) public transactions;\n    mapping(uint => mapping(address => bool)) public confirmations;\n    mapping(address => bool) public isOwner;\n    address[] public owners;\n    uint public required;\n    uint public transactionCount;\n\n    struct Transaction {\n        address destination;\n        uint value;\n        bytes data;\n        bool executed;\n    }\n\n    /*\n     *  Modifiers\n     */\n    modifier onlyWallet() {\n        require(msg.sender == address(this));\n        _;\n    }\n\n    modifier ownerDoesNotExist(address owner) {\n        require(!isOwner[owner]);\n        _;\n    }\n\n    modifier ownerExists(address owner) {\n        require(isOwner[owner]);\n        _;\n    }\n\n    modifier transactionExists(uint transactionId) {\n        require(transactions[transactionId].destination != 0);\n        _;\n    }\n\n    modifier confirmed(uint transactionId, address owner) {\n        require(confirmations[transactionId][owner]);\n        _;\n    }\n\n    modifier notConfirmed(uint transactionId, address owner) {\n        require(!confirmations[transactionId][owner]);\n        _;\n    }\n\n    modifier notExecuted(uint transactionId) {\n        require(!transactions[transactionId].executed);\n        _;\n    }\n\n    modifier notNull(address _address) {\n        require(_address != 0);\n        _;\n    }\n\n    modifier validRequirement(uint ownerCount, uint _required) {\n        require(ownerCount <= MAX_OWNER_COUNT && _required <= ownerCount && _required != 0 && ownerCount != 0);\n        _;\n    }\n\n    /// @dev Fallback function allows to deposit ether.\n    function()\n    payable\n    public\n    {\n        if (msg.value > 0)\n            Deposit(msg.sender, msg.value);\n    }\n\n    /*\n     * Public functions\n     */\n    /// @dev Contract constructor sets initial owners and required number of confirmations.\n    /// @param _owners List of initial owners.\n    /// @param _required Number of required confirmations.\n    function MultiSigWallet(address[] _owners, uint _required)\n    public\n    validRequirement(_owners.length, _required)\n    {\n        for (uint i = 0; i < _owners.length; i++) {\n            require(!isOwner[_owners[i]] && _owners[i] != 0);\n            isOwner[_owners[i]] = true;\n        }\n        owners = _owners;\n        required = _required;\n    }\n\n    /// @dev Allows to add a new owner. Transaction has to be sent by wallet.\n    /// @param owner Address of new owner.\n    function addOwner(address owner)\n    public\n    onlyWallet\n    ownerDoesNotExist(owner)\n    notNull(owner)\n    validRequirement(owners.length + 1, required)\n    {\n        isOwner[owner] = true;\n        owners.push(owner);\n        OwnerAddition(owner);\n    }\n\n    /// @dev Allows to remove an owner. Transaction has to be sent by wallet.\n    /// @param owner Address of owner.\n    function removeOwner(address owner)\n    public\n    onlyWallet\n    ownerExists(owner)\n    {\n        isOwner[owner] = false;\n        for (uint i = 0; i < owners.length - 1; i++)\n            if (owners[i] == owner) {\n                owners[i] = owners[owners.length - 1];\n                break;\n            }\n        owners.length -= 1;\n        if (required > owners.length)\n            changeRequirement(owners.length);\n        OwnerRemoval(owner);\n    }\n\n    /// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.\n    /// @param owner Address of owner to be replaced.\n    /// @param newOwner Address of new owner.\n    function replaceOwner(address owner, address newOwner)\n    public\n    onlyWallet\n    ownerExists(owner)\n    ownerDoesNotExist(newOwner)\n    {\n        for (uint i = 0; i < owners.length; i++)\n            if (owners[i] == owner) {\n                owners[i] = newOwner;\n                break;\n            }\n        isOwner[owner] = false;\n        isOwner[newOwner] = true;\n        OwnerRemoval(owner);\n        OwnerAddition(newOwner);\n    }\n\n    /// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.\n    /// @param _required Number of required confirmations.\n    function changeRequirement(uint _required)\n    public\n    onlyWallet\n    validRequirement(owners.length, _required)\n    {\n        required = _required;\n        RequirementChange(_required);\n    }\n\n    /// @dev Allows an owner to submit and confirm a transaction.\n    /// @param destination Transaction target address.\n    /// @param value Transaction ether value.\n    /// @param data Transaction data payload.\n    /// @return Returns transaction ID.\n    function submitTransaction(address destination, uint value, bytes data)\n    public\n    returns (uint transactionId)\n    {\n        transactionId = addTransaction(destination, value, data);\n        confirmTransaction(transactionId);\n    }\n\n    /// @dev Allows an owner to confirm a transaction.\n    /// @param transactionId Transaction ID.\n    function confirmTransaction(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    transactionExists(transactionId)\n    notConfirmed(transactionId, msg.sender)\n    {\n        confirmations[transactionId][msg.sender] = true;\n        Confirmation(msg.sender, transactionId);\n        executeTransaction(transactionId);\n    }\n\n    /// @dev Allows an owner to revoke a confirmation for a transaction.\n    /// @param transactionId Transaction ID.\n    function revokeConfirmation(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    confirmed(transactionId, msg.sender)\n    notExecuted(transactionId)\n    {\n        confirmations[transactionId][msg.sender] = false;\n        Revocation(msg.sender, transactionId);\n    }\n\n    /// @dev Allows anyone to execute a confirmed transaction.\n    /// @param transactionId Transaction ID.\n    function executeTransaction(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    confirmed(transactionId, msg.sender)\n    notExecuted(transactionId)\n    {\n        if (isConfirmed(transactionId)) {\n            Transaction storage txn = transactions[transactionId];\n            txn.executed = true;\n            if (external_call(txn.destination, txn.value, txn.data.length, txn.data))\n                Execution(transactionId);\n            else {\n                ExecutionFailure(transactionId);\n                txn.executed = false;\n            }\n        }\n    }\n\n    // call has been separated into its own function in order to take advantage\n    // of the Solidity's code generator to produce a loop that copies tx.data into memory.\n    function external_call(address destination, uint value, uint dataLength, bytes data) private returns (bool) {\n        bool result;\n        assembly { // solium-disable-line security/no-inline-assembly\n            let x := mload(0x40)   // \"Allocate\" memory for output (0x40 is where \"free memory\" pointer is stored by convention)\n            let d := add(data, 32) // First 32 bytes are the padded length of data, so exclude that\n            result := call(\n            sub(gas, 34710), // 34710 is the value that solidity is currently emitting\n            // It includes callGas (700) + callVeryLow (3, to pay for SUB) + callValueTransferGas (9000) +\n            // callNewAccountGas (25000, in case the destination address does not exist and needs creating)\n            destination,\n            value,\n            d,\n            dataLength, // Size of the input (in bytes) - this is what fixes the padding problem\n            x,\n            0                  // Output is ignored, therefore the output size is zero\n            )\n        }\n        return result;\n    }\n\n    /// @dev Returns the confirmation status of a transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Confirmation status.\n    function isConfirmed(uint transactionId)\n    public\n    constant\n    returns (bool)\n    {\n        uint count = 0;\n        for (uint i = 0; i < owners.length; i++) {\n            if (confirmations[transactionId][owners[i]])\n                count += 1;\n            if (count == required)\n                return true;\n        }\n    }\n\n    /*\n     * Internal functions\n     */\n    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.\n    /// @param destination Transaction target address.\n    /// @param value Transaction ether value.\n    /// @param data Transaction data payload.\n    /// @return Returns transaction ID.\n    function addTransaction(address destination, uint value, bytes data)\n    internal\n    notNull(destination)\n    returns (uint transactionId)\n    {\n        transactionId = transactionCount;\n        transactions[transactionId] = Transaction({\n            destination : destination,\n            value : value,\n            data : data,\n            executed : false\n            });\n        transactionCount += 1;\n        Submission(transactionId);\n    }\n\n    /*\n     * Web3 call functions\n     */\n    /// @dev Returns number of confirmations of a transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Number of confirmations.\n    function getConfirmationCount(uint transactionId)\n    public\n    constant\n    returns (uint count)\n    {\n        for (uint i = 0; i < owners.length; i++)\n            if (confirmations[transactionId][owners[i]]) {\n                count += 1;\n            }\n    }\n\n    /// @dev Returns total number of transactions after filers are applied.\n    /// @param pending Include pending transactions.\n    /// @param executed Include executed transactions.\n    /// @return Total number of transactions after filters are applied.\n    function getTransactionCount(bool pending, bool executed)\n    public\n    constant\n    returns (uint count)\n    {\n        for (uint i = 0; i < transactionCount; i++)\n            if (pending && !transactions[i].executed || executed && transactions[i].executed) {\n                count += 1;\n            }\n    }\n\n    /// @dev Returns list of owners.\n    /// @return List of owner addresses.\n    function getOwners()\n    public\n    constant\n    returns (address[])\n    {\n        return owners;\n    }\n\n    /// @dev Returns array with owner addresses, which confirmed transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Returns array of owner addresses.\n    function getConfirmations(uint transactionId)\n    public\n    constant\n    returns (address[] _confirmations)\n    {\n        address[] memory confirmationsTemp = new address[](owners.length);\n        uint count = 0;\n        uint i;\n        for (i = 0; i < owners.length; i++)\n            if (confirmations[transactionId][owners[i]]) {\n                confirmationsTemp[count] = owners[i];\n                count += 1;\n            }\n        _confirmations = new address[](count);\n        for (i = 0; i < count; i++)\n            _confirmations[i] = confirmationsTemp[i];\n    }\n\n    /// @dev Returns list of transaction IDs in defined range.\n    /// @param from Index start position of transaction array.\n    /// @param to Index end position of transaction array.\n    /// @param pending Include pending transactions.\n    /// @param executed Include executed transactions.\n    /// @return Returns array of transaction IDs.\n    function getTransactionIds(uint from, uint to, bool pending, bool executed)\n    public\n    constant\n    returns (uint[] _transactionIds)\n    {\n        uint[] memory transactionIdsTemp = new uint[](transactionCount);\n        uint count = 0;\n        uint i;\n        for (i = 0; i < transactionCount; i++)\n            if (pending && !transactions[i].executed\n            || executed && transactions[i].executed)\n            {\n                transactionIdsTemp[count] = i;\n                count += 1;\n            }\n        _transactionIds = new uint[](to - from);\n        for (i = from; i < to; i++)\n            _transactionIds[i - from] = transactionIdsTemp[i];\n    }\n}\n",
+  "bytecode": "0x60806040523480156200001157600080fd5b50604051620016d5380380620016d583398101604052805160208201519101805190919060009082603282118015906200004b5750818111155b80156200005757508015155b80156200006357508115155b15156200006f57600080fd5b600092505b845183101562000147576002600086858151811015156200009157fe5b6020908102909101810151600160a060020a031682528101919091526040016000205460ff16158015620000e757508483815181101515620000cf57fe5b90602001906020020151600160a060020a0316600014155b1515620000f357600080fd5b60016002600087868151811015156200010857fe5b602090810291909101810151600160a060020a03168252810191909152604001600020805460ff19169115159190911790556001929092019162000074565b84516200015c9060039060208801906200016e565b50505060049190915550620002029050565b828054828255906000526020600020908101928215620001c6579160200282015b82811115620001c65782518254600160a060020a031916600160a060020a039091161782556020909201916001909101906200018f565b50620001d4929150620001d8565b5090565b620001ff91905b80821115620001d4578054600160a060020a0319168155600101620001df565b90565b6114c380620002126000396000f30060806040526004361061011c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025e7c27811461015e578063173825d91461019257806320ea8d86146101b35780632f54bf6e146101cb5780633411c81c1461020057806354741525146102245780637065cb4814610255578063784547a7146102765780638b51d13f1461028e5780639ace38c2146102a6578063a0e67e2b14610361578063a8abe69a146103c6578063b5dc40c3146103eb578063b77bf60014610403578063ba51a6df14610418578063c01a8c8414610430578063c642747414610448578063d74f8edd146104b1578063dc8452cd146104c6578063e20056e6146104db578063ee22610b14610502575b600034111561015c5760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016a57600080fd5b5061017660043561051a565b60408051600160a060020a039092168252519081900360200190f35b34801561019e57600080fd5b5061015c600160a060020a0360043516610542565b3480156101bf57600080fd5b5061015c6004356106b9565b3480156101d757600080fd5b506101ec600160a060020a0360043516610773565b604080519115158252519081900360200190f35b34801561020c57600080fd5b506101ec600435600160a060020a0360243516610788565b34801561023057600080fd5b50610243600435151560243515156107a8565b60408051918252519081900360200190f35b34801561026157600080fd5b5061015c600160a060020a0360043516610814565b34801561028257600080fd5b506101ec600435610939565b34801561029a57600080fd5b506102436004356109bd565b3480156102b257600080fd5b506102be600435610a2c565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b8381101561032357818101518382015260200161030b565b50505050905090810190601f1680156103505780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036d57600080fd5b50610376610aea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103b257818101518382015260200161039a565b505050509050019250505060405180910390f35b3480156103d257600080fd5b5061037660043560243560443515156064351515610b4d565b3480156103f757600080fd5b50610376600435610c86565b34801561040f57600080fd5b50610243610dff565b34801561042457600080fd5b5061015c600435610e05565b34801561043c57600080fd5b5061015c600435610e84565b34801561045457600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610243948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610f4f9650505050505050565b3480156104bd57600080fd5b50610243610f6e565b3480156104d257600080fd5b50610243610f73565b3480156104e757600080fd5b5061015c600160a060020a0360043581169060243516610f79565b34801561050e57600080fd5b5061015c600435611103565b600380548290811061052857fe5b600091825260209091200154600160a060020a0316905081565b600033301461055057600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561057957600080fd5b600160a060020a0383166000908152600260205260408120805460ff1916905591505b600354600019018210156106545782600160a060020a03166003838154811015156105c357fe5b600091825260209091200154600160a060020a03161415610649576003805460001981019081106105f057fe5b60009182526020909120015460038054600160a060020a03909216918490811061061657fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550610654565b60019091019061059c565b60038054600019019061066790826113d6565b5060035460045411156106805760035461068090610e05565b604051600160a060020a038416907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a2505050565b3360008181526002602052604090205460ff1615156106d757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561070357600080fd5b600084815260208190526040902060030154849060ff161561072457600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561080d578380156107d5575060008181526020819052604090206003015460ff16155b806107f957508280156107f9575060008181526020819052604090206003015460ff165b15610805576001820191505b6001016107ac565b5092915050565b33301461082057600080fd5b600160a060020a038116600090815260026020526040902054819060ff161561084857600080fd5b81600160a060020a038116151561085e57600080fd5b6003805490506001016004546032821115801561087b5750818111155b801561088657508015155b801561089157508115155b151561089c57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b6003548110156109b6576000848152600160205260408120600380549192918490811061096757fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff161561099b576001820191505b6004548214156109ae57600192506109b6565b60010161093e565b5050919050565b6000805b600354811015610a2657600083815260016020526040812060038054919291849081106109ea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610a1e576001820191505b6001016109c1565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610ad75780601f10610aac57610100808354040283529160200191610ad7565b820191906000526020600020905b815481529060010190602001808311610aba57829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610b4257602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b24575b505050505090505b90565b606080600080600554604051908082528060200260200182016040528015610b7f578160200160208202803883390190505b50925060009150600090505b600554811015610c0657858015610bb4575060008181526020819052604090206003015460ff16155b80610bd85750848015610bd8575060008181526020819052604090206003015460ff165b15610bfe57808383815181101515610bec57fe5b60209081029091010152600191909101905b600101610b8b565b878703604051908082528060200260200182016040528015610c32578160200160208202803883390190505b5093508790505b86811015610c7b578281815181101515610c4f57fe5b9060200190602002015184898303815181101515610c6957fe5b60209081029091010152600101610c39565b505050949350505050565b606080600080600380549050604051908082528060200260200182016040528015610cbb578160200160208202803883390190505b50925060009150600090505b600354811015610d785760008581526001602052604081206003805491929184908110610cf057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610d70576003805482908110610d2b57fe5b6000918252602090912001548351600160a060020a0390911690849084908110610d5157fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610cc7565b81604051908082528060200260200182016040528015610da2578160200160208202803883390190505b509350600090505b81811015610df7578281815181101515610dc057fe5b906020019060200201518482815181101515610dd857fe5b600160a060020a03909216602092830290910190910152600101610daa565b505050919050565b60055481565b333014610e1157600080fd5b6003548160328211801590610e265750818111155b8015610e3157508015155b8015610e3c57508115155b1515610e4757600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff161515610ea257600080fd5b6000828152602081905260409020548290600160a060020a03161515610ec757600080fd5b60008381526001602090815260408083203380855292529091205484919060ff1615610ef257600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a3610f4885611103565b5050505050565b6000610f5c8484846112c3565b9050610f6781610e84565b9392505050565b603281565b60045481565b6000333014610f8757600080fd5b600160a060020a038316600090815260026020526040902054839060ff161515610fb057600080fd5b600160a060020a038316600090815260026020526040902054839060ff1615610fd857600080fd5b600092505b6003548310156110695784600160a060020a031660038481548110151561100057fe5b600091825260209091200154600160a060020a0316141561105e578360038481548110151561102b57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550611069565b600190920191610fdd565b600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604081205490919060ff16151561112457600080fd5b60008381526001602090815260408083203380855292529091205484919060ff16151561115057600080fd5b600085815260208190526040902060030154859060ff161561117157600080fd5b61117a86610939565b156112bb576000868152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f60001997831615610100029790970190911692909204948501879004870282018701909752838152939a5061124e95600160a060020a03909216949093919083908301828280156112445780601f1061121957610100808354040283529160200191611244565b820191906000526020600020905b81548152906001019060200180831161122757829003601f168201915b50505050506113b3565b156112835760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a26112bb565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038501805460ff191690555b505050505050565b600083600160a060020a03811615156112db57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff19169416939093178355516001830155925180519496509193909261135b9260028501929101906113ff565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b8154818355818111156113fa576000838152602090206113fa91810190830161147d565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061144057805160ff191683800117855561146d565b8280016001018555821561146d579182015b8281111561146d578251825591602001919060010190611452565b5061147992915061147d565b5090565b610b4a91905b8082111561147957600081556001016114835600a165627a7a72305820649787e9ee522865bcfe1a8c50cf282bd61087c52b327821fce51adba28f4b480029",
+  "deployedBytecode": "0x60806040526004361061011c5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025e7c27811461015e578063173825d91461019257806320ea8d86146101b35780632f54bf6e146101cb5780633411c81c1461020057806354741525146102245780637065cb4814610255578063784547a7146102765780638b51d13f1461028e5780639ace38c2146102a6578063a0e67e2b14610361578063a8abe69a146103c6578063b5dc40c3146103eb578063b77bf60014610403578063ba51a6df14610418578063c01a8c8414610430578063c642747414610448578063d74f8edd146104b1578063dc8452cd146104c6578063e20056e6146104db578063ee22610b14610502575b600034111561015c5760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016a57600080fd5b5061017660043561051a565b60408051600160a060020a039092168252519081900360200190f35b34801561019e57600080fd5b5061015c600160a060020a0360043516610542565b3480156101bf57600080fd5b5061015c6004356106b9565b3480156101d757600080fd5b506101ec600160a060020a0360043516610773565b604080519115158252519081900360200190f35b34801561020c57600080fd5b506101ec600435600160a060020a0360243516610788565b34801561023057600080fd5b50610243600435151560243515156107a8565b60408051918252519081900360200190f35b34801561026157600080fd5b5061015c600160a060020a0360043516610814565b34801561028257600080fd5b506101ec600435610939565b34801561029a57600080fd5b506102436004356109bd565b3480156102b257600080fd5b506102be600435610a2c565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b8381101561032357818101518382015260200161030b565b50505050905090810190601f1680156103505780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036d57600080fd5b50610376610aea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156103b257818101518382015260200161039a565b505050509050019250505060405180910390f35b3480156103d257600080fd5b5061037660043560243560443515156064351515610b4d565b3480156103f757600080fd5b50610376600435610c86565b34801561040f57600080fd5b50610243610dff565b34801561042457600080fd5b5061015c600435610e05565b34801561043c57600080fd5b5061015c600435610e84565b34801561045457600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610243948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610f4f9650505050505050565b3480156104bd57600080fd5b50610243610f6e565b3480156104d257600080fd5b50610243610f73565b3480156104e757600080fd5b5061015c600160a060020a0360043581169060243516610f79565b34801561050e57600080fd5b5061015c600435611103565b600380548290811061052857fe5b600091825260209091200154600160a060020a0316905081565b600033301461055057600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561057957600080fd5b600160a060020a0383166000908152600260205260408120805460ff1916905591505b600354600019018210156106545782600160a060020a03166003838154811015156105c357fe5b600091825260209091200154600160a060020a03161415610649576003805460001981019081106105f057fe5b60009182526020909120015460038054600160a060020a03909216918490811061061657fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550610654565b60019091019061059c565b60038054600019019061066790826113d6565b5060035460045411156106805760035461068090610e05565b604051600160a060020a038416907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a2505050565b3360008181526002602052604090205460ff1615156106d757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561070357600080fd5b600084815260208190526040902060030154849060ff161561072457600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561080d578380156107d5575060008181526020819052604090206003015460ff16155b806107f957508280156107f9575060008181526020819052604090206003015460ff165b15610805576001820191505b6001016107ac565b5092915050565b33301461082057600080fd5b600160a060020a038116600090815260026020526040902054819060ff161561084857600080fd5b81600160a060020a038116151561085e57600080fd5b6003805490506001016004546032821115801561087b5750818111155b801561088657508015155b801561089157508115155b151561089c57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b6003548110156109b6576000848152600160205260408120600380549192918490811061096757fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff161561099b576001820191505b6004548214156109ae57600192506109b6565b60010161093e565b5050919050565b6000805b600354811015610a2657600083815260016020526040812060038054919291849081106109ea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610a1e576001820191505b6001016109c1565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610ad75780601f10610aac57610100808354040283529160200191610ad7565b820191906000526020600020905b815481529060010190602001808311610aba57829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610b4257602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610b24575b505050505090505b90565b606080600080600554604051908082528060200260200182016040528015610b7f578160200160208202803883390190505b50925060009150600090505b600554811015610c0657858015610bb4575060008181526020819052604090206003015460ff16155b80610bd85750848015610bd8575060008181526020819052604090206003015460ff165b15610bfe57808383815181101515610bec57fe5b60209081029091010152600191909101905b600101610b8b565b878703604051908082528060200260200182016040528015610c32578160200160208202803883390190505b5093508790505b86811015610c7b578281815181101515610c4f57fe5b9060200190602002015184898303815181101515610c6957fe5b60209081029091010152600101610c39565b505050949350505050565b606080600080600380549050604051908082528060200260200182016040528015610cbb578160200160208202803883390190505b50925060009150600090505b600354811015610d785760008581526001602052604081206003805491929184908110610cf057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610d70576003805482908110610d2b57fe5b6000918252602090912001548351600160a060020a0390911690849084908110610d5157fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610cc7565b81604051908082528060200260200182016040528015610da2578160200160208202803883390190505b509350600090505b81811015610df7578281815181101515610dc057fe5b906020019060200201518482815181101515610dd857fe5b600160a060020a03909216602092830290910190910152600101610daa565b505050919050565b60055481565b333014610e1157600080fd5b6003548160328211801590610e265750818111155b8015610e3157508015155b8015610e3c57508115155b1515610e4757600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff161515610ea257600080fd5b6000828152602081905260409020548290600160a060020a03161515610ec757600080fd5b60008381526001602090815260408083203380855292529091205484919060ff1615610ef257600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a3610f4885611103565b5050505050565b6000610f5c8484846112c3565b9050610f6781610e84565b9392505050565b603281565b60045481565b6000333014610f8757600080fd5b600160a060020a038316600090815260026020526040902054839060ff161515610fb057600080fd5b600160a060020a038316600090815260026020526040902054839060ff1615610fd857600080fd5b600092505b6003548310156110695784600160a060020a031660038481548110151561100057fe5b600091825260209091200154600160a060020a0316141561105e578360038481548110151561102b57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a03160217905550611069565b600190920191610fdd565b600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604081205490919060ff16151561112457600080fd5b60008381526001602090815260408083203380855292529091205484919060ff16151561115057600080fd5b600085815260208190526040902060030154859060ff161561117157600080fd5b61117a86610939565b156112bb576000868152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f60001997831615610100029790970190911692909204948501879004870282018701909752838152939a5061124e95600160a060020a03909216949093919083908301828280156112445780601f1061121957610100808354040283529160200191611244565b820191906000526020600020905b81548152906001019060200180831161122757829003601f168201915b50505050506113b3565b156112835760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a26112bb565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038501805460ff191690555b505050505050565b600083600160a060020a03811615156112db57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff19169416939093178355516001830155925180519496509193909261135b9260028501929101906113ff565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b8154818355818111156113fa576000838152602090206113fa91810190830161147d565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061144057805160ff191683800117855561146d565b8280016001018555821561146d579182015b8281111561146d578251825591602001919060010190611452565b5061147992915061147d565b5090565b610b4a91905b8082111561147957600081556001016114835600a165627a7a72305820649787e9ee522865bcfe1a8c50cf282bd61087c52b327821fce51adba28f4b480029",
+  "sourceMap": "205:12408:8:-;;;2801:349;8:9:-1;5:2;;;30:1;27;20:12;5:2;2801:349:8;;;;;;;;;;;;;;;;;;;;;;2892:14;;2801:349;;;2938:6;;2801:349;838:2;2268:29;;;;;:56;;;2314:10;2301:9;:23;;2268:56;:74;;;;-1:-1:-1;2328:14:8;;;2268:74;:93;;;;-1:-1:-1;2346:15:8;;;2268:93;2260:102;;;;;;;;2947:1;2938:10;;2933:155;2954:7;:14;2950:1;:18;2933:155;;;2998:7;:19;3006:7;3014:1;3006:10;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;2998:19:8;;;;;;;;;;;-1:-1:-1;2998:19:8;;;;2997:20;:39;;;;;3021:7;3029:1;3021:10;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3021:15:8;3035:1;3021:15;;2997:39;2989:48;;;;;;;;3073:4;3051:7;:19;3059:7;3067:1;3059:10;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3051:19:8;;;;;;;;;;;-1:-1:-1;3051:19:8;:26;;-1:-1:-1;;3051:26:8;;;;;;;;;;-1:-1:-1;2970:3:8;;;;;2933:155;;;3097:16;;;;:6;;:16;;;;;:::i;:::-;-1:-1:-1;;;3123:8:8;:20;;;;-1:-1:-1;205:12408:8;;-1:-1:-1;205:12408:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;205:12408:8;-1:-1:-1;;;;;205:12408:8;;;;;;;;;;;-1:-1:-1;205:12408:8;;;;;;;-1:-1:-1;205:12408:8;;;-1:-1:-1;205:12408:8;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;-1:-1:-1;;;;;;205:12408:8;;;;;;;;;:::o;:::-;;;;;;;",
+  "deployedSourceMap": "205:12408:8:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2506:1;2494:9;:13;2490:61;;;2521:30;;;2541:9;2521:30;;;;2529:10;;2521:30;;;;;;;;;;2490:61;205:12408;1045:23;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1045:23:8;;;;;;;;;-1:-1:-1;;;;;1045:23:8;;;;;;;;;;;;;;3657:452;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3657:452:8;-1:-1:-1;;;;;3657:452:8;;;;;6167:275;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6167:275:8;;;;;1000:39;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1000:39:8;-1:-1:-1;;;;;1000:39:8;;;;;;;;;;;;;;;;;;;;;;;932:62;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;932:62:8;;;-1:-1:-1;;;;;932:62:8;;;;;10352:308;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;10352:308:8;;;;;;;;;;;;;;;;;;;;;;;;;;;3277:257;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3277:257:8;-1:-1:-1;;;;;3277:257:8;;;;;8524:329;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;8524:329:8;;;;;9830:260;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;9830:260:8;;;;;878:48;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;878:48:8;;;;;;;;;;-1:-1:-1;;;;;878:48:8;-1:-1:-1;;;;;878:48:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;878:48:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10744:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10744:103:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;10744:103:8;;;;;;;;;;;;;;;;;11946:665;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;11946:665:8;;;;;;;;;;;;;;;11026:571;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;11026:571:8;;;;;1100:28;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1100:28:8;;;;4919:195;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4919:195:8;;;;;5715:328;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5715:328:8;;;;;5373:236;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5373:236:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;5373:236:8;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5373:236:8;;-1:-1:-1;5373:236:8;;-1:-1:-1;;;;;;;5373:236:8;799:41;;8:9:-1;5:2;;;30:1;27;20:12;5:2;799:41:8;;;;1074:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1074:20:8;;;;4311:437;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4311:437:8;-1:-1:-1;;;;;4311:437:8;;;;;;;;;;6556:570;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6556:570:8;;;;;1045:23;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1045:23:8;;-1:-1:-1;1045:23:8;:::o;3657:452::-;3793:6;1332:10;1354:4;1332:27;1324:36;;;;;;-1:-1:-1;;;;;1538:14:8;;;;;;:7;:14;;;;;;3735:5;;1538:14;;1530:23;;;;;;;;-1:-1:-1;;;;;3756:14:8;;3773:5;3756:14;;;:7;:14;;;;;:22;;-1:-1:-1;;3756:22:8;;;3773:5;-1:-1:-1;3788:174:8;3809:6;:13;-1:-1:-1;;3809:17:8;3805:21;;3788:174;;;3862:5;-1:-1:-1;;;;;3849:18:8;:6;3856:1;3849:9;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3849:9:8;:18;3845:117;;;3899:6;3906:13;;-1:-1:-1;;3906:17:8;;;3899:25;;;;;;;;;;;;;;;;3887:6;:9;;-1:-1:-1;;;;;3899:25:8;;;;3894:1;;3887:9;;;;;;;;;;;;;;:37;;;;;-1:-1:-1;;;;;3887:37:8;;;;;-1:-1:-1;;;;;3887:37:8;;;;;;3942:5;;3845:117;3828:3;;;;;3788:174;;;3971:6;:18;;-1:-1:-1;;3971:18:8;;;;;;:::i;:::-;-1:-1:-1;4014:6:8;:13;4003:8;;:24;3999:74;;;4059:6;:13;4041:32;;:17;:32::i;:::-;4083:19;;-1:-1:-1;;;;;4083:19:8;;;;;;;;1370:1;3657:452;;:::o;6167:275::-;6242:10;1538:14;;;;:7;:14;;;;;;;;1530:23;;;;;;;;1783:28;;;;:13;:28;;;;;;;;6283:10;1783:35;;;;;;;;;6268:13;;6283:10;1783:35;;1775:44;;;;;;;;2039:12;:27;;;;;;;;;;:36;;;6311:13;;2039:36;;2038:37;2030:46;;;;;;6383:5;6340:28;;;:13;:28;;;;;;;;6369:10;6340:40;;;;;;;;:48;;-1:-1:-1;;6340:48:8;;;6398:37;6354:13;;6398:37;;;1829:1;1563;;6167:275;;:::o;1000:39::-;;;;;;;;;;;;;;;:::o;932:62::-;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;10352:308::-;10447:10;;10473:181;10494:16;;10490:1;:20;10473:181;;;10533:7;:36;;;;-1:-1:-1;10545:12:8;:15;;;;;;;;;;:24;;;;;10544:25;10533:36;:76;;;;10573:8;:36;;;;-1:-1:-1;10585:12:8;:15;;;;;;;;;;:24;;;;;10573:36;10529:125;;;10638:1;10629:10;;;;10529:125;10512:3;;10473:181;;;10352:308;;;;;:::o;3277:257::-;1332:10;1354:4;1332:27;1324:36;;;;;;-1:-1:-1;;;;;1445:14:8;;;;;;:7;:14;;;;;;3358:5;;1445:14;;1444:15;1436:24;;;;;;3377:5;-1:-1:-1;;;;;2153:13:8;;;;2145:22;;;;;;3405:6;:13;;;;3421:1;3405:17;3424:8;;838:2;2268:10;:29;;:56;;;;;2314:10;2301:9;:23;;2268:56;:74;;;;-1:-1:-1;2328:14:8;;;2268:74;:93;;;;-1:-1:-1;2346:15:8;;;2268:93;2260:102;;;;;;;;-1:-1:-1;;;;;3448:14:8;;;;;;:7;:14;;;;;;:21;;-1:-1:-1;;3448:21:8;3465:4;3448:21;;;;;;3479:6;27:10:-1;;23:18;;;45:23;;3479:18:8;;;;;;-1:-1:-1;;3479:18:8;;;;;3507:20;;;3448:14;3507:20;2177:1;;1470;1370;3277:257;:::o;8524:329::-;8602:4;;;8646:201;8667:6;:13;8663:17;;8646:201;;;8705:28;;;;:13;:28;;;;;8734:6;:9;;8705:28;;;8741:1;;8734:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;8734:9:8;8705:39;;;;;;;;;;;;;;;8701:71;;;8771:1;8762:10;;;;8701:71;8799:8;;8790:5;:17;8786:50;;;8832:4;8825:11;;;;8786:50;8682:3;;8646:201;;;8524:329;;;;;:::o;9830:260::-;9917:10;;9943:141;9964:6;:13;9960:17;;9943:141;;;10000:28;;;;:13;:28;;;;;10029:6;:9;;10000:28;;;10036:1;;10029:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;10029:9:8;10000:39;;;;;;;;;;;;;;;9996:88;;;10068:1;10059:10;;;;9996:88;9979:3;;9943:141;;;9830:260;;;;:::o;878:48::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;878:48:8;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;878:48:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;878:48:8;;;;;;;-1:-1:-1;;878:48:8;;;:::o;10744:103::-;10802:9;10834:6;10827:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;10827:13:8;;;;;;;;;;;;;;;;;;;;;;;10744:103;;:::o;11946:665::-;12059:22;12097:32;12170:10;12194:6;12143:16;;12132:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;12132:28:8;;12097:63;;12183:1;12170:14;;12219:1;12215:5;;12210:247;12226:16;;12222:1;:20;12210:247;;;12265:7;:36;;;;-1:-1:-1;12277:12:8;:15;;;;;;;;;;:24;;;;;12276:25;12265:36;:88;;;;12317:8;:36;;;;-1:-1:-1;12329:12:8;:15;;;;;;;;;;:24;;;;;12317:36;12261:196;;;12413:1;12385:18;12404:5;12385:25;;;;;;;;;;;;;;;;;;:29;12441:1;12432:10;;;;;12261:196;12244:3;;12210:247;;;12500:4;12495:2;:9;12484:21;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;12484:21:8;;12466:39;;12524:4;12520:8;;12515:89;12534:2;12530:1;:6;12515:89;;;12583:18;12602:1;12583:21;;;;;;;;;;;;;;;;;;12555:15;12575:4;12571:1;:8;12555:25;;;;;;;;;;;;;;;;;;:49;12538:3;;12515:89;;;11946:665;;;;;;;;;:::o;11026:571::-;11109:24;11149:34;11224:10;11248:6;11200;:13;;;;11186:28;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;11186:28:8;;11149:65;;11237:1;11224:14;;11273:1;11269:5;;11264:190;11280:6;:13;11276:17;;11264:190;;;11316:28;;;;:13;:28;;;;;11345:6;:9;;11316:28;;;11352:1;;11345:9;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;11345:9:8;11316:39;;;;;;;;;;;;;;;11312:142;;;11402:6;:9;;11409:1;;11402:9;;;;;;;;;;;;;;;;11375:24;;-1:-1:-1;;;;;11402:9:8;;;;11375:17;;11393:5;;11375:24;;;;;;-1:-1:-1;;;;;11375:36:8;;;:24;;;;;;;;;;:36;11438:1;11429:10;;;;;11312:142;11295:3;;11264:190;;;11494:5;11480:20;;;;;;;;;;;;;;;;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;11480:20:8;;11463:37;;11519:1;11515:5;;11510:80;11526:5;11522:1;:9;11510:80;;;11570:17;11588:1;11570:20;;;;;;;;;;;;;;;;;;11550:14;11565:1;11550:17;;;;;;;;;;-1:-1:-1;;;;;11550:40:8;;;:17;;;;;;;;;;:40;11533:3;;11510:80;;;11026:571;;;;;;:::o;1100:28::-;;;;:::o;4919:195::-;1332:10;1354:4;1332:27;1324:36;;;;;;5009:6;:13;5024:9;838:2;2268:29;;;;;:56;;;2314:10;2301:9;:23;;2268:56;:74;;;;-1:-1:-1;2328:14:8;;;2268:74;:93;;;;-1:-1:-1;2346:15:8;;;2268:93;2260:102;;;;;;;;5049:8;:20;;;5079:28;;;;;;;;;;;;;;;;;1370:1;;4919:195;:::o;5715:328::-;5790:10;1538:14;;;;:7;:14;;;;;;;;1530:23;;;;;;;;1642:12;:27;;;;;;;;;;:39;5824:13;;-1:-1:-1;;;;;1642:39:8;:44;;1634:53;;;;;;1919:28;;;;:13;:28;;;;;;;;5871:10;1919:35;;;;;;;;;5856:13;;5871:10;1919:35;;1918:36;1910:45;;;;;;5897:28;;;;5940:4;5897:28;;;;;;;;5926:10;5897:40;;;;;;;;:47;;-1:-1:-1;;5897:47:8;;;;;;;5954:39;;5911:13;;5954:39;;;6003:33;6022:13;6003:18;:33::i;:::-;1697:1;;1563;5715:328;;:::o;5373:236::-;5469:18;5519:40;5534:11;5547:5;5554:4;5519:14;:40::i;:::-;5503:56;;5569:33;5588:13;5569:18;:33::i;:::-;5373:236;;;;;:::o;799:41::-;838:2;799:41;:::o;1074:20::-;;;;:::o;4311:437::-;4466:6;1332:10;1354:4;1332:27;1324:36;;;;;;-1:-1:-1;;;;;1538:14:8;;;;;;:7;:14;;;;;;4408:5;;1538:14;;1530:23;;;;;;;;-1:-1:-1;;;;;1445:14:8;;;;;;:7;:14;;;;;;4437:8;;1445:14;;1444:15;1436:24;;;;;;4475:1;4466:10;;4461:153;4482:6;:13;4478:17;;4461:153;;;4531:5;-1:-1:-1;;;;;4518:18:8;:6;4525:1;4518:9;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;4518:9:8;:18;4514:100;;;4568:8;4556:6;4563:1;4556:9;;;;;;;;;;;;;;;;;;:20;;;;;-1:-1:-1;;;;;4556:20:8;;;;;-1:-1:-1;;;;;4556:20:8;;;;;;4594:5;;4514:100;4497:3;;;;;4461:153;;;-1:-1:-1;;;;;4623:14:8;;;4640:5;4623:14;;;:7;:14;;;;;;:22;;-1:-1:-1;;4623:22:8;;;;;;4655:17;;;;;;;;:24;;;;;4623:22;4655:24;;;;4689:19;;4623:14;;4689:19;;;4718:23;;-1:-1:-1;;;;;4718:23:8;;;;;;;;1563:1;1370;4311:437;;;:::o;6556:570::-;6631:10;6775:23;1538:14;;;:7;:14;;;;;;6775:23;;6631:10;1538:14;;1530:23;;;;;;;;1783:28;;;;:13;:28;;;;;;;;6672:10;1783:35;;;;;;;;;6657:13;;6672:10;1783:35;;1775:44;;;;;;;;2039:12;:27;;;;;;;;;;:36;;;6700:13;;2039:36;;2038:37;2030:46;;;;;;6733:26;6745:13;6733:11;:26::i;:::-;6729:391;;;6801:12;:27;;;;;;;;;;;;6842:12;;;:19;;-1:-1:-1;;6842:19:8;6857:4;6842:19;;;;;;6893:15;;6910:9;;;;6921:8;;;;:15;;6879:68;;;-1:-1:-1;;6921:15:8;;;;6842:19;6921:15;;;;;;;;;;;;6879:68;;;;;;;;;;;;;;;;;;6801:27;;-1:-1:-1;6879:68:8;;-1:-1:-1;;;;;6893:15:8;;;;6910:9;;6879:68;6921:8;:15;;6879:68;;6921:8;:15;6879:68;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:13;:68::i;:::-;6875:235;;;6965:24;;6975:13;;6965:24;;;;;6875:235;;;7026:31;;7043:13;;7026:31;;;;;7075:12;;;:20;;-1:-1:-1;;7075:20:8;;;6875:235;1829:1;1563;;6556:570;;;:::o;9186:447::-;9306:18;9280:11;-1:-1:-1;;;;;2153:13:8;;;;2145:22;;;;;;9356:16;;9412:148;;;;;;;;-1:-1:-1;;;;;9412:148:8;;;;;;;;;;;;;;;;;;-1:-1:-1;9412:148:8;;;;;;9382:27;;;;;;;;;;:178;;;;-1:-1:-1;;9382:178:8;;;;;;;;;;-1:-1:-1;9382:178:8;;;;;;;9356:16;;-1:-1:-1;9412:148:8;;9382:27;;:178;;;;;;;;;;:::i;:::-;-1:-1:-1;9382:178:8;;;;;;;;;;;;-1:-1:-1;;9382:178:8;;;;;;;;;;9570:16;:21;;-1:-1:-1;9570:21:8;;;9601:25;;9612:13;;9601:25;;-1:-1:-1;;9601:25:8;9186:447;;;;;;:::o;7303:1070::-;7405:4;7421:11;7531:4;7525:11;7664:2;7658:4;7654:13;8246:1;8231;8134:10;8119:1;8100:5;8075:11;7782:5;7777:3;7773:15;7755:579;7745:589;7303:1070;-1:-1:-1;;;;;;;;7303:1070:8:o;205:12408::-;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;205:12408:8;;;-1:-1:-1;205:12408:8;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;",
+  "source": "pragma solidity ^0.4.15;\n\n// solium-disable\n\n/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.\n/// @author Stefan George - <stefan.george@consensys.net>\ncontract MultiSigWallet {\n\n    /*\n     *  Events\n     */\n    event Confirmation(address indexed sender, uint indexed transactionId);\n    event Revocation(address indexed sender, uint indexed transactionId);\n    event Submission(uint indexed transactionId);\n    event Execution(uint indexed transactionId);\n    event ExecutionFailure(uint indexed transactionId);\n    event Deposit(address indexed sender, uint value);\n    event OwnerAddition(address indexed owner);\n    event OwnerRemoval(address indexed owner);\n    event RequirementChange(uint required);\n\n    /*\n     *  Constants\n     */\n    uint constant public MAX_OWNER_COUNT = 50;\n\n    /*\n     *  Storage\n     */\n    mapping(uint => Transaction) public transactions;\n    mapping(uint => mapping(address => bool)) public confirmations;\n    mapping(address => bool) public isOwner;\n    address[] public owners;\n    uint public required;\n    uint public transactionCount;\n\n    struct Transaction {\n        address destination;\n        uint value;\n        bytes data;\n        bool executed;\n    }\n\n    /*\n     *  Modifiers\n     */\n    modifier onlyWallet() {\n        require(msg.sender == address(this));\n        _;\n    }\n\n    modifier ownerDoesNotExist(address owner) {\n        require(!isOwner[owner]);\n        _;\n    }\n\n    modifier ownerExists(address owner) {\n        require(isOwner[owner]);\n        _;\n    }\n\n    modifier transactionExists(uint transactionId) {\n        require(transactions[transactionId].destination != 0);\n        _;\n    }\n\n    modifier confirmed(uint transactionId, address owner) {\n        require(confirmations[transactionId][owner]);\n        _;\n    }\n\n    modifier notConfirmed(uint transactionId, address owner) {\n        require(!confirmations[transactionId][owner]);\n        _;\n    }\n\n    modifier notExecuted(uint transactionId) {\n        require(!transactions[transactionId].executed);\n        _;\n    }\n\n    modifier notNull(address _address) {\n        require(_address != 0);\n        _;\n    }\n\n    modifier validRequirement(uint ownerCount, uint _required) {\n        require(ownerCount <= MAX_OWNER_COUNT && _required <= ownerCount && _required != 0 && ownerCount != 0);\n        _;\n    }\n\n    /// @dev Fallback function allows to deposit ether.\n    function()\n    payable\n    public\n    {\n        if (msg.value > 0)\n            Deposit(msg.sender, msg.value);\n    }\n\n    /*\n     * Public functions\n     */\n    /// @dev Contract constructor sets initial owners and required number of confirmations.\n    /// @param _owners List of initial owners.\n    /// @param _required Number of required confirmations.\n    function MultiSigWallet(address[] _owners, uint _required)\n    public\n    validRequirement(_owners.length, _required)\n    {\n        for (uint i = 0; i < _owners.length; i++) {\n            require(!isOwner[_owners[i]] && _owners[i] != 0);\n            isOwner[_owners[i]] = true;\n        }\n        owners = _owners;\n        required = _required;\n    }\n\n    /// @dev Allows to add a new owner. Transaction has to be sent by wallet.\n    /// @param owner Address of new owner.\n    function addOwner(address owner)\n    public\n    onlyWallet\n    ownerDoesNotExist(owner)\n    notNull(owner)\n    validRequirement(owners.length + 1, required)\n    {\n        isOwner[owner] = true;\n        owners.push(owner);\n        OwnerAddition(owner);\n    }\n\n    /// @dev Allows to remove an owner. Transaction has to be sent by wallet.\n    /// @param owner Address of owner.\n    function removeOwner(address owner)\n    public\n    onlyWallet\n    ownerExists(owner)\n    {\n        isOwner[owner] = false;\n        for (uint i = 0; i < owners.length - 1; i++)\n            if (owners[i] == owner) {\n                owners[i] = owners[owners.length - 1];\n                break;\n            }\n        owners.length -= 1;\n        if (required > owners.length)\n            changeRequirement(owners.length);\n        OwnerRemoval(owner);\n    }\n\n    /// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.\n    /// @param owner Address of owner to be replaced.\n    /// @param newOwner Address of new owner.\n    function replaceOwner(address owner, address newOwner)\n    public\n    onlyWallet\n    ownerExists(owner)\n    ownerDoesNotExist(newOwner)\n    {\n        for (uint i = 0; i < owners.length; i++)\n            if (owners[i] == owner) {\n                owners[i] = newOwner;\n                break;\n            }\n        isOwner[owner] = false;\n        isOwner[newOwner] = true;\n        OwnerRemoval(owner);\n        OwnerAddition(newOwner);\n    }\n\n    /// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.\n    /// @param _required Number of required confirmations.\n    function changeRequirement(uint _required)\n    public\n    onlyWallet\n    validRequirement(owners.length, _required)\n    {\n        required = _required;\n        RequirementChange(_required);\n    }\n\n    /// @dev Allows an owner to submit and confirm a transaction.\n    /// @param destination Transaction target address.\n    /// @param value Transaction ether value.\n    /// @param data Transaction data payload.\n    /// @return Returns transaction ID.\n    function submitTransaction(address destination, uint value, bytes data)\n    public\n    returns (uint transactionId)\n    {\n        transactionId = addTransaction(destination, value, data);\n        confirmTransaction(transactionId);\n    }\n\n    /// @dev Allows an owner to confirm a transaction.\n    /// @param transactionId Transaction ID.\n    function confirmTransaction(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    transactionExists(transactionId)\n    notConfirmed(transactionId, msg.sender)\n    {\n        confirmations[transactionId][msg.sender] = true;\n        Confirmation(msg.sender, transactionId);\n        executeTransaction(transactionId);\n    }\n\n    /// @dev Allows an owner to revoke a confirmation for a transaction.\n    /// @param transactionId Transaction ID.\n    function revokeConfirmation(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    confirmed(transactionId, msg.sender)\n    notExecuted(transactionId)\n    {\n        confirmations[transactionId][msg.sender] = false;\n        Revocation(msg.sender, transactionId);\n    }\n\n    /// @dev Allows anyone to execute a confirmed transaction.\n    /// @param transactionId Transaction ID.\n    function executeTransaction(uint transactionId)\n    public\n    ownerExists(msg.sender)\n    confirmed(transactionId, msg.sender)\n    notExecuted(transactionId)\n    {\n        if (isConfirmed(transactionId)) {\n            Transaction storage txn = transactions[transactionId];\n            txn.executed = true;\n            if (external_call(txn.destination, txn.value, txn.data.length, txn.data))\n                Execution(transactionId);\n            else {\n                ExecutionFailure(transactionId);\n                txn.executed = false;\n            }\n        }\n    }\n\n    // call has been separated into its own function in order to take advantage\n    // of the Solidity's code generator to produce a loop that copies tx.data into memory.\n    function external_call(address destination, uint value, uint dataLength, bytes data) private returns (bool) {\n        bool result;\n        assembly { // solium-disable-line security/no-inline-assembly\n            let x := mload(0x40)   // \"Allocate\" memory for output (0x40 is where \"free memory\" pointer is stored by convention)\n            let d := add(data, 32) // First 32 bytes are the padded length of data, so exclude that\n            result := call(\n            sub(gas, 34710), // 34710 is the value that solidity is currently emitting\n            // It includes callGas (700) + callVeryLow (3, to pay for SUB) + callValueTransferGas (9000) +\n            // callNewAccountGas (25000, in case the destination address does not exist and needs creating)\n            destination,\n            value,\n            d,\n            dataLength, // Size of the input (in bytes) - this is what fixes the padding problem\n            x,\n            0                  // Output is ignored, therefore the output size is zero\n            )\n        }\n        return result;\n    }\n\n    /// @dev Returns the confirmation status of a transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Confirmation status.\n    function isConfirmed(uint transactionId)\n    public\n    constant\n    returns (bool)\n    {\n        uint count = 0;\n        for (uint i = 0; i < owners.length; i++) {\n            if (confirmations[transactionId][owners[i]])\n                count += 1;\n            if (count == required)\n                return true;\n        }\n    }\n\n    /*\n     * Internal functions\n     */\n    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.\n    /// @param destination Transaction target address.\n    /// @param value Transaction ether value.\n    /// @param data Transaction data payload.\n    /// @return Returns transaction ID.\n    function addTransaction(address destination, uint value, bytes data)\n    internal\n    notNull(destination)\n    returns (uint transactionId)\n    {\n        transactionId = transactionCount;\n        transactions[transactionId] = Transaction({\n            destination : destination,\n            value : value,\n            data : data,\n            executed : false\n            });\n        transactionCount += 1;\n        Submission(transactionId);\n    }\n\n    /*\n     * Web3 call functions\n     */\n    /// @dev Returns number of confirmations of a transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Number of confirmations.\n    function getConfirmationCount(uint transactionId)\n    public\n    constant\n    returns (uint count)\n    {\n        for (uint i = 0; i < owners.length; i++)\n            if (confirmations[transactionId][owners[i]]) {\n                count += 1;\n            }\n    }\n\n    /// @dev Returns total number of transactions after filers are applied.\n    /// @param pending Include pending transactions.\n    /// @param executed Include executed transactions.\n    /// @return Total number of transactions after filters are applied.\n    function getTransactionCount(bool pending, bool executed)\n    public\n    constant\n    returns (uint count)\n    {\n        for (uint i = 0; i < transactionCount; i++)\n            if (pending && !transactions[i].executed || executed && transactions[i].executed) {\n                count += 1;\n            }\n    }\n\n    /// @dev Returns list of owners.\n    /// @return List of owner addresses.\n    function getOwners()\n    public\n    constant\n    returns (address[])\n    {\n        return owners;\n    }\n\n    /// @dev Returns array with owner addresses, which confirmed transaction.\n    /// @param transactionId Transaction ID.\n    /// @return Returns array of owner addresses.\n    function getConfirmations(uint transactionId)\n    public\n    constant\n    returns (address[] _confirmations)\n    {\n        address[] memory confirmationsTemp = new address[](owners.length);\n        uint count = 0;\n        uint i;\n        for (i = 0; i < owners.length; i++)\n            if (confirmations[transactionId][owners[i]]) {\n                confirmationsTemp[count] = owners[i];\n                count += 1;\n            }\n        _confirmations = new address[](count);\n        for (i = 0; i < count; i++)\n            _confirmations[i] = confirmationsTemp[i];\n    }\n\n    /// @dev Returns list of transaction IDs in defined range.\n    /// @param from Index start position of transaction array.\n    /// @param to Index end position of transaction array.\n    /// @param pending Include pending transactions.\n    /// @param executed Include executed transactions.\n    /// @return Returns array of transaction IDs.\n    function getTransactionIds(uint from, uint to, bool pending, bool executed)\n    public\n    constant\n    returns (uint[] _transactionIds)\n    {\n        uint[] memory transactionIdsTemp = new uint[](transactionCount);\n        uint count = 0;\n        uint i;\n        for (i = 0; i < transactionCount; i++)\n            if (pending && !transactions[i].executed\n            || executed && transactions[i].executed)\n            {\n                transactionIdsTemp[count] = i;\n                count += 1;\n            }\n        _transactionIds = new uint[](to - from);\n        for (i = from; i < to; i++)\n            _transactionIds[i - from] = transactionIdsTemp[i];\n    }\n}\n",
   "sourcePath": "contracts/MultiSigWallet.sol",
   "ast": {
     "absolutePath": "contracts/MultiSigWallet.sol",
     "exportedSymbols": {
       "MultiSigWallet": [
-        4851
+        9471
       ]
     },
-    "id": 4852,
+    "id": 9472,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 3846,
+        "id": 8466,
         "literals": [
           "solidity",
           "^",
@@ -558,7 +558,7 @@
           ".15"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:7"
+        "src": "0:24:8"
       },
       {
         "baseContracts": [],
@@ -566,9 +566,9 @@
         "contractKind": "contract",
         "documentation": "@title Multisignature wallet - Allows multiple parties to agree on transactions before execution.\n @author Stefan George - <stefan.george@consensys.net>",
         "fullyImplemented": true,
-        "id": 4851,
+        "id": 9471,
         "linearizedBaseContracts": [
-          4851
+          9471
         ],
         "name": "MultiSigWallet",
         "nodeType": "ContractDefinition",
@@ -576,21 +576,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3852,
+            "id": 8472,
             "name": "Confirmation",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3851,
+              "id": 8471,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3848,
+                  "id": 8468,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3852,
-                  "src": "267:22:7",
+                  "scope": 8472,
+                  "src": "285:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -598,10 +598,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3847,
+                    "id": 8467,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "267:7:7",
+                    "src": "285:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -612,12 +612,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3850,
+                  "id": 8470,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3852,
-                  "src": "291:26:7",
+                  "scope": 8472,
+                  "src": "309:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -625,10 +625,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3849,
+                    "id": 8469,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "291:4:7",
+                    "src": "309:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -638,28 +638,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "266:52:7"
+              "src": "284:52:8"
             },
-            "src": "248:71:7"
+            "src": "266:71:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3858,
+            "id": 8478,
             "name": "Revocation",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3857,
+              "id": 8477,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3854,
+                  "id": 8474,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3858,
-                  "src": "341:22:7",
+                  "scope": 8478,
+                  "src": "359:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -667,10 +667,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3853,
+                    "id": 8473,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "341:7:7",
+                    "src": "359:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -681,12 +681,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3856,
+                  "id": 8476,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3858,
-                  "src": "365:26:7",
+                  "scope": 8478,
+                  "src": "383:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -694,10 +694,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3855,
+                    "id": 8475,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "365:4:7",
+                    "src": "383:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -707,28 +707,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "340:52:7"
+              "src": "358:52:8"
             },
-            "src": "324:69:7"
+            "src": "342:69:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3862,
+            "id": 8482,
             "name": "Submission",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3861,
+              "id": 8481,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3860,
+                  "id": 8480,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3862,
-                  "src": "415:26:7",
+                  "scope": 8482,
+                  "src": "433:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -736,10 +736,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3859,
+                    "id": 8479,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "415:4:7",
+                    "src": "433:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -749,28 +749,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "414:28:7"
+              "src": "432:28:8"
             },
-            "src": "398:45:7"
+            "src": "416:45:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3866,
+            "id": 8486,
             "name": "Execution",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3865,
+              "id": 8485,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3864,
+                  "id": 8484,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3866,
-                  "src": "464:26:7",
+                  "scope": 8486,
+                  "src": "482:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -778,10 +778,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3863,
+                    "id": 8483,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "464:4:7",
+                    "src": "482:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -791,28 +791,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "463:28:7"
+              "src": "481:28:8"
             },
-            "src": "448:44:7"
+            "src": "466:44:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3870,
+            "id": 8490,
             "name": "ExecutionFailure",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3869,
+              "id": 8489,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3868,
+                  "id": 8488,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3870,
-                  "src": "520:26:7",
+                  "scope": 8490,
+                  "src": "538:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -820,10 +820,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3867,
+                    "id": 8487,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "520:4:7",
+                    "src": "538:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -833,28 +833,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "519:28:7"
+              "src": "537:28:8"
             },
-            "src": "497:51:7"
+            "src": "515:51:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3876,
+            "id": 8496,
             "name": "Deposit",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3875,
+              "id": 8495,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3872,
+                  "id": 8492,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3876,
-                  "src": "567:22:7",
+                  "scope": 8496,
+                  "src": "585:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -862,10 +862,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3871,
+                    "id": 8491,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "567:7:7",
+                    "src": "585:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -876,12 +876,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3874,
+                  "id": 8494,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3876,
-                  "src": "591:10:7",
+                  "scope": 8496,
+                  "src": "609:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -889,10 +889,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3873,
+                    "id": 8493,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "591:4:7",
+                    "src": "609:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -902,28 +902,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "566:36:7"
+              "src": "584:36:8"
             },
-            "src": "553:50:7"
+            "src": "571:50:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3880,
+            "id": 8500,
             "name": "OwnerAddition",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3879,
+              "id": 8499,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3878,
+                  "id": 8498,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3880,
-                  "src": "628:21:7",
+                  "scope": 8500,
+                  "src": "646:21:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -931,10 +931,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3877,
+                    "id": 8497,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "628:7:7",
+                    "src": "646:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -944,28 +944,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "627:23:7"
+              "src": "645:23:8"
             },
-            "src": "608:43:7"
+            "src": "626:43:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3884,
+            "id": 8504,
             "name": "OwnerRemoval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3883,
+              "id": 8503,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3882,
+                  "id": 8502,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3884,
-                  "src": "675:21:7",
+                  "scope": 8504,
+                  "src": "693:21:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -973,10 +973,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3881,
+                    "id": 8501,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "675:7:7",
+                    "src": "693:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -986,28 +986,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "674:23:7"
+              "src": "692:23:8"
             },
-            "src": "656:42:7"
+            "src": "674:42:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3888,
+            "id": 8508,
             "name": "RequirementChange",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3887,
+              "id": 8507,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3886,
+                  "id": 8506,
                   "indexed": false,
                   "name": "required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3888,
-                  "src": "727:13:7",
+                  "scope": 8508,
+                  "src": "745:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1015,10 +1015,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3885,
+                    "id": 8505,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "727:4:7",
+                    "src": "745:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1028,17 +1028,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "726:15:7"
+              "src": "744:15:8"
             },
-            "src": "703:39:7"
+            "src": "721:39:8"
           },
           {
             "constant": true,
-            "id": 3891,
+            "id": 8511,
             "name": "MAX_OWNER_COUNT",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "781:41:7",
+            "scope": 9471,
+            "src": "799:41:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1046,10 +1046,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3889,
+              "id": 8509,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "781:4:7",
+              "src": "799:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1058,14 +1058,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3530",
-              "id": 3890,
+              "id": 8510,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "820:2:7",
+              "src": "838:2:8",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_50_by_1",
@@ -1077,44 +1077,44 @@
           },
           {
             "constant": false,
-            "id": 3895,
+            "id": 8515,
             "name": "transactions",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "860:48:7",
+            "scope": 9471,
+            "src": "878:48:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
               "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction)"
             },
             "typeName": {
-              "id": 3894,
+              "id": 8514,
               "keyType": {
-                "id": 3892,
+                "id": 8512,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "868:4:7",
+                "src": "886:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "860:28:7",
+              "src": "878:28:8",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 3893,
+                "id": 8513,
                 "name": "Transaction",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 3921,
-                "src": "876:11:7",
+                "referencedDeclaration": 8541,
+                "src": "894:11:8",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                   "typeString": "struct MultiSigWallet.Transaction"
                 }
               }
@@ -1124,11 +1124,11 @@
           },
           {
             "constant": false,
-            "id": 3901,
+            "id": 8521,
             "name": "confirmations",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "914:62:7",
+            "scope": 9471,
+            "src": "932:62:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1136,46 +1136,46 @@
               "typeString": "mapping(uint256 => mapping(address => bool))"
             },
             "typeName": {
-              "id": 3900,
+              "id": 8520,
               "keyType": {
-                "id": 3896,
+                "id": 8516,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "922:4:7",
+                "src": "940:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "914:41:7",
+              "src": "932:41:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(uint256 => mapping(address => bool))"
               },
               "valueType": {
-                "id": 3899,
+                "id": 8519,
                 "keyType": {
-                  "id": 3897,
+                  "id": 8517,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "938:7:7",
+                  "src": "956:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "930:24:7",
+                "src": "948:24:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 3898,
+                  "id": 8518,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "949:4:7",
+                  "src": "967:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -1188,11 +1188,11 @@
           },
           {
             "constant": false,
-            "id": 3905,
+            "id": 8525,
             "name": "isOwner",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "982:39:7",
+            "scope": 9471,
+            "src": "1000:39:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1200,28 +1200,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 3904,
+              "id": 8524,
               "keyType": {
-                "id": 3902,
+                "id": 8522,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "990:7:7",
+                "src": "1008:7:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "982:24:7",
+              "src": "1000:24:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 3903,
+                "id": 8523,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "1001:4:7",
+                "src": "1019:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -1233,11 +1233,11 @@
           },
           {
             "constant": false,
-            "id": 3908,
+            "id": 8528,
             "name": "owners",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1027:23:7",
+            "scope": 9471,
+            "src": "1045:23:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1246,19 +1246,19 @@
             },
             "typeName": {
               "baseType": {
-                "id": 3906,
+                "id": 8526,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "1027:7:7",
+                "src": "1045:7:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
-              "id": 3907,
+              "id": 8527,
               "length": null,
               "nodeType": "ArrayTypeName",
-              "src": "1027:9:7",
+              "src": "1045:9:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                 "typeString": "address[]"
@@ -1269,11 +1269,11 @@
           },
           {
             "constant": false,
-            "id": 3910,
+            "id": 8530,
             "name": "required",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1056:20:7",
+            "scope": 9471,
+            "src": "1074:20:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1281,10 +1281,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3909,
+              "id": 8529,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "1056:4:7",
+              "src": "1074:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1295,11 +1295,11 @@
           },
           {
             "constant": false,
-            "id": 3912,
+            "id": 8532,
             "name": "transactionCount",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1082:28:7",
+            "scope": 9471,
+            "src": "1100:28:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1307,10 +1307,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3911,
+              "id": 8531,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "1082:4:7",
+              "src": "1100:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -1321,15 +1321,15 @@
           },
           {
             "canonicalName": "MultiSigWallet.Transaction",
-            "id": 3921,
+            "id": 8541,
             "members": [
               {
                 "constant": false,
-                "id": 3914,
+                "id": 8534,
                 "name": "destination",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1146:19:7",
+                "scope": 8541,
+                "src": "1164:19:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1337,10 +1337,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 3913,
+                  "id": 8533,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1146:7:7",
+                  "src": "1164:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -1351,11 +1351,11 @@
               },
               {
                 "constant": false,
-                "id": 3916,
+                "id": 8536,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1175:10:7",
+                "scope": 8541,
+                "src": "1193:10:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1363,10 +1363,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 3915,
+                  "id": 8535,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1175:4:7",
+                  "src": "1193:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -1377,11 +1377,11 @@
               },
               {
                 "constant": false,
-                "id": 3918,
+                "id": 8538,
                 "name": "data",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1195:10:7",
+                "scope": 8541,
+                "src": "1213:10:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1389,10 +1389,10 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 3917,
+                  "id": 8537,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1195:5:7",
+                  "src": "1213:5:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -1403,11 +1403,11 @@
               },
               {
                 "constant": false,
-                "id": 3920,
+                "id": 8540,
                 "name": "executed",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1215:13:7",
+                "scope": 8541,
+                "src": "1233:13:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -1415,10 +1415,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 3919,
+                  "id": 8539,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1215:4:7",
+                  "src": "1233:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -1430,15 +1430,15 @@
             ],
             "name": "Transaction",
             "nodeType": "StructDefinition",
-            "scope": 4851,
-            "src": "1117:118:7",
+            "scope": 9471,
+            "src": "1135:118:8",
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3933,
+              "id": 8553,
               "nodeType": "Block",
-              "src": "1296:64:7",
+              "src": "1314:64:8",
               "statements": [
                 {
                   "expression": {
@@ -1450,7 +1450,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3929,
+                        "id": 8549,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1459,18 +1459,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3924,
+                            "id": 8544,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1314:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "1332:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 3925,
+                          "id": 8545,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1478,7 +1478,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1314:10:7",
+                          "src": "1332:10:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1491,14 +1491,14 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3927,
+                              "id": 8547,
                               "name": "this",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7818,
-                              "src": "1336:4:7",
+                              "referencedDeclaration": 11650,
+                              "src": "1354:4:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_MultiSigWallet_$4851",
+                                "typeIdentifier": "t_contract$_MultiSigWallet_$9471",
                                 "typeString": "contract MultiSigWallet"
                               }
                             }
@@ -1506,24 +1506,24 @@
                           "expression": {
                             "argumentTypes": [
                               {
-                                "typeIdentifier": "t_contract$_MultiSigWallet_$4851",
+                                "typeIdentifier": "t_contract$_MultiSigWallet_$9471",
                                 "typeString": "contract MultiSigWallet"
                               }
                             ],
-                            "id": 3926,
+                            "id": 8546,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1328:7:7",
+                            "src": "1346:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 3928,
+                          "id": 8548,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1531,13 +1531,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1328:13:7",
+                          "src": "1346:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1314:27:7",
+                        "src": "1332:27:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1551,21 +1551,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3923,
+                      "id": 8543,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1306:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1324:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3930,
+                    "id": 8550,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1573,41 +1573,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1306:36:7",
+                    "src": "1324:36:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3931,
+                  "id": 8551,
                   "nodeType": "ExpressionStatement",
-                  "src": "1306:36:7"
+                  "src": "1324:36:8"
                 },
                 {
-                  "id": 3932,
+                  "id": 8552,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1352:1:7"
+                  "src": "1370:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3934,
+            "id": 8554,
             "name": "onlyWallet",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3922,
+              "id": 8542,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1293:2:7"
+              "src": "1311:2:8"
             },
-            "src": "1274:86:7",
+            "src": "1292:86:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3946,
+              "id": 8566,
               "nodeType": "Block",
-              "src": "1408:52:7",
+              "src": "1426:52:8",
               "statements": [
                 {
                   "expression": {
@@ -1615,7 +1615,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3942,
+                        "id": 8562,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1623,31 +1623,31 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "1426:15:7",
+                        "src": "1444:15:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3939,
+                            "id": 8559,
                             "name": "isOwner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3905,
-                            "src": "1427:7:7",
+                            "referencedDeclaration": 8525,
+                            "src": "1445:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 3941,
+                          "id": 8561,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 3940,
+                            "id": 8560,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3936,
-                            "src": "1435:5:7",
+                            "referencedDeclaration": 8556,
+                            "src": "1453:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1658,7 +1658,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1427:14:7",
+                          "src": "1445:14:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -1677,21 +1677,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3938,
+                      "id": 8558,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1418:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1436:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3943,
+                    "id": 8563,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1699,38 +1699,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1418:24:7",
+                    "src": "1436:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3944,
+                  "id": 8564,
                   "nodeType": "ExpressionStatement",
-                  "src": "1418:24:7"
+                  "src": "1436:24:8"
                 },
                 {
-                  "id": 3945,
+                  "id": 8565,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1452:1:7"
+                  "src": "1470:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3947,
+            "id": 8567,
             "name": "ownerDoesNotExist",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3937,
+              "id": 8557,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3936,
+                  "id": 8556,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3947,
-                  "src": "1393:13:7",
+                  "scope": 8567,
+                  "src": "1411:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1738,10 +1738,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3935,
+                    "id": 8555,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1393:7:7",
+                    "src": "1411:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1751,16 +1751,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1392:15:7"
+              "src": "1410:15:8"
             },
-            "src": "1366:94:7",
+            "src": "1384:94:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3958,
+              "id": 8578,
               "nodeType": "Block",
-              "src": "1502:51:7",
+              "src": "1520:51:8",
               "statements": [
                 {
                   "expression": {
@@ -1770,26 +1770,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3952,
+                          "id": 8572,
                           "name": "isOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3905,
-                          "src": "1520:7:7",
+                          "referencedDeclaration": 8525,
+                          "src": "1538:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                             "typeString": "mapping(address => bool)"
                           }
                         },
-                        "id": 3954,
+                        "id": 8574,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3953,
+                          "id": 8573,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3949,
-                          "src": "1528:5:7",
+                          "referencedDeclaration": 8569,
+                          "src": "1546:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1800,7 +1800,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1520:14:7",
+                        "src": "1538:14:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1814,21 +1814,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3951,
+                      "id": 8571,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1512:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1530:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3955,
+                    "id": 8575,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1836,38 +1836,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1512:23:7",
+                    "src": "1530:23:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3956,
+                  "id": 8576,
                   "nodeType": "ExpressionStatement",
-                  "src": "1512:23:7"
+                  "src": "1530:23:8"
                 },
                 {
-                  "id": 3957,
+                  "id": 8577,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1545:1:7"
+                  "src": "1563:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3959,
+            "id": 8579,
             "name": "ownerExists",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3950,
+              "id": 8570,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3949,
+                  "id": 8569,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3959,
-                  "src": "1487:13:7",
+                  "scope": 8579,
+                  "src": "1505:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1875,10 +1875,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3948,
+                    "id": 8568,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1487:7:7",
+                    "src": "1505:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1888,16 +1888,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1486:15:7"
+              "src": "1504:15:8"
             },
-            "src": "1466:87:7",
+            "src": "1484:87:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3973,
+              "id": 8593,
               "nodeType": "Block",
-              "src": "1606:81:7",
+              "src": "1624:81:8",
               "statements": [
                 {
                   "expression": {
@@ -1909,7 +1909,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3969,
+                        "id": 8589,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1920,26 +1920,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3964,
+                              "id": 8584,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "1624:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "1642:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 3966,
+                            "id": 8586,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3965,
+                              "id": 8585,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3961,
-                              "src": "1637:13:7",
+                              "referencedDeclaration": 8581,
+                              "src": "1655:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -1950,21 +1950,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1624:27:7",
+                            "src": "1642:27:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 3967,
+                          "id": 8587,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "destination",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3914,
-                          "src": "1624:39:7",
+                          "referencedDeclaration": 8534,
+                          "src": "1642:39:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1975,14 +1975,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3968,
+                          "id": 8588,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1667:1:7",
+                          "src": "1685:1:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1990,7 +1990,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1624:44:7",
+                        "src": "1642:44:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2004,21 +2004,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3963,
+                      "id": 8583,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1616:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1634:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3970,
+                    "id": 8590,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2026,38 +2026,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1616:53:7",
+                    "src": "1634:53:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3971,
+                  "id": 8591,
                   "nodeType": "ExpressionStatement",
-                  "src": "1616:53:7"
+                  "src": "1634:53:8"
                 },
                 {
-                  "id": 3972,
+                  "id": 8592,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1679:1:7"
+                  "src": "1697:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3974,
+            "id": 8594,
             "name": "transactionExists",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3962,
+              "id": 8582,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3961,
+                  "id": 8581,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3974,
-                  "src": "1586:18:7",
+                  "scope": 8594,
+                  "src": "1604:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2065,10 +2065,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3960,
+                    "id": 8580,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1586:4:7",
+                    "src": "1604:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2078,16 +2078,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1585:20:7"
+              "src": "1603:20:8"
             },
-            "src": "1559:128:7",
+            "src": "1577:128:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3989,
+              "id": 8609,
               "nodeType": "Block",
-              "src": "1747:72:7",
+              "src": "1765:72:8",
               "statements": [
                 {
                   "expression": {
@@ -2099,26 +2099,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3981,
+                            "id": 8601,
                             "name": "confirmations",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3901,
-                            "src": "1765:13:7",
+                            "referencedDeclaration": 8521,
+                            "src": "1783:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                               "typeString": "mapping(uint256 => mapping(address => bool))"
                             }
                           },
-                          "id": 3983,
+                          "id": 8603,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 3982,
+                            "id": 8602,
                             "name": "transactionId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3976,
-                            "src": "1779:13:7",
+                            "referencedDeclaration": 8596,
+                            "src": "1797:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -2129,21 +2129,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1765:28:7",
+                          "src": "1783:28:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                             "typeString": "mapping(address => bool)"
                           }
                         },
-                        "id": 3985,
+                        "id": 8605,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3984,
+                          "id": 8604,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3978,
-                          "src": "1794:5:7",
+                          "referencedDeclaration": 8598,
+                          "src": "1812:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2154,7 +2154,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1765:35:7",
+                        "src": "1783:35:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2168,21 +2168,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3980,
+                      "id": 8600,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1757:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1775:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3986,
+                    "id": 8606,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2190,38 +2190,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1757:44:7",
+                    "src": "1775:44:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3987,
+                  "id": 8607,
                   "nodeType": "ExpressionStatement",
-                  "src": "1757:44:7"
+                  "src": "1775:44:8"
                 },
                 {
-                  "id": 3988,
+                  "id": 8608,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1811:1:7"
+                  "src": "1829:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3990,
+            "id": 8610,
             "name": "confirmed",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3979,
+              "id": 8599,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3976,
+                  "id": 8596,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3990,
-                  "src": "1712:18:7",
+                  "scope": 8610,
+                  "src": "1730:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2229,10 +2229,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3975,
+                    "id": 8595,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1712:4:7",
+                    "src": "1730:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2243,11 +2243,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3978,
+                  "id": 8598,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3990,
-                  "src": "1732:13:7",
+                  "scope": 8610,
+                  "src": "1750:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2255,10 +2255,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3977,
+                    "id": 8597,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1732:7:7",
+                    "src": "1750:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2268,16 +2268,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1711:35:7"
+              "src": "1729:35:8"
             },
-            "src": "1693:126:7",
+            "src": "1711:126:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4006,
+              "id": 8626,
               "nodeType": "Block",
-              "src": "1882:73:7",
+              "src": "1900:73:8",
               "statements": [
                 {
                   "expression": {
@@ -2285,7 +2285,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4002,
+                        "id": 8622,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2293,33 +2293,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "1900:36:7",
+                        "src": "1918:36:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3997,
+                              "id": 8617,
                               "name": "confirmations",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3901,
-                              "src": "1901:13:7",
+                              "referencedDeclaration": 8521,
+                              "src": "1919:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(uint256 => mapping(address => bool))"
                               }
                             },
-                            "id": 3999,
+                            "id": 8619,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3998,
+                              "id": 8618,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3992,
-                              "src": "1915:13:7",
+                              "referencedDeclaration": 8612,
+                              "src": "1933:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2330,21 +2330,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1901:28:7",
+                            "src": "1919:28:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4001,
+                          "id": 8621,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4000,
+                            "id": 8620,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3994,
-                            "src": "1930:5:7",
+                            "referencedDeclaration": 8614,
+                            "src": "1948:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2355,7 +2355,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1901:35:7",
+                          "src": "1919:35:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2374,21 +2374,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3996,
+                      "id": 8616,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1892:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1910:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4003,
+                    "id": 8623,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2396,38 +2396,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1892:45:7",
+                    "src": "1910:45:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4004,
+                  "id": 8624,
                   "nodeType": "ExpressionStatement",
-                  "src": "1892:45:7"
+                  "src": "1910:45:8"
                 },
                 {
-                  "id": 4005,
+                  "id": 8625,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1947:1:7"
+                  "src": "1965:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4007,
+            "id": 8627,
             "name": "notConfirmed",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3995,
+              "id": 8615,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3992,
+                  "id": 8612,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4007,
-                  "src": "1847:18:7",
+                  "scope": 8627,
+                  "src": "1865:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2435,10 +2435,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3991,
+                    "id": 8611,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1847:4:7",
+                    "src": "1865:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2449,11 +2449,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3994,
+                  "id": 8614,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4007,
-                  "src": "1867:13:7",
+                  "scope": 8627,
+                  "src": "1885:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2461,10 +2461,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3993,
+                    "id": 8613,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1867:7:7",
+                    "src": "1885:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2474,16 +2474,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1846:35:7"
+              "src": "1864:35:8"
             },
-            "src": "1825:130:7",
+            "src": "1843:130:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4020,
+              "id": 8640,
               "nodeType": "Block",
-              "src": "2002:74:7",
+              "src": "2020:74:8",
               "statements": [
                 {
                   "expression": {
@@ -2491,7 +2491,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4016,
+                        "id": 8636,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2499,33 +2499,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2020:37:7",
+                        "src": "2038:37:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4012,
+                              "id": 8632,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "2021:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "2039:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4014,
+                            "id": 8634,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4013,
+                              "id": 8633,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4009,
-                              "src": "2034:13:7",
+                              "referencedDeclaration": 8629,
+                              "src": "2052:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2536,21 +2536,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2021:27:7",
+                            "src": "2039:27:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4015,
+                          "id": 8635,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "2021:36:7",
+                          "referencedDeclaration": 8540,
+                          "src": "2039:36:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -2569,21 +2569,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4011,
+                      "id": 8631,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2012:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2030:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4017,
+                    "id": 8637,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2591,38 +2591,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2012:46:7",
+                    "src": "2030:46:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4018,
+                  "id": 8638,
                   "nodeType": "ExpressionStatement",
-                  "src": "2012:46:7"
+                  "src": "2030:46:8"
                 },
                 {
-                  "id": 4019,
+                  "id": 8639,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2068:1:7"
+                  "src": "2086:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4021,
+            "id": 8641,
             "name": "notExecuted",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4010,
+              "id": 8630,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4009,
+                  "id": 8629,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4021,
-                  "src": "1982:18:7",
+                  "scope": 8641,
+                  "src": "2000:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2630,10 +2630,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4008,
+                    "id": 8628,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1982:4:7",
+                    "src": "2000:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2643,16 +2643,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1981:20:7"
+              "src": "1999:20:8"
             },
-            "src": "1961:115:7",
+            "src": "1979:115:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4032,
+              "id": 8652,
               "nodeType": "Block",
-              "src": "2117:50:7",
+              "src": "2135:50:8",
               "statements": [
                 {
                   "expression": {
@@ -2664,19 +2664,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 4028,
+                        "id": 8648,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4026,
+                          "id": 8646,
                           "name": "_address",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4023,
-                          "src": "2135:8:7",
+                          "referencedDeclaration": 8643,
+                          "src": "2153:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2687,14 +2687,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 4027,
+                          "id": 8647,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2147:1:7",
+                          "src": "2165:1:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -2702,7 +2702,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2135:13:7",
+                        "src": "2153:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2716,21 +2716,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4025,
+                      "id": 8645,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2127:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2145:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4029,
+                    "id": 8649,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2738,38 +2738,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2127:22:7",
+                    "src": "2145:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4030,
+                  "id": 8650,
                   "nodeType": "ExpressionStatement",
-                  "src": "2127:22:7"
+                  "src": "2145:22:8"
                 },
                 {
-                  "id": 4031,
+                  "id": 8651,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2159:1:7"
+                  "src": "2177:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4033,
+            "id": 8653,
             "name": "notNull",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4024,
+              "id": 8644,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4023,
+                  "id": 8643,
                   "name": "_address",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4033,
-                  "src": "2099:16:7",
+                  "scope": 8653,
+                  "src": "2117:16:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2777,10 +2777,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4022,
+                    "id": 8642,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2099:7:7",
+                    "src": "2117:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2790,16 +2790,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2098:18:7"
+              "src": "2116:18:8"
             },
-            "src": "2082:85:7",
+            "src": "2100:85:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4058,
+              "id": 8678,
               "nodeType": "Block",
-              "src": "2232:130:7",
+              "src": "2250:130:8",
               "statements": [
                 {
                   "expression": {
@@ -2811,7 +2811,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4054,
+                        "id": 8674,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2822,7 +2822,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4050,
+                          "id": 8670,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2833,7 +2833,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 4046,
+                            "id": 8666,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2844,19 +2844,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 4042,
+                              "id": 8662,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4040,
+                                "id": 8660,
                                 "name": "ownerCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4035,
-                                "src": "2250:10:7",
+                                "referencedDeclaration": 8655,
+                                "src": "2268:10:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -2866,18 +2866,18 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 4041,
+                                "id": 8661,
                                 "name": "MAX_OWNER_COUNT",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3891,
-                                "src": "2264:15:7",
+                                "referencedDeclaration": 8511,
+                                "src": "2282:15:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "2250:29:7",
+                              "src": "2268:29:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -2891,19 +2891,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 4045,
+                              "id": 8665,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4043,
+                                "id": 8663,
                                 "name": "_required",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4037,
-                                "src": "2283:9:7",
+                                "referencedDeclaration": 8657,
+                                "src": "2301:9:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -2913,24 +2913,24 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 4044,
+                                "id": 8664,
                                 "name": "ownerCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4035,
-                                "src": "2296:10:7",
+                                "referencedDeclaration": 8655,
+                                "src": "2314:10:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "2283:23:7",
+                              "src": "2301:23:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "2250:56:7",
+                            "src": "2268:56:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -2944,19 +2944,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 4049,
+                            "id": 8669,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 4047,
+                              "id": 8667,
                               "name": "_required",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4037,
-                              "src": "2310:9:7",
+                              "referencedDeclaration": 8657,
+                              "src": "2328:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2967,14 +2967,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 4048,
+                              "id": 8668,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "2323:1:7",
+                              "src": "2341:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -2982,13 +2982,13 @@
                               },
                               "value": "0"
                             },
-                            "src": "2310:14:7",
+                            "src": "2328:14:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "2250:74:7",
+                          "src": "2268:74:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -3002,19 +3002,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4053,
+                          "id": 8673,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4051,
+                            "id": 8671,
                             "name": "ownerCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4035,
-                            "src": "2328:10:7",
+                            "referencedDeclaration": 8655,
+                            "src": "2346:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3025,14 +3025,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 4052,
+                            "id": 8672,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "2342:1:7",
+                            "src": "2360:1:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -3040,13 +3040,13 @@
                             },
                             "value": "0"
                           },
-                          "src": "2328:15:7",
+                          "src": "2346:15:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "2250:93:7",
+                        "src": "2268:93:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3060,21 +3060,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4039,
+                      "id": 8659,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2242:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2260:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4055,
+                    "id": 8675,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3082,38 +3082,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2242:102:7",
+                    "src": "2260:102:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4056,
+                  "id": 8676,
                   "nodeType": "ExpressionStatement",
-                  "src": "2242:102:7"
+                  "src": "2260:102:8"
                 },
                 {
-                  "id": 4057,
+                  "id": 8677,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2354:1:7"
+                  "src": "2372:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4059,
+            "id": 8679,
             "name": "validRequirement",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4038,
+              "id": 8658,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4035,
+                  "id": 8655,
                   "name": "ownerCount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4059,
-                  "src": "2199:15:7",
+                  "scope": 8679,
+                  "src": "2217:15:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3121,10 +3121,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4034,
+                    "id": 8654,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2199:4:7",
+                    "src": "2217:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3135,11 +3135,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4037,
+                  "id": 8657,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4059,
-                  "src": "2216:14:7",
+                  "scope": 8679,
+                  "src": "2234:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3147,10 +3147,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4036,
+                    "id": 8656,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2216:4:7",
+                    "src": "2234:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3160,16 +3160,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2198:33:7"
+              "src": "2216:33:8"
             },
-            "src": "2173:189:7",
+            "src": "2191:189:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4074,
+              "id": 8694,
               "nodeType": "Block",
-              "src": "2462:78:7",
+              "src": "2480:78:8",
               "statements": [
                 {
                   "condition": {
@@ -3178,7 +3178,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4065,
+                    "id": 8685,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3187,18 +3187,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4062,
+                        "id": 8682,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "2476:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "2494:3:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4063,
+                      "id": 8683,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3206,7 +3206,7 @@
                       "memberName": "value",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "2476:9:7",
+                      "src": "2494:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3217,14 +3217,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4064,
+                      "id": 8684,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2488:1:7",
+                      "src": "2506:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -3232,16 +3232,16 @@
                       },
                       "value": "0"
                     },
-                    "src": "2476:13:7",
+                    "src": "2494:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4073,
+                  "id": 8693,
                   "nodeType": "IfStatement",
-                  "src": "2472:61:7",
+                  "src": "2490:61:8",
                   "trueBody": {
                     "expression": {
                       "argumentTypes": null,
@@ -3250,18 +3250,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4067,
+                            "id": 8687,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2511:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "2529:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4068,
+                          "id": 8688,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3269,7 +3269,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2511:10:7",
+                          "src": "2529:10:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3279,18 +3279,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4069,
+                            "id": 8689,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2523:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "2541:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4070,
+                          "id": 8690,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3298,7 +3298,7 @@
                           "memberName": "value",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2523:9:7",
+                          "src": "2541:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3316,18 +3316,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4066,
+                        "id": 8686,
                         "name": "Deposit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3876,
-                        "src": "2503:7:7",
+                        "referencedDeclaration": 8496,
+                        "src": "2521:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                           "typeString": "function (address,uint256)"
                         }
                       },
-                      "id": 4071,
+                      "id": 8691,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3335,21 +3335,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2503:30:7",
+                      "src": "2521:30:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 4072,
+                    "id": 8692,
                     "nodeType": "ExpressionStatement",
-                    "src": "2503:30:7"
+                    "src": "2521:30:8"
                   }
                 }
               ]
             },
             "documentation": "@dev Fallback function allows to deposit ether.",
-            "id": 4075,
+            "id": 8695,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3357,35 +3357,35 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4060,
+              "id": 8680,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2432:2:7"
+              "src": "2450:2:8"
             },
             "payable": true,
             "returnParameters": {
-              "id": 4061,
+              "id": 8681,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2462:0:7"
+              "src": "2480:0:8"
             },
-            "scope": 4851,
-            "src": "2424:116:7",
+            "scope": 9471,
+            "src": "2442:116:8",
             "stateMutability": "payable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4132,
+              "id": 8752,
               "nodeType": "Block",
-              "src": "2905:227:7",
+              "src": "2923:227:8",
               "statements": [
                 {
                   "body": {
-                    "id": 4122,
+                    "id": 8742,
                     "nodeType": "Block",
-                    "src": "2957:113:7",
+                    "src": "2975:113:8",
                     "statements": [
                       {
                         "expression": {
@@ -3397,14 +3397,14 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 4111,
+                              "id": 8731,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4105,
+                                "id": 8725,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3412,47 +3412,47 @@
                                 "nodeType": "UnaryOperation",
                                 "operator": "!",
                                 "prefix": true,
-                                "src": "2979:20:7",
+                                "src": "2997:20:8",
                                 "subExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4100,
+                                    "id": 8720,
                                     "name": "isOwner",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3905,
-                                    "src": "2980:7:7",
+                                    "referencedDeclaration": 8525,
+                                    "src": "2998:7:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                                       "typeString": "mapping(address => bool)"
                                     }
                                   },
-                                  "id": 4104,
+                                  "id": 8724,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4101,
+                                      "id": 8721,
                                       "name": "_owners",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4078,
-                                      "src": "2988:7:7",
+                                      "referencedDeclaration": 8698,
+                                      "src": "3006:7:8",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                         "typeString": "address[] memory"
                                       }
                                     },
-                                    "id": 4103,
+                                    "id": 8723,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4102,
+                                      "id": 8722,
                                       "name": "i",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4089,
-                                      "src": "2996:1:7",
+                                      "referencedDeclaration": 8709,
+                                      "src": "3014:1:8",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -3463,7 +3463,7 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "2988:10:7",
+                                    "src": "3006:10:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -3474,7 +3474,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "2980:19:7",
+                                  "src": "2998:19:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -3493,7 +3493,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4110,
+                                "id": 8730,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3502,26 +3502,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4106,
+                                    "id": 8726,
                                     "name": "_owners",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4078,
-                                    "src": "3003:7:7",
+                                    "referencedDeclaration": 8698,
+                                    "src": "3021:7:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                       "typeString": "address[] memory"
                                     }
                                   },
-                                  "id": 4108,
+                                  "id": 8728,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4107,
+                                    "id": 8727,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4089,
-                                    "src": "3011:1:7",
+                                    "referencedDeclaration": 8709,
+                                    "src": "3029:1:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -3532,7 +3532,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "3003:10:7",
+                                  "src": "3021:10:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -3543,14 +3543,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 4109,
+                                  "id": 8729,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "3017:1:7",
+                                  "src": "3035:1:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -3558,13 +3558,13 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "3003:15:7",
+                                "src": "3021:15:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "2979:39:7",
+                              "src": "2997:39:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -3578,21 +3578,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 4099,
+                            "id": 8719,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2971:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "2989:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 4112,
+                          "id": 8732,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3600,20 +3600,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2971:48:7",
+                          "src": "2989:48:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 4113,
+                        "id": 8733,
                         "nodeType": "ExpressionStatement",
-                        "src": "2971:48:7"
+                        "src": "2989:48:8"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4120,
+                          "id": 8740,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3622,42 +3622,42 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4114,
+                              "id": 8734,
                               "name": "isOwner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3905,
-                              "src": "3033:7:7",
+                              "referencedDeclaration": 8525,
+                              "src": "3051:7:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                                 "typeString": "mapping(address => bool)"
                               }
                             },
-                            "id": 4118,
+                            "id": 8738,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4115,
+                                "id": 8735,
                                 "name": "_owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4078,
-                                "src": "3041:7:7",
+                                "referencedDeclaration": 8698,
+                                "src": "3059:7:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                   "typeString": "address[] memory"
                                 }
                               },
-                              "id": 4117,
+                              "id": 8737,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4116,
+                                "id": 8736,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4089,
-                                "src": "3049:1:7",
+                                "referencedDeclaration": 8709,
+                                "src": "3067:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -3668,7 +3668,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3041:10:7",
+                              "src": "3059:10:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3679,7 +3679,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3033:19:7",
+                            "src": "3051:19:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -3690,14 +3690,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4119,
+                            "id": 8739,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3055:4:7",
+                            "src": "3073:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -3705,15 +3705,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "3033:26:7",
+                          "src": "3051:26:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4121,
+                        "id": 8741,
                         "nodeType": "ExpressionStatement",
-                        "src": "3033:26:7"
+                        "src": "3051:26:8"
                       }
                     ]
                   },
@@ -3723,19 +3723,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4095,
+                    "id": 8715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4092,
+                      "id": 8712,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4089,
-                      "src": "2932:1:7",
+                      "referencedDeclaration": 8709,
+                      "src": "2950:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3747,18 +3747,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4093,
+                        "id": 8713,
                         "name": "_owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4078,
-                        "src": "2936:7:7",
+                        "referencedDeclaration": 8698,
+                        "src": "2954:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                           "typeString": "address[] memory"
                         }
                       },
-                      "id": 4094,
+                      "id": 8714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3766,31 +3766,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "2936:14:7",
+                      "src": "2954:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2932:18:7",
+                    "src": "2950:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4123,
+                  "id": 8743,
                   "initializationExpression": {
                     "assignments": [
-                      4089
+                      8709
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4089,
+                        "id": 8709,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4133,
-                        "src": "2920:6:7",
+                        "scope": 8753,
+                        "src": "2938:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -3798,10 +3798,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4088,
+                          "id": 8708,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "2920:4:7",
+                          "src": "2938:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3811,18 +3811,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4091,
+                    "id": 8711,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4090,
+                      "id": 8710,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2929:1:7",
+                      "src": "2947:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -3831,12 +3831,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "2920:10:7"
+                    "src": "2938:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4097,
+                      "id": 8717,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3844,15 +3844,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "2952:3:7",
+                      "src": "2970:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4096,
+                        "id": 8716,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4089,
-                        "src": "2952:1:7",
+                        "referencedDeclaration": 8709,
+                        "src": "2970:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3863,29 +3863,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4098,
+                    "id": 8718,
                     "nodeType": "ExpressionStatement",
-                    "src": "2952:3:7"
+                    "src": "2970:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "2915:155:7"
+                  "src": "2933:155:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4126,
+                    "id": 8746,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4124,
+                      "id": 8744,
                       "name": "owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3908,
-                      "src": "3079:6:7",
+                      "referencedDeclaration": 8528,
+                      "src": "3097:6:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_storage",
                         "typeString": "address[] storage ref"
@@ -3895,43 +3895,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4125,
+                      "id": 8745,
                       "name": "_owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4078,
-                      "src": "3088:7:7",
+                      "referencedDeclaration": 8698,
+                      "src": "3106:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
                       }
                     },
-                    "src": "3079:16:7",
+                    "src": "3097:16:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                       "typeString": "address[] storage ref"
                     }
                   },
-                  "id": 4127,
+                  "id": 8747,
                   "nodeType": "ExpressionStatement",
-                  "src": "3079:16:7"
+                  "src": "3097:16:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4130,
+                    "id": 8750,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4128,
+                      "id": 8748,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "3105:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "3123:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -3941,31 +3941,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4129,
+                      "id": 8749,
                       "name": "_required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4080,
-                      "src": "3116:9:7",
+                      "referencedDeclaration": 8700,
+                      "src": "3134:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3105:20:7",
+                    "src": "3123:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4131,
+                  "id": 8751,
                   "nodeType": "ExpressionStatement",
-                  "src": "3105:20:7"
+                  "src": "3123:20:8"
                 }
               ]
             },
             "documentation": "@dev Contract constructor sets initial owners and required number of confirmations.\n @param _owners List of initial owners.\n @param _required Number of required confirmations.",
-            "id": 4133,
+            "id": 8753,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -3976,18 +3976,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4083,
+                      "id": 8703,
                       "name": "_owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4078,
-                      "src": "2874:7:7",
+                      "referencedDeclaration": 8698,
+                      "src": "2892:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
                       }
                     },
-                    "id": 4084,
+                    "id": 8704,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3995,7 +3995,7 @@
                     "memberName": "length",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "2874:14:7",
+                    "src": "2892:14:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4003,49 +4003,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4085,
+                    "id": 8705,
                     "name": "_required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4080,
-                    "src": "2890:9:7",
+                    "referencedDeclaration": 8700,
+                    "src": "2908:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4086,
+                "id": 8706,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4082,
+                  "id": 8702,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "2857:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "2875:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2857:43:7"
+                "src": "2875:43:8"
               }
             ],
             "name": "MultiSigWallet",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4081,
+              "id": 8701,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4078,
+                  "id": 8698,
                   "name": "_owners",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4133,
-                  "src": "2807:17:7",
+                  "scope": 8753,
+                  "src": "2825:17:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4054,19 +4054,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4076,
+                      "id": 8696,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "2807:7:7",
+                      "src": "2825:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4077,
+                    "id": 8697,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "2807:9:7",
+                    "src": "2825:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -4077,11 +4077,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4080,
+                  "id": 8700,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4133,
-                  "src": "2826:14:7",
+                  "scope": 8753,
+                  "src": "2844:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4089,10 +4089,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4079,
+                    "id": 8699,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2826:4:7",
+                    "src": "2844:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4102,31 +4102,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2806:35:7"
+              "src": "2824:35:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4087,
+              "id": 8707,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2905:0:7"
+              "src": "2923:0:8"
             },
-            "scope": 4851,
-            "src": "2783:349:7",
+            "scope": 9471,
+            "src": "2801:349:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4169,
+              "id": 8789,
               "nodeType": "Block",
-              "src": "3420:96:7",
+              "src": "3438:96:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4157,
+                    "id": 8777,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4135,26 +4135,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4153,
+                        "id": 8773,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "3430:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "3448:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4155,
+                      "id": 8775,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4154,
+                        "id": 8774,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3438:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3456:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4165,7 +4165,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3430:14:7",
+                      "src": "3448:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4176,14 +4176,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4156,
+                      "id": 8776,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3447:4:7",
+                      "src": "3465:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4191,15 +4191,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "3430:21:7",
+                    "src": "3448:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4158,
+                  "id": 8778,
                   "nodeType": "ExpressionStatement",
-                  "src": "3430:21:7"
+                  "src": "3448:21:8"
                 },
                 {
                   "expression": {
@@ -4207,12 +4207,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4162,
+                        "id": 8782,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3473:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3491:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4228,18 +4228,18 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4159,
+                        "id": 8779,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3461:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3479:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4161,
+                      "id": 8781,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4247,13 +4247,13 @@
                       "memberName": "push",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3461:11:7",
+                      "src": "3479:11:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$",
                         "typeString": "function (address) returns (uint256)"
                       }
                     },
-                    "id": 4163,
+                    "id": 8783,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4261,15 +4261,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3461:18:7",
+                    "src": "3479:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4164,
+                  "id": 8784,
                   "nodeType": "ExpressionStatement",
-                  "src": "3461:18:7"
+                  "src": "3479:18:8"
                 },
                 {
                   "expression": {
@@ -4277,12 +4277,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4166,
+                        "id": 8786,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3503:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3521:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4296,18 +4296,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4165,
+                      "id": 8785,
                       "name": "OwnerAddition",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3880,
-                      "src": "3489:13:7",
+                      "referencedDeclaration": 8500,
+                      "src": "3507:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4167,
+                    "id": 8787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4315,108 +4315,108 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3489:20:7",
+                    "src": "3507:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4168,
+                  "id": 8788,
                   "nodeType": "ExpressionStatement",
-                  "src": "3489:20:7"
+                  "src": "3507:20:8"
                 }
               ]
             },
             "documentation": "@dev Allows to add a new owner. Transaction has to be sent by wallet.\n @param owner Address of new owner.",
-            "id": 4170,
+            "id": 8790,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4138,
+                "id": 8758,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4137,
+                  "id": 8757,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "3307:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "3325:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3307:10:7"
+                "src": "3325:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4140,
+                    "id": 8760,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4135,
-                    "src": "3340:5:7",
+                    "referencedDeclaration": 8755,
+                    "src": "3358:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4141,
+                "id": 8761,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4139,
+                  "id": 8759,
                   "name": "ownerDoesNotExist",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3947,
-                  "src": "3322:17:7",
+                  "referencedDeclaration": 8567,
+                  "src": "3340:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3322:24:7"
+                "src": "3340:24:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4143,
+                    "id": 8763,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4135,
-                    "src": "3359:5:7",
+                    "referencedDeclaration": 8755,
+                    "src": "3377:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4144,
+                "id": 8764,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4142,
+                  "id": 8762,
                   "name": "notNull",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4033,
-                  "src": "3351:7:7",
+                  "referencedDeclaration": 8653,
+                  "src": "3369:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3351:14:7"
+                "src": "3369:14:8"
               },
               {
                 "arguments": [
@@ -4426,7 +4426,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4149,
+                    "id": 8769,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4435,18 +4435,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4146,
+                        "id": 8766,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3387:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3405:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4147,
+                      "id": 8767,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -4454,7 +4454,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3387:13:7",
+                      "src": "3405:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4465,14 +4465,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4148,
+                      "id": 8768,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3403:1:7",
+                      "src": "3421:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -4480,7 +4480,7 @@
                       },
                       "value": "1"
                     },
-                    "src": "3387:17:7",
+                    "src": "3405:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4488,49 +4488,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4150,
+                    "id": 8770,
                     "name": "required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3910,
-                    "src": "3406:8:7",
+                    "referencedDeclaration": 8530,
+                    "src": "3424:8:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4151,
+                "id": 8771,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4145,
+                  "id": 8765,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "3370:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "3388:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3370:45:7"
+                "src": "3388:45:8"
               }
             ],
             "name": "addOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4136,
+              "id": 8756,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4135,
+                  "id": 8755,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4170,
-                  "src": "3277:13:7",
+                  "scope": 8790,
+                  "src": "3295:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4538,10 +4538,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4134,
+                    "id": 8754,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3277:7:7",
+                    "src": "3295:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4551,31 +4551,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3276:15:7"
+              "src": "3294:15:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4152,
+              "id": 8772,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3420:0:7"
+              "src": "3438:0:8"
             },
-            "scope": 4851,
-            "src": "3259:257:7",
+            "scope": 9471,
+            "src": "3277:257:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4239,
+              "id": 8859,
               "nodeType": "Block",
-              "src": "3728:363:7",
+              "src": "3746:363:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4184,
+                    "id": 8804,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4584,26 +4584,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4180,
+                        "id": 8800,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "3738:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "3756:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4182,
+                      "id": 8802,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4181,
+                        "id": 8801,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "3746:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "3764:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4614,7 +4614,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3738:14:7",
+                      "src": "3756:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -4625,14 +4625,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4183,
+                      "id": 8803,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3755:5:7",
+                      "src": "3773:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -4640,15 +4640,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "3738:22:7",
+                    "src": "3756:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4185,
+                  "id": 8805,
                   "nodeType": "ExpressionStatement",
-                  "src": "3738:22:7"
+                  "src": "3756:22:8"
                 },
                 {
                   "body": {
@@ -4658,7 +4658,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4203,
+                      "id": 8823,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4667,26 +4667,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4199,
+                          "id": 8819,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "3831:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "3849:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4201,
+                        "id": 8821,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4200,
+                          "id": 8820,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4187,
-                          "src": "3838:1:7",
+                          "referencedDeclaration": 8807,
+                          "src": "3856:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4697,7 +4697,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3831:9:7",
+                        "src": "3849:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4707,36 +4707,36 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4202,
+                        "id": 8822,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "3844:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "3862:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "3831:18:7",
+                      "src": "3849:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4217,
+                    "id": 8837,
                     "nodeType": "IfStatement",
-                    "src": "3827:117:7",
+                    "src": "3845:117:8",
                     "trueBody": {
-                      "id": 4216,
+                      "id": 8836,
                       "nodeType": "Block",
-                      "src": "3851:93:7",
+                      "src": "3869:93:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4213,
+                            "id": 8833,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4745,26 +4745,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4204,
+                                "id": 8824,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "3869:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "3887:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4206,
+                              "id": 8826,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4205,
+                                "id": 8825,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4187,
-                                "src": "3876:1:7",
+                                "referencedDeclaration": 8807,
+                                "src": "3894:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -4775,7 +4775,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "3869:9:7",
+                              "src": "3887:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4787,25 +4787,25 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4207,
+                                "id": 8827,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "3881:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "3899:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4212,
+                              "id": 8832,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 4211,
+                                "id": 8831,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4814,18 +4814,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4208,
+                                    "id": 8828,
                                     "name": "owners",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3908,
-                                    "src": "3888:6:7",
+                                    "referencedDeclaration": 8528,
+                                    "src": "3906:6:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                       "typeString": "address[] storage ref"
                                     }
                                   },
-                                  "id": 4209,
+                                  "id": 8829,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
@@ -4833,7 +4833,7 @@
                                   "memberName": "length",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3888:13:7",
+                                  "src": "3906:13:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -4844,14 +4844,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 4210,
+                                  "id": 8830,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "3904:1:7",
+                                  "src": "3922:1:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -4859,7 +4859,7 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "3888:17:7",
+                                "src": "3906:17:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -4870,26 +4870,26 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3881:25:7",
+                              "src": "3899:25:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3869:37:7",
+                            "src": "3887:37:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4214,
+                          "id": 8834,
                           "nodeType": "ExpressionStatement",
-                          "src": "3869:37:7"
+                          "src": "3887:37:8"
                         },
                         {
-                          "id": 4215,
+                          "id": 8835,
                           "nodeType": "Break",
-                          "src": "3924:5:7"
+                          "src": "3942:5:8"
                         }
                       ]
                     }
@@ -4900,19 +4900,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4195,
+                    "id": 8815,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4190,
+                      "id": 8810,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4187,
-                      "src": "3787:1:7",
+                      "referencedDeclaration": 8807,
+                      "src": "3805:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4926,7 +4926,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 4194,
+                      "id": 8814,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4935,18 +4935,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4191,
+                          "id": 8811,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "3791:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "3809:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4192,
+                        "id": 8812,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
@@ -4954,7 +4954,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3791:13:7",
+                        "src": "3809:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4965,14 +4965,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 4193,
+                        "id": 8813,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "3807:1:7",
+                        "src": "3825:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -4980,31 +4980,31 @@
                         },
                         "value": "1"
                       },
-                      "src": "3791:17:7",
+                      "src": "3809:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3787:21:7",
+                    "src": "3805:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4218,
+                  "id": 8838,
                   "initializationExpression": {
                     "assignments": [
-                      4187
+                      8807
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4187,
+                        "id": 8807,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4240,
-                        "src": "3775:6:7",
+                        "scope": 8860,
+                        "src": "3793:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -5012,10 +5012,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4186,
+                          "id": 8806,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "3775:4:7",
+                          "src": "3793:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5025,18 +5025,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4189,
+                    "id": 8809,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4188,
+                      "id": 8808,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3784:1:7",
+                      "src": "3802:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -5045,12 +5045,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "3775:10:7"
+                    "src": "3793:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4197,
+                      "id": 8817,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5058,15 +5058,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "3810:3:7",
+                      "src": "3828:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4196,
+                        "id": 8816,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4187,
-                        "src": "3810:1:7",
+                        "referencedDeclaration": 8807,
+                        "src": "3828:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5077,17 +5077,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4198,
+                    "id": 8818,
                     "nodeType": "ExpressionStatement",
-                    "src": "3810:3:7"
+                    "src": "3828:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "3770:174:7"
+                  "src": "3788:174:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4223,
+                    "id": 8843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5096,18 +5096,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4219,
+                        "id": 8839,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3953:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3971:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4221,
+                      "id": 8841,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -5115,7 +5115,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3953:13:7",
+                      "src": "3971:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5126,14 +5126,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4222,
+                      "id": 8842,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3970:1:7",
+                      "src": "3988:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -5141,15 +5141,15 @@
                       },
                       "value": "1"
                     },
-                    "src": "3953:18:7",
+                    "src": "3971:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4224,
+                  "id": 8844,
                   "nodeType": "ExpressionStatement",
-                  "src": "3953:18:7"
+                  "src": "3971:18:8"
                 },
                 {
                   "condition": {
@@ -5158,19 +5158,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4228,
+                    "id": 8848,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4225,
+                      "id": 8845,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "3985:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "4003:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5182,18 +5182,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4226,
+                        "id": 8846,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3996:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "4014:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4227,
+                      "id": 8847,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -5201,22 +5201,22 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3996:13:7",
+                      "src": "4014:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3985:24:7",
+                    "src": "4003:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4234,
+                  "id": 8854,
                   "nodeType": "IfStatement",
-                  "src": "3981:74:7",
+                  "src": "3999:74:8",
                   "trueBody": {
                     "expression": {
                       "argumentTypes": null,
@@ -5225,18 +5225,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4230,
+                            "id": 8850,
                             "name": "owners",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3908,
-                            "src": "4041:6:7",
+                            "referencedDeclaration": 8528,
+                            "src": "4059:6:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_address_$dyn_storage",
                               "typeString": "address[] storage ref"
                             }
                           },
-                          "id": 4231,
+                          "id": 8851,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
@@ -5244,7 +5244,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4041:13:7",
+                          "src": "4059:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5258,18 +5258,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4229,
+                        "id": 8849,
                         "name": "changeRequirement",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4323,
-                        "src": "4023:17:7",
+                        "referencedDeclaration": 8943,
+                        "src": "4041:17:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                           "typeString": "function (uint256)"
                         }
                       },
-                      "id": 4232,
+                      "id": 8852,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5277,15 +5277,15 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4023:32:7",
+                      "src": "4041:32:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 4233,
+                    "id": 8853,
                     "nodeType": "ExpressionStatement",
-                    "src": "4023:32:7"
+                    "src": "4041:32:8"
                   }
                 },
                 {
@@ -5294,12 +5294,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4236,
+                        "id": 8856,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "4078:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "4096:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5313,18 +5313,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4235,
+                      "id": 8855,
                       "name": "OwnerRemoval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3884,
-                      "src": "4065:12:7",
+                      "referencedDeclaration": 8504,
+                      "src": "4083:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4237,
+                    "id": 8857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5332,90 +5332,90 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4065:19:7",
+                    "src": "4083:19:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4238,
+                  "id": 8858,
                   "nodeType": "ExpressionStatement",
-                  "src": "4065:19:7"
+                  "src": "4083:19:8"
                 }
               ]
             },
             "documentation": "@dev Allows to remove an owner. Transaction has to be sent by wallet.\n @param owner Address of owner.",
-            "id": 4240,
+            "id": 8860,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4175,
+                "id": 8795,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4174,
+                  "id": 8794,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "3690:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "3708:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3690:10:7"
+                "src": "3708:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4177,
+                    "id": 8797,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4172,
-                    "src": "3717:5:7",
+                    "referencedDeclaration": 8792,
+                    "src": "3735:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4178,
+                "id": 8798,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4176,
+                  "id": 8796,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "3705:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "3723:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3705:18:7"
+                "src": "3723:18:8"
               }
             ],
             "name": "removeOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4173,
+              "id": 8793,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4172,
+                  "id": 8792,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4240,
-                  "src": "3660:13:7",
+                  "scope": 8860,
+                  "src": "3678:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5423,10 +5423,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4171,
+                    "id": 8791,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3660:7:7",
+                    "src": "3678:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5436,26 +5436,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3659:15:7"
+              "src": "3677:15:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4179,
+              "id": 8799,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3728:0:7"
+              "src": "3746:0:8"
             },
-            "scope": 4851,
-            "src": "3639:452:7",
+            "scope": 9471,
+            "src": "3657:452:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4301,
+              "id": 8921,
               "nodeType": "Block",
-              "src": "4433:297:7",
+              "src": "4451:297:8",
               "statements": [
                 {
                   "body": {
@@ -5465,7 +5465,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4270,
+                      "id": 8890,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5474,26 +5474,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4266,
+                          "id": 8886,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "4500:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "4518:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4268,
+                        "id": 8888,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4267,
+                          "id": 8887,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4256,
-                          "src": "4507:1:7",
+                          "referencedDeclaration": 8876,
+                          "src": "4525:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5504,7 +5504,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4500:9:7",
+                        "src": "4518:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5514,36 +5514,36 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4269,
+                        "id": 8889,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4513:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4531:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "4500:18:7",
+                      "src": "4518:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4279,
+                    "id": 8899,
                     "nodeType": "IfStatement",
-                    "src": "4496:100:7",
+                    "src": "4514:100:8",
                     "trueBody": {
-                      "id": 4278,
+                      "id": 8898,
                       "nodeType": "Block",
-                      "src": "4520:76:7",
+                      "src": "4538:76:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4275,
+                            "id": 8895,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -5552,26 +5552,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4271,
+                                "id": 8891,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "4538:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "4556:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4273,
+                              "id": 8893,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4272,
+                                "id": 8892,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4256,
-                                "src": "4545:1:7",
+                                "referencedDeclaration": 8876,
+                                "src": "4563:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -5582,7 +5582,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "4538:9:7",
+                              "src": "4556:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -5592,31 +5592,31 @@
                             "operator": "=",
                             "rightHandSide": {
                               "argumentTypes": null,
-                              "id": 4274,
+                              "id": 8894,
                               "name": "newOwner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4244,
-                              "src": "4550:8:7",
+                              "referencedDeclaration": 8864,
+                              "src": "4568:8:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "4538:20:7",
+                            "src": "4556:20:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4276,
+                          "id": 8896,
                           "nodeType": "ExpressionStatement",
-                          "src": "4538:20:7"
+                          "src": "4556:20:8"
                         },
                         {
-                          "id": 4277,
+                          "id": 8897,
                           "nodeType": "Break",
-                          "src": "4576:5:7"
+                          "src": "4594:5:8"
                         }
                       ]
                     }
@@ -5627,19 +5627,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4262,
+                    "id": 8882,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4259,
+                      "id": 8879,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4256,
-                      "src": "4460:1:7",
+                      "referencedDeclaration": 8876,
+                      "src": "4478:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5651,18 +5651,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4260,
+                        "id": 8880,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "4464:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "4482:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4261,
+                      "id": 8881,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -5670,31 +5670,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4464:13:7",
+                      "src": "4482:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4460:17:7",
+                    "src": "4478:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4280,
+                  "id": 8900,
                   "initializationExpression": {
                     "assignments": [
-                      4256
+                      8876
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4256,
+                        "id": 8876,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4302,
-                        "src": "4448:6:7",
+                        "scope": 8922,
+                        "src": "4466:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -5702,10 +5702,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4255,
+                          "id": 8875,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4448:4:7",
+                          "src": "4466:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -5715,18 +5715,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4258,
+                    "id": 8878,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4257,
+                      "id": 8877,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4457:1:7",
+                      "src": "4475:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -5735,12 +5735,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4448:10:7"
+                    "src": "4466:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4264,
+                      "id": 8884,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5748,15 +5748,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4479:3:7",
+                      "src": "4497:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4263,
+                        "id": 8883,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4256,
-                        "src": "4479:1:7",
+                        "referencedDeclaration": 8876,
+                        "src": "4497:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5767,17 +5767,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4265,
+                    "id": 8885,
                     "nodeType": "ExpressionStatement",
-                    "src": "4479:3:7"
+                    "src": "4497:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4443:153:7"
+                  "src": "4461:153:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4285,
+                    "id": 8905,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5786,26 +5786,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4281,
+                        "id": 8901,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "4605:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "4623:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4283,
+                      "id": 8903,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4282,
+                        "id": 8902,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4613:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4631:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5816,7 +5816,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4605:14:7",
+                      "src": "4623:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -5827,14 +5827,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4284,
+                      "id": 8904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4622:5:7",
+                      "src": "4640:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -5842,20 +5842,20 @@
                       },
                       "value": "false"
                     },
-                    "src": "4605:22:7",
+                    "src": "4623:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4286,
+                  "id": 8906,
                   "nodeType": "ExpressionStatement",
-                  "src": "4605:22:7"
+                  "src": "4623:22:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4291,
+                    "id": 8911,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5864,26 +5864,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4287,
+                        "id": 8907,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "4637:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "4655:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4289,
+                      "id": 8909,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4288,
+                        "id": 8908,
                         "name": "newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4244,
-                        "src": "4645:8:7",
+                        "referencedDeclaration": 8864,
+                        "src": "4663:8:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5894,7 +5894,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4637:17:7",
+                      "src": "4655:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -5905,14 +5905,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4290,
+                      "id": 8910,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4657:4:7",
+                      "src": "4675:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -5920,15 +5920,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "4637:24:7",
+                    "src": "4655:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4292,
+                  "id": 8912,
                   "nodeType": "ExpressionStatement",
-                  "src": "4637:24:7"
+                  "src": "4655:24:8"
                 },
                 {
                   "expression": {
@@ -5936,12 +5936,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4294,
+                        "id": 8914,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4684:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4702:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5955,18 +5955,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4293,
+                      "id": 8913,
                       "name": "OwnerRemoval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3884,
-                      "src": "4671:12:7",
+                      "referencedDeclaration": 8504,
+                      "src": "4689:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4295,
+                    "id": 8915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5974,15 +5974,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4671:19:7",
+                    "src": "4689:19:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4296,
+                  "id": 8916,
                   "nodeType": "ExpressionStatement",
-                  "src": "4671:19:7"
+                  "src": "4689:19:8"
                 },
                 {
                   "expression": {
@@ -5990,12 +5990,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4298,
+                        "id": 8918,
                         "name": "newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4244,
-                        "src": "4714:8:7",
+                        "referencedDeclaration": 8864,
+                        "src": "4732:8:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6009,18 +6009,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4297,
+                      "id": 8917,
                       "name": "OwnerAddition",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3880,
-                      "src": "4700:13:7",
+                      "referencedDeclaration": 8500,
+                      "src": "4718:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4299,
+                    "id": 8919,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6028,123 +6028,123 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4700:23:7",
+                    "src": "4718:23:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4300,
+                  "id": 8920,
                   "nodeType": "ExpressionStatement",
-                  "src": "4700:23:7"
+                  "src": "4718:23:8"
                 }
               ]
             },
             "documentation": "@dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.\n @param owner Address of owner to be replaced.\n @param newOwner Address of new owner.",
-            "id": 4302,
+            "id": 8922,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4247,
+                "id": 8867,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4246,
+                  "id": 8866,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "4363:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "4381:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4363:10:7"
+                "src": "4381:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4249,
+                    "id": 8869,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4242,
-                    "src": "4390:5:7",
+                    "referencedDeclaration": 8862,
+                    "src": "4408:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4250,
+                "id": 8870,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4248,
+                  "id": 8868,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "4378:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "4396:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4378:18:7"
+                "src": "4396:18:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4252,
+                    "id": 8872,
                     "name": "newOwner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4244,
-                    "src": "4419:8:7",
+                    "referencedDeclaration": 8864,
+                    "src": "4437:8:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4253,
+                "id": 8873,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4251,
+                  "id": 8871,
                   "name": "ownerDoesNotExist",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3947,
-                  "src": "4401:17:7",
+                  "referencedDeclaration": 8567,
+                  "src": "4419:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4401:27:7"
+                "src": "4419:27:8"
               }
             ],
             "name": "replaceOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4245,
+              "id": 8865,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4242,
+                  "id": 8862,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4302,
-                  "src": "4315:13:7",
+                  "scope": 8922,
+                  "src": "4333:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6152,10 +6152,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4241,
+                    "id": 8861,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4315:7:7",
+                    "src": "4333:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6166,11 +6166,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4244,
+                  "id": 8864,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4302,
-                  "src": "4330:16:7",
+                  "scope": 8922,
+                  "src": "4348:16:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6178,10 +6178,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4243,
+                    "id": 8863,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4330:7:7",
+                    "src": "4348:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6191,43 +6191,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4314:33:7"
+              "src": "4332:33:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4254,
+              "id": 8874,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4433:0:7"
+              "src": "4451:0:8"
             },
-            "scope": 4851,
-            "src": "4293:437:7",
+            "scope": 9471,
+            "src": "4311:437:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4322,
+              "id": 8942,
               "nodeType": "Block",
-              "src": "5021:75:7",
+              "src": "5039:75:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4316,
+                    "id": 8936,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4314,
+                      "id": 8934,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "5031:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "5049:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6237,26 +6237,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4315,
+                      "id": 8935,
                       "name": "_required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4304,
-                      "src": "5042:9:7",
+                      "referencedDeclaration": 8924,
+                      "src": "5060:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "5031:20:7",
+                    "src": "5049:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4317,
+                  "id": 8937,
                   "nodeType": "ExpressionStatement",
-                  "src": "5031:20:7"
+                  "src": "5049:20:8"
                 },
                 {
                   "expression": {
@@ -6264,12 +6264,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4319,
+                        "id": 8939,
                         "name": "_required",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4304,
-                        "src": "5079:9:7",
+                        "referencedDeclaration": 8924,
+                        "src": "5097:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6283,18 +6283,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4318,
+                      "id": 8938,
                       "name": "RequirementChange",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3888,
-                      "src": "5061:17:7",
+                      "referencedDeclaration": 8508,
+                      "src": "5079:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4320,
+                    "id": 8940,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6302,42 +6302,42 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5061:28:7",
+                    "src": "5079:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4321,
+                  "id": 8941,
                   "nodeType": "ExpressionStatement",
-                  "src": "5061:28:7"
+                  "src": "5079:28:8"
                 }
               ]
             },
             "documentation": "@dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.\n @param _required Number of required confirmations.",
-            "id": 4323,
+            "id": 8943,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4307,
+                "id": 8927,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4306,
+                  "id": 8926,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "4959:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "4977:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4959:10:7"
+                "src": "4977:10:8"
               },
               {
                 "arguments": [
@@ -6345,18 +6345,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4309,
+                      "id": 8929,
                       "name": "owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3908,
-                      "src": "4991:6:7",
+                      "referencedDeclaration": 8528,
+                      "src": "5009:6:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_storage",
                         "typeString": "address[] storage ref"
                       }
                     },
-                    "id": 4310,
+                    "id": 8930,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
@@ -6364,7 +6364,7 @@
                     "memberName": "length",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "4991:13:7",
+                    "src": "5009:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6372,49 +6372,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4311,
+                    "id": 8931,
                     "name": "_required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4304,
-                    "src": "5006:9:7",
+                    "referencedDeclaration": 8924,
+                    "src": "5024:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4312,
+                "id": 8932,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4308,
+                  "id": 8928,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "4974:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "4992:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4974:42:7"
+                "src": "4992:42:8"
               }
             ],
             "name": "changeRequirement",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4305,
+              "id": 8925,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4304,
+                  "id": 8924,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4323,
-                  "src": "4928:14:7",
+                  "scope": 8943,
+                  "src": "4946:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6422,10 +6422,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4303,
+                    "id": 8923,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4928:4:7",
+                    "src": "4946:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6435,43 +6435,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4927:16:7"
+              "src": "4945:16:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4313,
+              "id": 8933,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5021:0:7"
+              "src": "5039:0:8"
             },
-            "scope": 4851,
-            "src": "4901:195:7",
+            "scope": 9471,
+            "src": "4919:195:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4346,
+              "id": 8966,
               "nodeType": "Block",
-              "src": "5475:116:7",
+              "src": "5493:116:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4340,
+                    "id": 8960,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4334,
+                      "id": 8954,
                       "name": "transactionId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4332,
-                      "src": "5485:13:7",
+                      "referencedDeclaration": 8952,
+                      "src": "5503:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6484,12 +6484,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4336,
+                          "id": 8956,
                           "name": "destination",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4325,
-                          "src": "5516:11:7",
+                          "referencedDeclaration": 8945,
+                          "src": "5534:11:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6497,12 +6497,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4337,
+                          "id": 8957,
                           "name": "value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4327,
-                          "src": "5529:5:7",
+                          "referencedDeclaration": 8947,
+                          "src": "5547:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6510,12 +6510,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4338,
+                          "id": 8958,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4329,
-                          "src": "5536:4:7",
+                          "referencedDeclaration": 8949,
+                          "src": "5554:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -6537,18 +6537,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 4335,
+                        "id": 8955,
                         "name": "addTransaction",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4580,
-                        "src": "5501:14:7",
+                        "referencedDeclaration": 9200,
+                        "src": "5519:14:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$returns$_t_uint256_$",
                           "typeString": "function (address,uint256,bytes memory) returns (uint256)"
                         }
                       },
-                      "id": 4339,
+                      "id": 8959,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6556,21 +6556,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5501:40:7",
+                      "src": "5519:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "5485:56:7",
+                    "src": "5503:56:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4341,
+                  "id": 8961,
                   "nodeType": "ExpressionStatement",
-                  "src": "5485:56:7"
+                  "src": "5503:56:8"
                 },
                 {
                   "expression": {
@@ -6578,12 +6578,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4343,
+                        "id": 8963,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4332,
-                        "src": "5570:13:7",
+                        "referencedDeclaration": 8952,
+                        "src": "5588:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6597,18 +6597,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4342,
+                      "id": 8962,
                       "name": "confirmTransaction",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4384,
-                      "src": "5551:18:7",
+                      "referencedDeclaration": 9004,
+                      "src": "5569:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4344,
+                    "id": 8964,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6616,20 +6616,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5551:33:7",
+                    "src": "5569:33:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4345,
+                  "id": 8965,
                   "nodeType": "ExpressionStatement",
-                  "src": "5551:33:7"
+                  "src": "5569:33:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to submit and confirm a transaction.\n @param destination Transaction target address.\n @param value Transaction ether value.\n @param data Transaction data payload.\n @return Returns transaction ID.",
-            "id": 4347,
+            "id": 8967,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -6637,16 +6637,16 @@
             "name": "submitTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4330,
+              "id": 8950,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4325,
+                  "id": 8945,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5382:19:7",
+                  "scope": 8967,
+                  "src": "5400:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6654,10 +6654,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4324,
+                    "id": 8944,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5382:7:7",
+                    "src": "5400:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6668,11 +6668,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4327,
+                  "id": 8947,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5403:10:7",
+                  "scope": 8967,
+                  "src": "5421:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6680,10 +6680,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4326,
+                    "id": 8946,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5403:4:7",
+                    "src": "5421:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6694,11 +6694,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4329,
+                  "id": 8949,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5415:10:7",
+                  "scope": 8967,
+                  "src": "5433:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6706,10 +6706,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4328,
+                    "id": 8948,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5415:5:7",
+                    "src": "5433:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -6719,20 +6719,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5381:45:7"
+              "src": "5399:45:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4333,
+              "id": 8953,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4332,
+                  "id": 8952,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5451:18:7",
+                  "scope": 8967,
+                  "src": "5469:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6740,10 +6740,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4331,
+                    "id": 8951,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5451:4:7",
+                    "src": "5469:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6753,24 +6753,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5450:20:7"
+              "src": "5468:20:8"
             },
-            "scope": 4851,
-            "src": "5355:236:7",
+            "scope": 9471,
+            "src": "5373:236:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4383,
+              "id": 9003,
               "nodeType": "Block",
-              "src": "5869:156:7",
+              "src": "5887:156:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4371,
+                    "id": 8991,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6781,26 +6781,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4364,
+                          "id": 8984,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "5879:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "5897:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4368,
+                        "id": 8988,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4365,
+                          "id": 8985,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4349,
-                          "src": "5893:13:7",
+                          "referencedDeclaration": 8969,
+                          "src": "5911:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -6811,29 +6811,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5879:28:7",
+                        "src": "5897:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4369,
+                      "id": 8989,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4366,
+                          "id": 8986,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "5908:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "5926:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4367,
+                        "id": 8987,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6841,7 +6841,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5908:10:7",
+                        "src": "5926:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6852,7 +6852,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "5879:40:7",
+                      "src": "5897:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -6863,14 +6863,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4370,
+                      "id": 8990,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "5922:4:7",
+                      "src": "5940:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -6878,15 +6878,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "5879:47:7",
+                    "src": "5897:47:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4372,
+                  "id": 8992,
                   "nodeType": "ExpressionStatement",
-                  "src": "5879:47:7"
+                  "src": "5897:47:8"
                 },
                 {
                   "expression": {
@@ -6896,18 +6896,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4374,
+                          "id": 8994,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "5949:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "5967:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4375,
+                        "id": 8995,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6915,7 +6915,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5949:10:7",
+                        "src": "5967:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6923,12 +6923,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4376,
+                        "id": 8996,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4349,
-                        "src": "5961:13:7",
+                        "referencedDeclaration": 8969,
+                        "src": "5979:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6946,18 +6946,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4373,
+                      "id": 8993,
                       "name": "Confirmation",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3852,
-                      "src": "5936:12:7",
+                      "referencedDeclaration": 8472,
+                      "src": "5954:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 4377,
+                    "id": 8997,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6965,15 +6965,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5936:39:7",
+                    "src": "5954:39:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4378,
+                  "id": 8998,
                   "nodeType": "ExpressionStatement",
-                  "src": "5936:39:7"
+                  "src": "5954:39:8"
                 },
                 {
                   "expression": {
@@ -6981,12 +6981,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4380,
+                        "id": 9000,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4349,
-                        "src": "6004:13:7",
+                        "referencedDeclaration": 8969,
+                        "src": "6022:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7000,18 +7000,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4379,
+                      "id": 8999,
                       "name": "executeTransaction",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4479,
-                      "src": "5985:18:7",
+                      "referencedDeclaration": 9099,
+                      "src": "6003:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4381,
+                    "id": 9001,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7019,20 +7019,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5985:33:7",
+                    "src": "6003:33:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4382,
+                  "id": 9002,
                   "nodeType": "ExpressionStatement",
-                  "src": "5985:33:7"
+                  "src": "6003:33:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to confirm a transaction.\n @param transactionId Transaction ID.",
-            "id": 4384,
+            "id": 9004,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -7043,18 +7043,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4352,
+                      "id": 8972,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "5772:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "5790:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4353,
+                    "id": 8973,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7062,73 +7062,73 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "5772:10:7",
+                    "src": "5790:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4354,
+                "id": 8974,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4351,
+                  "id": 8971,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "5760:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "5778:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5760:23:7"
+                "src": "5778:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4356,
+                    "id": 8976,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4349,
-                    "src": "5806:13:7",
+                    "referencedDeclaration": 8969,
+                    "src": "5824:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4357,
+                "id": 8977,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4355,
+                  "id": 8975,
                   "name": "transactionExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3974,
-                  "src": "5788:17:7",
+                  "referencedDeclaration": 8594,
+                  "src": "5806:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5788:32:7"
+                "src": "5806:32:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4359,
+                    "id": 8979,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4349,
-                    "src": "5838:13:7",
+                    "referencedDeclaration": 8969,
+                    "src": "5856:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7138,18 +7138,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4360,
+                      "id": 8980,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "5853:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "5871:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4361,
+                    "id": 8981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7157,44 +7157,44 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "5853:10:7",
+                    "src": "5871:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4362,
+                "id": 8982,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4358,
+                  "id": 8978,
                   "name": "notConfirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4007,
-                  "src": "5825:12:7",
+                  "referencedDeclaration": 8627,
+                  "src": "5843:12:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5825:39:7"
+                "src": "5843:39:8"
               }
             ],
             "name": "confirmTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4350,
+              "id": 8970,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4349,
+                  "id": 8969,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4384,
-                  "src": "5725:18:7",
+                  "scope": 9004,
+                  "src": "5743:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7202,10 +7202,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4348,
+                    "id": 8968,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5725:4:7",
+                    "src": "5743:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7215,31 +7215,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5724:20:7"
+              "src": "5742:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4363,
+              "id": 8983,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5869:0:7"
+              "src": "5887:0:8"
             },
-            "scope": 4851,
-            "src": "5697:328:7",
+            "scope": 9471,
+            "src": "5715:328:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4416,
+              "id": 9036,
               "nodeType": "Block",
-              "src": "6312:112:7",
+              "src": "6330:112:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4408,
+                    "id": 9028,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7250,26 +7250,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4401,
+                          "id": 9021,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "6322:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "6340:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4405,
+                        "id": 9025,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4402,
+                          "id": 9022,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4386,
-                          "src": "6336:13:7",
+                          "referencedDeclaration": 9006,
+                          "src": "6354:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -7280,29 +7280,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "6322:28:7",
+                        "src": "6340:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4406,
+                      "id": 9026,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4403,
+                          "id": 9023,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "6351:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "6369:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4404,
+                        "id": 9024,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7310,7 +7310,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6351:10:7",
+                        "src": "6369:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -7321,7 +7321,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "6322:40:7",
+                      "src": "6340:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -7332,14 +7332,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4407,
+                      "id": 9027,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "6365:5:7",
+                      "src": "6383:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -7347,15 +7347,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "6322:48:7",
+                    "src": "6340:48:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4409,
+                  "id": 9029,
                   "nodeType": "ExpressionStatement",
-                  "src": "6322:48:7"
+                  "src": "6340:48:8"
                 },
                 {
                   "expression": {
@@ -7365,18 +7365,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4411,
+                          "id": 9031,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "6391:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "6409:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4412,
+                        "id": 9032,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7384,7 +7384,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6391:10:7",
+                        "src": "6409:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -7392,12 +7392,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4413,
+                        "id": 9033,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4386,
-                        "src": "6403:13:7",
+                        "referencedDeclaration": 9006,
+                        "src": "6421:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7415,18 +7415,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4410,
+                      "id": 9030,
                       "name": "Revocation",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3858,
-                      "src": "6380:10:7",
+                      "referencedDeclaration": 8478,
+                      "src": "6398:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 4414,
+                    "id": 9034,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7434,20 +7434,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6380:37:7",
+                    "src": "6398:37:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4415,
+                  "id": 9035,
                   "nodeType": "ExpressionStatement",
-                  "src": "6380:37:7"
+                  "src": "6398:37:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to revoke a confirmation for a transaction.\n @param transactionId Transaction ID.",
-            "id": 4417,
+            "id": 9037,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -7458,18 +7458,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4389,
+                      "id": 9009,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6224:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6242:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4390,
+                    "id": 9010,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7477,40 +7477,40 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6224:10:7",
+                    "src": "6242:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4391,
+                "id": 9011,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4388,
+                  "id": 9008,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "6212:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "6230:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6212:23:7"
+                "src": "6230:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4393,
+                    "id": 9013,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4386,
-                    "src": "6250:13:7",
+                    "referencedDeclaration": 9006,
+                    "src": "6268:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7520,18 +7520,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4394,
+                      "id": 9014,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6265:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6283:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4395,
+                    "id": 9015,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7539,77 +7539,77 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6265:10:7",
+                    "src": "6283:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4396,
+                "id": 9016,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4392,
+                  "id": 9012,
                   "name": "confirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3990,
-                  "src": "6240:9:7",
+                  "referencedDeclaration": 8610,
+                  "src": "6258:9:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6240:36:7"
+                "src": "6258:36:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4398,
+                    "id": 9018,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4386,
-                    "src": "6293:13:7",
+                    "referencedDeclaration": 9006,
+                    "src": "6311:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4399,
+                "id": 9019,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4397,
+                  "id": 9017,
                   "name": "notExecuted",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4021,
-                  "src": "6281:11:7",
+                  "referencedDeclaration": 8641,
+                  "src": "6299:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6281:26:7"
+                "src": "6299:26:8"
               }
             ],
             "name": "revokeConfirmation",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4387,
+              "id": 9007,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4386,
+                  "id": 9006,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4417,
-                  "src": "6177:18:7",
+                  "scope": 9037,
+                  "src": "6195:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -7617,10 +7617,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4385,
+                    "id": 9005,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6177:4:7",
+                    "src": "6195:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -7630,26 +7630,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6176:20:7"
+              "src": "6194:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4400,
+              "id": 9020,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6312:0:7"
+              "src": "6330:0:8"
             },
-            "scope": 4851,
-            "src": "6149:275:7",
+            "scope": 9471,
+            "src": "6167:275:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4478,
+              "id": 9098,
               "nodeType": "Block",
-              "src": "6701:407:7",
+              "src": "6719:407:8",
               "statements": [
                 {
                   "condition": {
@@ -7657,12 +7657,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4435,
+                        "id": 9055,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4419,
-                        "src": "6727:13:7",
+                        "referencedDeclaration": 9039,
+                        "src": "6745:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -7676,18 +7676,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4434,
+                      "id": 9054,
                       "name": "isConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4542,
-                      "src": "6715:11:7",
+                      "referencedDeclaration": 9162,
+                      "src": "6733:11:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 4436,
+                    "id": 9056,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7695,48 +7695,48 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6715:26:7",
+                    "src": "6733:26:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4477,
+                  "id": 9097,
                   "nodeType": "IfStatement",
-                  "src": "6711:391:7",
+                  "src": "6729:391:8",
                   "trueBody": {
-                    "id": 4476,
+                    "id": 9096,
                     "nodeType": "Block",
-                    "src": "6743:359:7",
+                    "src": "6761:359:8",
                     "statements": [
                       {
                         "assignments": [
-                          4438
+                          9058
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 4438,
+                            "id": 9058,
                             "name": "txn",
                             "nodeType": "VariableDeclaration",
-                            "scope": 4479,
-                            "src": "6757:23:7",
+                            "scope": 9099,
+                            "src": "6775:23:8",
                             "stateVariable": false,
                             "storageLocation": "storage",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                               "typeString": "struct MultiSigWallet.Transaction"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 4437,
+                              "id": 9057,
                               "name": "Transaction",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 3921,
-                              "src": "6757:11:7",
+                              "referencedDeclaration": 8541,
+                              "src": "6775:11:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                 "typeString": "struct MultiSigWallet.Transaction"
                               }
                             },
@@ -7744,31 +7744,31 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 4442,
+                        "id": 9062,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4439,
+                            "id": 9059,
                             "name": "transactions",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3895,
-                            "src": "6783:12:7",
+                            "referencedDeclaration": 8515,
+                            "src": "6801:12:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                               "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                             }
                           },
-                          "id": 4441,
+                          "id": 9061,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4440,
+                            "id": 9060,
                             "name": "transactionId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4419,
-                            "src": "6796:13:7",
+                            "referencedDeclaration": 9039,
+                            "src": "6814:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -7779,19 +7779,19 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "6783:27:7",
+                          "src": "6801:27:8",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                            "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                             "typeString": "struct MultiSigWallet.Transaction storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "6757:53:7"
+                        "src": "6775:53:8"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4447,
+                          "id": 9067,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7800,26 +7800,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4443,
+                              "id": 9063,
                               "name": "txn",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4438,
-                              "src": "6824:3:7",
+                              "referencedDeclaration": 9058,
+                              "src": "6842:3:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                 "typeString": "struct MultiSigWallet.Transaction storage pointer"
                               }
                             },
-                            "id": 4445,
+                            "id": 9065,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "6824:12:7",
+                            "referencedDeclaration": 8540,
+                            "src": "6842:12:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -7830,14 +7830,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4446,
+                            "id": 9066,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6839:4:7",
+                            "src": "6857:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -7845,15 +7845,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "6824:19:7",
+                          "src": "6842:19:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4448,
+                        "id": 9068,
                         "nodeType": "ExpressionStatement",
-                        "src": "6824:19:7"
+                        "src": "6842:19:8"
                       },
                       {
                         "condition": {
@@ -7863,26 +7863,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4450,
+                                "id": 9070,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6875:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6893:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4451,
+                              "id": 9071,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "destination",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3914,
-                              "src": "6875:15:7",
+                              "referencedDeclaration": 8534,
+                              "src": "6893:15:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -7892,26 +7892,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4452,
+                                "id": 9072,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6892:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6910:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4453,
+                              "id": 9073,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3916,
-                              "src": "6892:9:7",
+                              "referencedDeclaration": 8536,
+                              "src": "6910:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -7923,32 +7923,32 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4454,
+                                  "id": 9074,
                                   "name": "txn",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4438,
-                                  "src": "6903:3:7",
+                                  "referencedDeclaration": 9058,
+                                  "src": "6921:3:8",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                    "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                     "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                   }
                                 },
-                                "id": 4455,
+                                "id": 9075,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "data",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 3918,
-                                "src": "6903:8:7",
+                                "referencedDeclaration": 8538,
+                                "src": "6921:8:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes_storage",
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 4456,
+                              "id": 9076,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
@@ -7956,7 +7956,7 @@
                               "memberName": "length",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6903:15:7",
+                              "src": "6921:15:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -7966,26 +7966,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4457,
+                                "id": 9077,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6920:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6938:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4458,
+                              "id": 9078,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "data",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3918,
-                              "src": "6920:8:7",
+                              "referencedDeclaration": 8538,
+                              "src": "6938:8:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_storage",
                                 "typeString": "bytes storage ref"
@@ -8011,18 +8011,18 @@
                                 "typeString": "bytes storage ref"
                               }
                             ],
-                            "id": 4449,
+                            "id": 9069,
                             "name": "external_call",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4499,
-                            "src": "6861:13:7",
+                            "referencedDeclaration": 9119,
+                            "src": "6879:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$_t_bytes_memory_ptr_$returns$_t_bool_$",
                               "typeString": "function (address,uint256,uint256,bytes memory) returns (bool)"
                             }
                           },
-                          "id": 4459,
+                          "id": 9079,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8030,16 +8030,16 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6861:68:7",
+                          "src": "6879:68:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4474,
+                          "id": 9094,
                           "nodeType": "Block",
-                          "src": "6990:102:7",
+                          "src": "7008:102:8",
                           "statements": [
                             {
                               "expression": {
@@ -8047,12 +8047,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4465,
+                                    "id": 9085,
                                     "name": "transactionId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4419,
-                                    "src": "7025:13:7",
+                                    "referencedDeclaration": 9039,
+                                    "src": "7043:13:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -8066,18 +8066,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4464,
+                                  "id": 9084,
                                   "name": "ExecutionFailure",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3870,
-                                  "src": "7008:16:7",
+                                  "referencedDeclaration": 8490,
+                                  "src": "7026:16:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4466,
+                                "id": 9086,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8085,20 +8085,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "7008:31:7",
+                                "src": "7026:31:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4467,
+                              "id": 9087,
                               "nodeType": "ExpressionStatement",
-                              "src": "7008:31:7"
+                              "src": "7026:31:8"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4472,
+                                "id": 9092,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -8107,26 +8107,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4468,
+                                    "id": 9088,
                                     "name": "txn",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4438,
-                                    "src": "7057:3:7",
+                                    "referencedDeclaration": 9058,
+                                    "src": "7075:3:8",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                      "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                       "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                     }
                                   },
-                                  "id": 4470,
+                                  "id": 9090,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "executed",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 3920,
-                                  "src": "7057:12:7",
+                                  "referencedDeclaration": 8540,
+                                  "src": "7075:12:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -8137,14 +8137,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "66616c7365",
-                                  "id": 4471,
+                                  "id": 9091,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "bool",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7072:5:7",
+                                  "src": "7090:5:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
@@ -8152,33 +8152,33 @@
                                   },
                                   "value": "false"
                                 },
-                                "src": "7057:20:7",
+                                "src": "7075:20:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 4473,
+                              "id": 9093,
                               "nodeType": "ExpressionStatement",
-                              "src": "7057:20:7"
+                              "src": "7075:20:8"
                             }
                           ]
                         },
-                        "id": 4475,
+                        "id": 9095,
                         "nodeType": "IfStatement",
-                        "src": "6857:235:7",
+                        "src": "6875:235:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4461,
+                                "id": 9081,
                                 "name": "transactionId",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4419,
-                                "src": "6957:13:7",
+                                "referencedDeclaration": 9039,
+                                "src": "6975:13:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -8192,18 +8192,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 4460,
+                              "id": 9080,
                               "name": "Execution",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3866,
-                              "src": "6947:9:7",
+                              "referencedDeclaration": 8486,
+                              "src": "6965:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                 "typeString": "function (uint256)"
                               }
                             },
-                            "id": 4462,
+                            "id": 9082,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -8211,15 +8211,15 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6947:24:7",
+                            "src": "6965:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_tuple$__$",
                               "typeString": "tuple()"
                             }
                           },
-                          "id": 4463,
+                          "id": 9083,
                           "nodeType": "ExpressionStatement",
-                          "src": "6947:24:7"
+                          "src": "6965:24:8"
                         }
                       }
                     ]
@@ -8228,7 +8228,7 @@
               ]
             },
             "documentation": "@dev Allows anyone to execute a confirmed transaction.\n @param transactionId Transaction ID.",
-            "id": 4479,
+            "id": 9099,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -8239,18 +8239,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4422,
+                      "id": 9042,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6613:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6631:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4423,
+                    "id": 9043,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8258,40 +8258,40 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6613:10:7",
+                    "src": "6631:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4424,
+                "id": 9044,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4421,
+                  "id": 9041,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "6601:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "6619:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6601:23:7"
+                "src": "6619:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4426,
+                    "id": 9046,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4419,
-                    "src": "6639:13:7",
+                    "referencedDeclaration": 9039,
+                    "src": "6657:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8301,18 +8301,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4427,
+                      "id": 9047,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6654:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6672:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4428,
+                    "id": 9048,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8320,77 +8320,77 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6654:10:7",
+                    "src": "6672:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4429,
+                "id": 9049,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4425,
+                  "id": 9045,
                   "name": "confirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3990,
-                  "src": "6629:9:7",
+                  "referencedDeclaration": 8610,
+                  "src": "6647:9:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6629:36:7"
+                "src": "6647:36:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4431,
+                    "id": 9051,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4419,
-                    "src": "6682:13:7",
+                    "referencedDeclaration": 9039,
+                    "src": "6700:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4432,
+                "id": 9052,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4430,
+                  "id": 9050,
                   "name": "notExecuted",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4021,
-                  "src": "6670:11:7",
+                  "referencedDeclaration": 8641,
+                  "src": "6688:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6670:26:7"
+                "src": "6688:26:8"
               }
             ],
             "name": "executeTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4420,
+              "id": 9040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4419,
+                  "id": 9039,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4479,
-                  "src": "6566:18:7",
+                  "scope": 9099,
+                  "src": "6584:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8398,10 +8398,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4418,
+                    "id": 9038,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6566:4:7",
+                    "src": "6584:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8411,37 +8411,37 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6565:20:7"
+              "src": "6583:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4433,
+              "id": 9053,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6701:0:7"
+              "src": "6719:0:8"
             },
-            "scope": 4851,
-            "src": "6538:570:7",
+            "scope": 9471,
+            "src": "6556:570:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4498,
+              "id": 9118,
               "nodeType": "Block",
-              "src": "7393:962:7",
+              "src": "7411:962:8",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4493,
+                      "id": 9113,
                       "name": "result",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4499,
-                      "src": "7403:11:7",
+                      "scope": 9119,
+                      "src": "7421:11:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -8449,10 +8449,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 4492,
+                        "id": 9112,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "7403:4:7",
+                        "src": "7421:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -8462,87 +8462,87 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4494,
+                  "id": 9114,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "7403:11:7"
+                  "src": "7421:11:8"
                 },
                 {
                   "externalReferences": [
                     {
                       "result": {
-                        "declaration": 4493,
+                        "declaration": 9113,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "7727:6:7",
+                        "src": "7745:6:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "data": {
-                        "declaration": 4487,
+                        "declaration": 9107,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "7640:4:7",
+                        "src": "7658:4:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "destination": {
-                        "declaration": 4481,
+                        "declaration": 9101,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8057:11:7",
+                        "src": "8075:11:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "value": {
-                        "declaration": 4483,
+                        "declaration": 9103,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8082:5:7",
+                        "src": "8100:5:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "dataLength": {
-                        "declaration": 4485,
+                        "declaration": 9105,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8116:10:7",
+                        "src": "8134:10:8",
                         "valueSize": 1
                       }
                     }
                   ],
-                  "id": 4495,
+                  "id": 9115,
                   "nodeType": "InlineAssembly",
                   "operations": "{\n    let x := mload(0x40)\n    let d := add(data, 32)\n    result := call(sub(gas(), 34710), destination, value, d, dataLength, x, 0)\n}",
-                  "src": "7424:917:7"
+                  "src": "7442:917:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4496,
+                    "id": 9116,
                     "name": "result",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4493,
-                    "src": "8342:6:7",
+                    "referencedDeclaration": 9113,
+                    "src": "8360:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 4491,
-                  "id": 4497,
+                  "functionReturnParameters": 9111,
+                  "id": 9117,
                   "nodeType": "Return",
-                  "src": "8335:13:7"
+                  "src": "8353:13:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4499,
+            "id": 9119,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -8550,16 +8550,16 @@
             "name": "external_call",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4488,
+              "id": 9108,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4481,
+                  "id": 9101,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7308:19:7",
+                  "scope": 9119,
+                  "src": "7326:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8567,10 +8567,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4480,
+                    "id": 9100,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7308:7:7",
+                    "src": "7326:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -8581,11 +8581,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4483,
+                  "id": 9103,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7329:10:7",
+                  "scope": 9119,
+                  "src": "7347:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8593,10 +8593,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4482,
+                    "id": 9102,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7329:4:7",
+                    "src": "7347:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8607,11 +8607,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4485,
+                  "id": 9105,
                   "name": "dataLength",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7341:15:7",
+                  "scope": 9119,
+                  "src": "7359:15:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8619,10 +8619,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4484,
+                    "id": 9104,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7341:4:7",
+                    "src": "7359:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -8633,11 +8633,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4487,
+                  "id": 9107,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7358:10:7",
+                  "scope": 9119,
+                  "src": "7376:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8645,10 +8645,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4486,
+                    "id": 9106,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7358:5:7",
+                    "src": "7376:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -8658,20 +8658,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7307:62:7"
+              "src": "7325:62:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4491,
+              "id": 9111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4490,
+                  "id": 9110,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7387:4:7",
+                  "scope": 9119,
+                  "src": "7405:4:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -8679,10 +8679,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4489,
+                    "id": 9109,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7387:4:7",
+                    "src": "7405:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -8692,32 +8692,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7386:6:7"
+              "src": "7404:6:8"
             },
-            "scope": 4851,
-            "src": "7285:1070:7",
+            "scope": 9471,
+            "src": "7303:1070:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "private"
           },
           {
             "body": {
-              "id": 4541,
+              "id": 9161,
               "nodeType": "Block",
-              "src": "8594:241:7",
+              "src": "8612:241:8",
               "statements": [
                 {
                   "assignments": [
-                    4507
+                    9127
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4507,
+                      "id": 9127,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4542,
-                      "src": "8604:10:7",
+                      "scope": 9162,
+                      "src": "8622:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -8725,10 +8725,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4506,
+                        "id": 9126,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "8604:4:7",
+                        "src": "8622:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -8738,18 +8738,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4509,
+                  "id": 9129,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4508,
+                    "id": 9128,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "8617:1:7",
+                    "src": "8635:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -8758,13 +8758,13 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "8604:14:7"
+                  "src": "8622:14:8"
                 },
                 {
                   "body": {
-                    "id": 4539,
+                    "id": 9159,
                     "nodeType": "Block",
-                    "src": "8669:160:7",
+                    "src": "8687:160:8",
                     "statements": [
                       {
                         "condition": {
@@ -8773,26 +8773,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4521,
+                              "id": 9141,
                               "name": "confirmations",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3901,
-                              "src": "8687:13:7",
+                              "referencedDeclaration": 8521,
+                              "src": "8705:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(uint256 => mapping(address => bool))"
                               }
                             },
-                            "id": 4523,
+                            "id": 9143,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4522,
+                              "id": 9142,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4501,
-                              "src": "8701:13:7",
+                              "referencedDeclaration": 9121,
+                              "src": "8719:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -8803,37 +8803,37 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "8687:28:7",
+                            "src": "8705:28:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4527,
+                          "id": 9147,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4524,
+                              "id": 9144,
                               "name": "owners",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3908,
-                              "src": "8716:6:7",
+                              "referencedDeclaration": 8528,
+                              "src": "8734:6:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                 "typeString": "address[] storage ref"
                               }
                             },
-                            "id": 4526,
+                            "id": 9146,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4525,
+                              "id": 9145,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4511,
-                              "src": "8723:1:7",
+                              "referencedDeclaration": 9131,
+                              "src": "8741:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -8844,7 +8844,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "8716:9:7",
+                            "src": "8734:9:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -8855,32 +8855,32 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "8687:39:7",
+                          "src": "8705:39:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4532,
+                        "id": 9152,
                         "nodeType": "IfStatement",
-                        "src": "8683:71:7",
+                        "src": "8701:71:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4530,
+                            "id": 9150,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4528,
+                              "id": 9148,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4507,
-                              "src": "8744:5:7",
+                              "referencedDeclaration": 9127,
+                              "src": "8762:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -8891,14 +8891,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4529,
+                              "id": 9149,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "8753:1:7",
+                              "src": "8771:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -8906,15 +8906,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "8744:10:7",
+                            "src": "8762:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4531,
+                          "id": 9151,
                           "nodeType": "ExpressionStatement",
-                          "src": "8744:10:7"
+                          "src": "8762:10:8"
                         }
                       },
                       {
@@ -8924,19 +8924,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4535,
+                          "id": 9155,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4533,
+                            "id": 9153,
                             "name": "count",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4507,
-                            "src": "8772:5:7",
+                            "referencedDeclaration": 9127,
+                            "src": "8790:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -8946,39 +8946,39 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4534,
+                            "id": 9154,
                             "name": "required",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3910,
-                            "src": "8781:8:7",
+                            "referencedDeclaration": 8530,
+                            "src": "8799:8:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "8772:17:7",
+                          "src": "8790:17:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4538,
+                        "id": 9158,
                         "nodeType": "IfStatement",
-                        "src": "8768:50:7",
+                        "src": "8786:50:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4536,
+                            "id": 9156,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "8814:4:7",
+                            "src": "8832:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -8986,10 +8986,10 @@
                             },
                             "value": "true"
                           },
-                          "functionReturnParameters": 4505,
-                          "id": 4537,
+                          "functionReturnParameters": 9125,
+                          "id": 9157,
                           "nodeType": "Return",
-                          "src": "8807:11:7"
+                          "src": "8825:11:8"
                         }
                       }
                     ]
@@ -9000,19 +9000,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4517,
+                    "id": 9137,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4514,
+                      "id": 9134,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4511,
-                      "src": "8645:1:7",
+                      "referencedDeclaration": 9131,
+                      "src": "8663:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9024,18 +9024,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4515,
+                        "id": 9135,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "8649:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "8667:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4516,
+                      "id": 9136,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -9043,31 +9043,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8649:13:7",
+                      "src": "8667:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8645:17:7",
+                    "src": "8663:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4540,
+                  "id": 9160,
                   "initializationExpression": {
                     "assignments": [
-                      4511
+                      9131
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4511,
+                        "id": 9131,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4542,
-                        "src": "8633:6:7",
+                        "scope": 9162,
+                        "src": "8651:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -9075,10 +9075,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4510,
+                          "id": 9130,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "8633:4:7",
+                          "src": "8651:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9088,18 +9088,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4513,
+                    "id": 9133,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4512,
+                      "id": 9132,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "8642:1:7",
+                      "src": "8660:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -9108,12 +9108,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "8633:10:7"
+                    "src": "8651:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4519,
+                      "id": 9139,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -9121,15 +9121,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8664:3:7",
+                      "src": "8682:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4518,
+                        "id": 9138,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4511,
-                        "src": "8664:1:7",
+                        "referencedDeclaration": 9131,
+                        "src": "8682:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9140,17 +9140,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4520,
+                    "id": 9140,
                     "nodeType": "ExpressionStatement",
-                    "src": "8664:3:7"
+                    "src": "8682:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8628:201:7"
+                  "src": "8646:201:8"
                 }
               ]
             },
             "documentation": "@dev Returns the confirmation status of a transaction.\n @param transactionId Transaction ID.\n @return Confirmation status.",
-            "id": 4542,
+            "id": 9162,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -9158,16 +9158,16 @@
             "name": "isConfirmed",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4502,
+              "id": 9122,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4501,
+                  "id": 9121,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4542,
-                  "src": "8527:18:7",
+                  "scope": 9162,
+                  "src": "8545:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9175,10 +9175,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4500,
+                    "id": 9120,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "8527:4:7",
+                    "src": "8545:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9188,20 +9188,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "8526:20:7"
+              "src": "8544:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4505,
+              "id": 9125,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4504,
+                  "id": 9124,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4542,
-                  "src": "8584:4:7",
+                  "scope": 9162,
+                  "src": "8602:4:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9209,10 +9209,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4503,
+                    "id": 9123,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "8584:4:7",
+                    "src": "8602:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -9222,36 +9222,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "8583:6:7"
+              "src": "8601:6:8"
             },
-            "scope": 4851,
-            "src": "8506:329:7",
+            "scope": 9471,
+            "src": "8524:329:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4579,
+              "id": 9199,
               "nodeType": "Block",
-              "src": "9312:303:7",
+              "src": "9330:303:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4558,
+                    "id": 9178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4556,
+                      "id": 9176,
                       "name": "transactionId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4554,
-                      "src": "9322:13:7",
+                      "referencedDeclaration": 9174,
+                      "src": "9340:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9261,31 +9261,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4557,
+                      "id": 9177,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "9338:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "9356:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9322:32:7",
+                    "src": "9340:32:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4559,
+                  "id": 9179,
                   "nodeType": "ExpressionStatement",
-                  "src": "9322:32:7"
+                  "src": "9340:32:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4569,
+                    "id": 9189,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9294,26 +9294,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4560,
+                        "id": 9180,
                         "name": "transactions",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3895,
-                        "src": "9364:12:7",
+                        "referencedDeclaration": 8515,
+                        "src": "9382:12:8",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                           "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                         }
                       },
-                      "id": 4562,
+                      "id": 9182,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4561,
+                        "id": 9181,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4554,
-                        "src": "9377:13:7",
+                        "referencedDeclaration": 9174,
+                        "src": "9395:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9324,9 +9324,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9364:27:7",
+                      "src": "9382:27:8",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                        "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                         "typeString": "struct MultiSigWallet.Transaction storage ref"
                       }
                     },
@@ -9337,12 +9337,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4564,
+                          "id": 9184,
                           "name": "destination",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4544,
-                          "src": "9434:11:7",
+                          "referencedDeclaration": 9164,
+                          "src": "9452:11:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -9350,12 +9350,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4565,
+                          "id": 9185,
                           "name": "value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4546,
-                          "src": "9467:5:7",
+                          "referencedDeclaration": 9166,
+                          "src": "9485:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9363,12 +9363,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4566,
+                          "id": 9186,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4548,
-                          "src": "9493:4:7",
+                          "referencedDeclaration": 9168,
+                          "src": "9511:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -9377,14 +9377,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 4567,
+                          "id": 9187,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9522:5:7",
+                          "src": "9540:5:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -9395,18 +9395,18 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4563,
+                        "id": 9183,
                         "name": "Transaction",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3921,
-                        "src": "9394:11:7",
+                        "referencedDeclaration": 8541,
+                        "src": "9412:11:8",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Transaction_$3921_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Transaction_$8541_storage_ptr_$",
                           "typeString": "type(struct MultiSigWallet.Transaction storage pointer)"
                         }
                       },
-                      "id": 4568,
+                      "id": 9188,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -9419,38 +9419,38 @@
                         "executed"
                       ],
                       "nodeType": "FunctionCall",
-                      "src": "9394:148:7",
+                      "src": "9412:148:8",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Transaction_$3921_memory",
+                        "typeIdentifier": "t_struct$_Transaction_$8541_memory",
                         "typeString": "struct MultiSigWallet.Transaction memory"
                       }
                     },
-                    "src": "9364:178:7",
+                    "src": "9382:178:8",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                      "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                       "typeString": "struct MultiSigWallet.Transaction storage ref"
                     }
                   },
-                  "id": 4570,
+                  "id": 9190,
                   "nodeType": "ExpressionStatement",
-                  "src": "9364:178:7"
+                  "src": "9382:178:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4573,
+                    "id": 9193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4571,
+                      "id": 9191,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "9552:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "9570:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9461,14 +9461,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4572,
+                      "id": 9192,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9572:1:7",
+                      "src": "9590:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -9476,15 +9476,15 @@
                       },
                       "value": "1"
                     },
-                    "src": "9552:21:7",
+                    "src": "9570:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4574,
+                  "id": 9194,
                   "nodeType": "ExpressionStatement",
-                  "src": "9552:21:7"
+                  "src": "9570:21:8"
                 },
                 {
                   "expression": {
@@ -9492,12 +9492,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4576,
+                        "id": 9196,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4554,
-                        "src": "9594:13:7",
+                        "referencedDeclaration": 9174,
+                        "src": "9612:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -9511,18 +9511,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4575,
+                      "id": 9195,
                       "name": "Submission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3862,
-                      "src": "9583:10:7",
+                      "referencedDeclaration": 8482,
+                      "src": "9601:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4577,
+                    "id": 9197,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9530,20 +9530,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9583:25:7",
+                    "src": "9601:25:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4578,
+                  "id": 9198,
                   "nodeType": "ExpressionStatement",
-                  "src": "9583:25:7"
+                  "src": "9601:25:8"
                 }
               ]
             },
             "documentation": "@dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.\n @param destination Transaction target address.\n @param value Transaction ether value.\n @param data Transaction data payload.\n @return Returns transaction ID.",
-            "id": 4580,
+            "id": 9200,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -9552,49 +9552,49 @@
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4551,
+                    "id": 9171,
                     "name": "destination",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4544,
-                    "src": "9262:11:7",
+                    "referencedDeclaration": 9164,
+                    "src": "9280:11:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4552,
+                "id": 9172,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4550,
+                  "id": 9170,
                   "name": "notNull",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4033,
-                  "src": "9254:7:7",
+                  "referencedDeclaration": 8653,
+                  "src": "9272:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "9254:20:7"
+                "src": "9272:20:8"
               }
             ],
             "name": "addTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4549,
+              "id": 9169,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4544,
+                  "id": 9164,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9192:19:7",
+                  "scope": 9200,
+                  "src": "9210:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9602,10 +9602,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4543,
+                    "id": 9163,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9192:7:7",
+                    "src": "9210:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -9616,11 +9616,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4546,
+                  "id": 9166,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9213:10:7",
+                  "scope": 9200,
+                  "src": "9231:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9628,10 +9628,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4545,
+                    "id": 9165,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9213:4:7",
+                    "src": "9231:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9642,11 +9642,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4548,
+                  "id": 9168,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9225:10:7",
+                  "scope": 9200,
+                  "src": "9243:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9654,10 +9654,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4547,
+                    "id": 9167,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9225:5:7",
+                    "src": "9243:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -9667,20 +9667,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9191:45:7"
+              "src": "9209:45:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4555,
+              "id": 9175,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4554,
+                  "id": 9174,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9288:18:7",
+                  "scope": 9200,
+                  "src": "9306:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -9688,10 +9688,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4553,
+                    "id": 9173,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9288:4:7",
+                    "src": "9306:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -9701,19 +9701,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9287:20:7"
+              "src": "9305:20:8"
             },
-            "scope": 4851,
-            "src": "9168:447:7",
+            "scope": 9471,
+            "src": "9186:447:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4612,
+              "id": 9232,
               "nodeType": "Block",
-              "src": "9915:157:7",
+              "src": "9933:157:8",
               "statements": [
                 {
                   "body": {
@@ -9723,26 +9723,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4598,
+                          "id": 9218,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "9982:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "10000:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4600,
+                        "id": 9220,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4599,
+                          "id": 9219,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4582,
-                          "src": "9996:13:7",
+                          "referencedDeclaration": 9202,
+                          "src": "10014:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9753,37 +9753,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9982:28:7",
+                        "src": "10000:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4604,
+                      "id": 9224,
                       "indexExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4601,
+                          "id": 9221,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "10011:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "10029:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4603,
+                        "id": 9223,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4602,
+                          "id": 9222,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4588,
-                          "src": "10018:1:7",
+                          "referencedDeclaration": 9208,
+                          "src": "10036:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9794,7 +9794,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "10011:9:7",
+                        "src": "10029:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -9805,37 +9805,37 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "9982:39:7",
+                      "src": "10000:39:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4610,
+                    "id": 9230,
                     "nodeType": "IfStatement",
-                    "src": "9978:88:7",
+                    "src": "9996:88:8",
                     "trueBody": {
-                      "id": 4609,
+                      "id": 9229,
                       "nodeType": "Block",
-                      "src": "10023:43:7",
+                      "src": "10041:43:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4607,
+                            "id": 9227,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4605,
+                              "id": 9225,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4585,
-                              "src": "10041:5:7",
+                              "referencedDeclaration": 9205,
+                              "src": "10059:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -9846,14 +9846,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4606,
+                              "id": 9226,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "10050:1:7",
+                              "src": "10068:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -9861,15 +9861,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "10041:10:7",
+                            "src": "10059:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4608,
+                          "id": 9228,
                           "nodeType": "ExpressionStatement",
-                          "src": "10041:10:7"
+                          "src": "10059:10:8"
                         }
                       ]
                     }
@@ -9880,19 +9880,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4594,
+                    "id": 9214,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4591,
+                      "id": 9211,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4588,
-                      "src": "9942:1:7",
+                      "referencedDeclaration": 9208,
+                      "src": "9960:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -9904,18 +9904,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4592,
+                        "id": 9212,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "9946:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "9964:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4593,
+                      "id": 9213,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -9923,31 +9923,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9946:13:7",
+                      "src": "9964:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9942:17:7",
+                    "src": "9960:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4611,
+                  "id": 9231,
                   "initializationExpression": {
                     "assignments": [
-                      4588
+                      9208
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4588,
+                        "id": 9208,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4613,
-                        "src": "9930:6:7",
+                        "scope": 9233,
+                        "src": "9948:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -9955,10 +9955,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4587,
+                          "id": 9207,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "9930:4:7",
+                          "src": "9948:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -9968,18 +9968,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4590,
+                    "id": 9210,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4589,
+                      "id": 9209,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9939:1:7",
+                      "src": "9957:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -9988,12 +9988,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "9930:10:7"
+                    "src": "9948:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4596,
+                      "id": 9216,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -10001,15 +10001,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "9961:3:7",
+                      "src": "9979:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4595,
+                        "id": 9215,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4588,
-                        "src": "9961:1:7",
+                        "referencedDeclaration": 9208,
+                        "src": "9979:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10020,17 +10020,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4597,
+                    "id": 9217,
                     "nodeType": "ExpressionStatement",
-                    "src": "9961:3:7"
+                    "src": "9979:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "9925:141:7"
+                  "src": "9943:141:8"
                 }
               ]
             },
             "documentation": "@dev Returns number of confirmations of a transaction.\n @param transactionId Transaction ID.\n @return Number of confirmations.",
-            "id": 4613,
+            "id": 9233,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -10038,16 +10038,16 @@
             "name": "getConfirmationCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4583,
+              "id": 9203,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4582,
+                  "id": 9202,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4613,
-                  "src": "9842:18:7",
+                  "scope": 9233,
+                  "src": "9860:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10055,10 +10055,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4581,
+                    "id": 9201,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9842:4:7",
+                    "src": "9860:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -10068,20 +10068,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9841:20:7"
+              "src": "9859:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4586,
+              "id": 9206,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4585,
+                  "id": 9205,
                   "name": "count",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4613,
-                  "src": "9899:10:7",
+                  "scope": 9233,
+                  "src": "9917:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10089,10 +10089,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4584,
+                    "id": 9204,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9899:4:7",
+                    "src": "9917:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -10102,19 +10102,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9898:12:7"
+              "src": "9916:12:8"
             },
-            "scope": 4851,
-            "src": "9812:260:7",
+            "scope": 9471,
+            "src": "9830:260:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4653,
+              "id": 9273,
               "nodeType": "Block",
-              "src": "10445:197:7",
+              "src": "10463:197:8",
               "statements": [
                 {
                   "body": {
@@ -10124,7 +10124,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4645,
+                      "id": 9265,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -10135,19 +10135,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4638,
+                        "id": 9258,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4632,
+                          "id": 9252,
                           "name": "pending",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4615,
-                          "src": "10515:7:7",
+                          "referencedDeclaration": 9235,
+                          "src": "10533:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -10157,7 +10157,7 @@
                         "operator": "&&",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4637,
+                          "id": 9257,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10165,33 +10165,33 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "10526:25:7",
+                          "src": "10544:25:8",
                           "subExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4633,
+                                "id": 9253,
                                 "name": "transactions",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3895,
-                                "src": "10527:12:7",
+                                "referencedDeclaration": 8515,
+                                "src": "10545:12:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                   "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                                 }
                               },
-                              "id": 4635,
+                              "id": 9255,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4634,
+                                "id": 9254,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4623,
-                                "src": "10540:1:7",
+                                "referencedDeclaration": 9243,
+                                "src": "10558:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -10202,21 +10202,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10527:15:7",
+                              "src": "10545:15:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                                 "typeString": "struct MultiSigWallet.Transaction storage ref"
                               }
                             },
-                            "id": 4636,
+                            "id": 9256,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "10527:24:7",
+                            "referencedDeclaration": 8540,
+                            "src": "10545:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -10227,7 +10227,7 @@
                             "typeString": "bool"
                           }
                         },
-                        "src": "10515:36:7",
+                        "src": "10533:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -10241,19 +10241,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4644,
+                        "id": 9264,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4639,
+                          "id": 9259,
                           "name": "executed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4617,
-                          "src": "10555:8:7",
+                          "referencedDeclaration": 9237,
+                          "src": "10573:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -10267,26 +10267,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4640,
+                              "id": 9260,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "10567:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "10585:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4642,
+                            "id": 9262,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4641,
+                              "id": 9261,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4623,
-                              "src": "10580:1:7",
+                              "referencedDeclaration": 9243,
+                              "src": "10598:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -10297,63 +10297,63 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10567:15:7",
+                            "src": "10585:15:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4643,
+                          "id": 9263,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "10567:24:7",
+                          "referencedDeclaration": 8540,
+                          "src": "10585:24:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10555:36:7",
+                        "src": "10573:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "10515:76:7",
+                      "src": "10533:76:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4651,
+                    "id": 9271,
                     "nodeType": "IfStatement",
-                    "src": "10511:125:7",
+                    "src": "10529:125:8",
                     "trueBody": {
-                      "id": 4650,
+                      "id": 9270,
                       "nodeType": "Block",
-                      "src": "10593:43:7",
+                      "src": "10611:43:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4648,
+                            "id": 9268,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4646,
+                              "id": 9266,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4620,
-                              "src": "10611:5:7",
+                              "referencedDeclaration": 9240,
+                              "src": "10629:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -10364,14 +10364,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4647,
+                              "id": 9267,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "10620:1:7",
+                              "src": "10638:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -10379,15 +10379,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "10611:10:7",
+                            "src": "10629:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4649,
+                          "id": 9269,
                           "nodeType": "ExpressionStatement",
-                          "src": "10611:10:7"
+                          "src": "10629:10:8"
                         }
                       ]
                     }
@@ -10398,19 +10398,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4628,
+                    "id": 9248,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4626,
+                      "id": 9246,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4623,
-                      "src": "10472:1:7",
+                      "referencedDeclaration": 9243,
+                      "src": "10490:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -10420,36 +10420,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4627,
+                      "id": 9247,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "10476:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "10494:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10472:20:7",
+                    "src": "10490:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4652,
+                  "id": 9272,
                   "initializationExpression": {
                     "assignments": [
-                      4623
+                      9243
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4623,
+                        "id": 9243,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4654,
-                        "src": "10460:6:7",
+                        "scope": 9274,
+                        "src": "10478:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -10457,10 +10457,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4622,
+                          "id": 9242,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "10460:4:7",
+                          "src": "10478:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -10470,18 +10470,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4625,
+                    "id": 9245,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4624,
+                      "id": 9244,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "10469:1:7",
+                      "src": "10487:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -10490,12 +10490,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "10460:10:7"
+                    "src": "10478:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4630,
+                      "id": 9250,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -10503,15 +10503,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "10494:3:7",
+                      "src": "10512:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4629,
+                        "id": 9249,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4623,
-                        "src": "10494:1:7",
+                        "referencedDeclaration": 9243,
+                        "src": "10512:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10522,17 +10522,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4631,
+                    "id": 9251,
                     "nodeType": "ExpressionStatement",
-                    "src": "10494:3:7"
+                    "src": "10512:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "10455:181:7"
+                  "src": "10473:181:8"
                 }
               ]
             },
             "documentation": "@dev Returns total number of transactions after filers are applied.\n @param pending Include pending transactions.\n @param executed Include executed transactions.\n @return Total number of transactions after filters are applied.",
-            "id": 4654,
+            "id": 9274,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -10540,16 +10540,16 @@
             "name": "getTransactionCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4618,
+              "id": 9238,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4615,
+                  "id": 9235,
                   "name": "pending",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10363:12:7",
+                  "scope": 9274,
+                  "src": "10381:12:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10557,10 +10557,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4614,
+                    "id": 9234,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10363:4:7",
+                    "src": "10381:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -10571,11 +10571,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4617,
+                  "id": 9237,
                   "name": "executed",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10377:13:7",
+                  "scope": 9274,
+                  "src": "10395:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10583,10 +10583,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4616,
+                    "id": 9236,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10377:4:7",
+                    "src": "10395:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -10596,20 +10596,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10362:29:7"
+              "src": "10380:29:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4621,
+              "id": 9241,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4620,
+                  "id": 9240,
                   "name": "count",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10429:10:7",
+                  "scope": 9274,
+                  "src": "10447:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10617,10 +10617,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4619,
+                    "id": 9239,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10429:4:7",
+                    "src": "10447:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -10630,43 +10630,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10428:12:7"
+              "src": "10446:12:8"
             },
-            "scope": 4851,
-            "src": "10334:308:7",
+            "scope": 9471,
+            "src": "10352:308:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4662,
+              "id": 9282,
               "nodeType": "Block",
-              "src": "10799:30:7",
+              "src": "10817:30:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4660,
+                    "id": 9280,
                     "name": "owners",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3908,
-                    "src": "10816:6:7",
+                    "referencedDeclaration": 8528,
+                    "src": "10834:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                       "typeString": "address[] storage ref"
                     }
                   },
-                  "functionReturnParameters": 4659,
-                  "id": 4661,
+                  "functionReturnParameters": 9279,
+                  "id": 9281,
                   "nodeType": "Return",
-                  "src": "10809:13:7"
+                  "src": "10827:13:8"
                 }
               ]
             },
             "documentation": "@dev Returns list of owners.\n @return List of owner addresses.",
-            "id": 4663,
+            "id": 9283,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -10674,23 +10674,23 @@
             "name": "getOwners",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4655,
+              "id": 9275,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "10744:2:7"
+              "src": "10762:2:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4659,
+              "id": 9279,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4658,
+                  "id": 9278,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4663,
-                  "src": "10784:9:7",
+                  "scope": 9283,
+                  "src": "10802:9:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -10699,19 +10699,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4656,
+                      "id": 9276,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "10784:7:7",
+                      "src": "10802:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4657,
+                    "id": 9277,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "10784:9:7",
+                    "src": "10802:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -10721,32 +10721,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10783:11:7"
+              "src": "10801:11:8"
             },
-            "scope": 4851,
-            "src": "10726:103:7",
+            "scope": 9471,
+            "src": "10744:103:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4749,
+              "id": 9369,
               "nodeType": "Block",
-              "src": "11121:458:7",
+              "src": "11139:458:8",
               "statements": [
                 {
                   "assignments": [
-                    4674
+                    9294
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4674,
+                      "id": 9294,
                       "name": "confirmationsTemp",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11131:34:7",
+                      "scope": 9370,
+                      "src": "11149:34:8",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -10755,19 +10755,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4672,
+                          "id": 9292,
                           "name": "address",
                           "nodeType": "ElementaryTypeName",
-                          "src": "11131:7:7",
+                          "src": "11149:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4673,
+                        "id": 9293,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "11131:9:7",
+                        "src": "11149:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                           "typeString": "address[]"
@@ -10777,7 +10777,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4681,
+                  "id": 9301,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
@@ -10785,18 +10785,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4678,
+                          "id": 9298,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "11182:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "11200:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4679,
+                        "id": 9299,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
@@ -10804,7 +10804,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "11182:13:7",
+                        "src": "11200:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10818,39 +10818,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4677,
+                      "id": 9297,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "11168:13:7",
+                      "src": "11186:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (address[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4675,
+                          "id": 9295,
                           "name": "address",
                           "nodeType": "ElementaryTypeName",
-                          "src": "11172:7:7",
+                          "src": "11190:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4676,
+                        "id": 9296,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "11172:9:7",
+                        "src": "11190:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                           "typeString": "address[]"
                         }
                       }
                     },
-                    "id": 4680,
+                    "id": 9300,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10858,27 +10858,27 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11168:28:7",
+                    "src": "11186:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_memory",
                       "typeString": "address[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11131:65:7"
+                  "src": "11149:65:8"
                 },
                 {
                   "assignments": [
-                    4683
+                    9303
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4683,
+                      "id": 9303,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11206:10:7",
+                      "scope": 9370,
+                      "src": "11224:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -10886,10 +10886,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4682,
+                        "id": 9302,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "11206:4:7",
+                        "src": "11224:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10899,18 +10899,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4685,
+                  "id": 9305,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4684,
+                    "id": 9304,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "11219:1:7",
+                    "src": "11237:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -10919,18 +10919,18 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11206:14:7"
+                  "src": "11224:14:8"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4687,
+                      "id": 9307,
                       "name": "i",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11230:6:7",
+                      "scope": 9370,
+                      "src": "11248:6:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -10938,10 +10938,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4686,
+                        "id": 9306,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "11230:4:7",
+                        "src": "11248:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -10951,10 +10951,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4688,
+                  "id": 9308,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11230:6:7"
+                  "src": "11248:6:8"
                 },
                 {
                   "body": {
@@ -10964,26 +10964,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4700,
+                          "id": 9320,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "11298:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "11316:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4702,
+                        "id": 9322,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4701,
+                          "id": 9321,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4665,
-                          "src": "11312:13:7",
+                          "referencedDeclaration": 9285,
+                          "src": "11330:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -10994,37 +10994,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11298:28:7",
+                        "src": "11316:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4706,
+                      "id": 9326,
                       "indexExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4703,
+                          "id": 9323,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "11327:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "11345:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4705,
+                        "id": 9325,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4704,
+                          "id": 9324,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11334:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11352:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11035,7 +11035,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11327:9:7",
+                        "src": "11345:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -11046,25 +11046,25 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "11298:39:7",
+                      "src": "11316:39:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4720,
+                    "id": 9340,
                     "nodeType": "IfStatement",
-                    "src": "11294:142:7",
+                    "src": "11312:142:8",
                     "trueBody": {
-                      "id": 4719,
+                      "id": 9339,
                       "nodeType": "Block",
-                      "src": "11339:97:7",
+                      "src": "11357:97:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4713,
+                            "id": 9333,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -11073,26 +11073,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4707,
+                                "id": 9327,
                                 "name": "confirmationsTemp",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4674,
-                                "src": "11357:17:7",
+                                "referencedDeclaration": 9294,
+                                "src": "11375:17:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                   "typeString": "address[] memory"
                                 }
                               },
-                              "id": 4709,
+                              "id": 9329,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4708,
+                                "id": 9328,
                                 "name": "count",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4683,
-                                "src": "11375:5:7",
+                                "referencedDeclaration": 9303,
+                                "src": "11393:5:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -11103,7 +11103,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "11357:24:7",
+                              "src": "11375:24:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -11115,26 +11115,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4710,
+                                "id": 9330,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "11384:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "11402:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4712,
+                              "id": 9332,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4711,
+                                "id": 9331,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4687,
-                                "src": "11391:1:7",
+                                "referencedDeclaration": 9307,
+                                "src": "11409:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -11145,38 +11145,38 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11384:9:7",
+                              "src": "11402:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "11357:36:7",
+                            "src": "11375:36:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4714,
+                          "id": 9334,
                           "nodeType": "ExpressionStatement",
-                          "src": "11357:36:7"
+                          "src": "11375:36:8"
                         },
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4717,
+                            "id": 9337,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4715,
+                              "id": 9335,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4683,
-                              "src": "11411:5:7",
+                              "referencedDeclaration": 9303,
+                              "src": "11429:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -11187,14 +11187,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4716,
+                              "id": 9336,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11420:1:7",
+                              "src": "11438:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -11202,15 +11202,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "11411:10:7",
+                            "src": "11429:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4718,
+                          "id": 9338,
                           "nodeType": "ExpressionStatement",
-                          "src": "11411:10:7"
+                          "src": "11429:10:8"
                         }
                       ]
                     }
@@ -11221,19 +11221,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4696,
+                    "id": 9316,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4693,
+                      "id": 9313,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4687,
-                      "src": "11258:1:7",
+                      "referencedDeclaration": 9307,
+                      "src": "11276:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11245,18 +11245,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4694,
+                        "id": 9314,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "11262:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "11280:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4695,
+                      "id": 9315,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -11264,35 +11264,35 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11262:13:7",
+                      "src": "11280:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11258:17:7",
+                    "src": "11276:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4721,
+                  "id": 9341,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4691,
+                      "id": 9311,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4689,
+                        "id": 9309,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11251:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11269:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11303,14 +11303,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4690,
+                        "id": 9310,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "11255:1:7",
+                        "src": "11273:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -11318,20 +11318,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "11251:5:7",
+                      "src": "11269:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4692,
+                    "id": 9312,
                     "nodeType": "ExpressionStatement",
-                    "src": "11251:5:7"
+                    "src": "11269:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4698,
+                      "id": 9318,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11339,15 +11339,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "11277:3:7",
+                      "src": "11295:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4697,
+                        "id": 9317,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11277:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11295:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11358,29 +11358,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4699,
+                    "id": 9319,
                     "nodeType": "ExpressionStatement",
-                    "src": "11277:3:7"
+                    "src": "11295:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "11246:190:7"
+                  "src": "11264:190:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4728,
+                    "id": 9348,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4722,
+                      "id": 9342,
                       "name": "_confirmations",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4669,
-                      "src": "11445:14:7",
+                      "referencedDeclaration": 9289,
+                      "src": "11463:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
@@ -11393,12 +11393,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4726,
+                          "id": 9346,
                           "name": "count",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4683,
-                          "src": "11476:5:7",
+                          "referencedDeclaration": 9303,
+                          "src": "11494:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11412,39 +11412,39 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4725,
+                        "id": 9345,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "NewExpression",
-                        "src": "11462:13:7",
+                        "src": "11480:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
                           "typeString": "function (uint256) pure returns (address[] memory)"
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 4723,
+                            "id": 9343,
                             "name": "address",
                             "nodeType": "ElementaryTypeName",
-                            "src": "11466:7:7",
+                            "src": "11484:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4724,
+                          "id": 9344,
                           "length": null,
                           "nodeType": "ArrayTypeName",
-                          "src": "11466:9:7",
+                          "src": "11484:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                             "typeString": "address[]"
                           }
                         }
                       },
-                      "id": 4727,
+                      "id": 9347,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11452,27 +11452,27 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11462:20:7",
+                      "src": "11480:20:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory",
                         "typeString": "address[] memory"
                       }
                     },
-                    "src": "11445:37:7",
+                    "src": "11463:37:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                       "typeString": "address[] memory"
                     }
                   },
-                  "id": 4729,
+                  "id": 9349,
                   "nodeType": "ExpressionStatement",
-                  "src": "11445:37:7"
+                  "src": "11463:37:8"
                 },
                 {
                   "body": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4746,
+                      "id": 9366,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11481,26 +11481,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4740,
+                          "id": 9360,
                           "name": "_confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4669,
-                          "src": "11532:14:7",
+                          "referencedDeclaration": 9289,
+                          "src": "11550:14:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                             "typeString": "address[] memory"
                           }
                         },
-                        "id": 4742,
+                        "id": 9362,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4741,
+                          "id": 9361,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11547:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11565:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11511,7 +11511,7 @@
                         "isPure": false,
                         "lValueRequested": true,
                         "nodeType": "IndexAccess",
-                        "src": "11532:17:7",
+                        "src": "11550:17:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -11523,26 +11523,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4743,
+                          "id": 9363,
                           "name": "confirmationsTemp",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4674,
-                          "src": "11552:17:7",
+                          "referencedDeclaration": 9294,
+                          "src": "11570:17:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                             "typeString": "address[] memory"
                           }
                         },
-                        "id": 4745,
+                        "id": 9365,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4744,
+                          "id": 9364,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11570:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11588:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -11553,21 +11553,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11552:20:7",
+                        "src": "11570:20:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "11532:40:7",
+                      "src": "11550:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4747,
+                    "id": 9367,
                     "nodeType": "ExpressionStatement",
-                    "src": "11532:40:7"
+                    "src": "11550:40:8"
                   },
                   "condition": {
                     "argumentTypes": null,
@@ -11575,19 +11575,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4736,
+                    "id": 9356,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4734,
+                      "id": 9354,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4687,
-                      "src": "11504:1:7",
+                      "referencedDeclaration": 9307,
+                      "src": "11522:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -11597,40 +11597,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4735,
+                      "id": 9355,
                       "name": "count",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4683,
-                      "src": "11508:5:7",
+                      "referencedDeclaration": 9303,
+                      "src": "11526:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11504:9:7",
+                    "src": "11522:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4748,
+                  "id": 9368,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4732,
+                      "id": 9352,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4730,
+                        "id": 9350,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11497:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11515:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11641,14 +11641,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4731,
+                        "id": 9351,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "11501:1:7",
+                        "src": "11519:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -11656,20 +11656,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "11497:5:7",
+                      "src": "11515:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4733,
+                    "id": 9353,
                     "nodeType": "ExpressionStatement",
-                    "src": "11497:5:7"
+                    "src": "11515:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4738,
+                      "id": 9358,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11677,15 +11677,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "11515:3:7",
+                      "src": "11533:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4737,
+                        "id": 9357,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11515:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11533:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11696,17 +11696,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4739,
+                    "id": 9359,
                     "nodeType": "ExpressionStatement",
-                    "src": "11515:3:7"
+                    "src": "11533:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "11492:80:7"
+                  "src": "11510:80:8"
                 }
               ]
             },
             "documentation": "@dev Returns array with owner addresses, which confirmed transaction.\n @param transactionId Transaction ID.\n @return Returns array of owner addresses.",
-            "id": 4750,
+            "id": 9370,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -11714,16 +11714,16 @@
             "name": "getConfirmations",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4666,
+              "id": 9286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4665,
+                  "id": 9285,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4750,
-                  "src": "11034:18:7",
+                  "scope": 9370,
+                  "src": "11052:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11731,10 +11731,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4664,
+                    "id": 9284,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11034:4:7",
+                    "src": "11052:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -11744,20 +11744,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11033:20:7"
+              "src": "11051:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4670,
+              "id": 9290,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4669,
+                  "id": 9289,
                   "name": "_confirmations",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4750,
-                  "src": "11091:24:7",
+                  "scope": 9370,
+                  "src": "11109:24:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -11766,19 +11766,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4667,
+                      "id": 9287,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "11091:7:7",
+                      "src": "11109:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4668,
+                    "id": 9288,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "11091:9:7",
+                    "src": "11109:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -11788,32 +11788,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11090:26:7"
+              "src": "11108:26:8"
             },
-            "scope": 4851,
-            "src": "11008:571:7",
+            "scope": 9471,
+            "src": "11026:571:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4849,
+              "id": 9469,
               "nodeType": "Block",
-              "src": "12069:524:7",
+              "src": "12087:524:8",
               "statements": [
                 {
                   "assignments": [
-                    4767
+                    9387
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4767,
+                      "id": 9387,
                       "name": "transactionIdsTemp",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12079:32:7",
+                      "scope": 9470,
+                      "src": "12097:32:8",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -11822,19 +11822,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4765,
+                          "id": 9385,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "12079:4:7",
+                          "src": "12097:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4766,
+                        "id": 9386,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "12079:6:7",
+                        "src": "12097:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                           "typeString": "uint256[]"
@@ -11844,18 +11844,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4773,
+                  "id": 9393,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4771,
+                        "id": 9391,
                         "name": "transactionCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3912,
-                        "src": "12125:16:7",
+                        "referencedDeclaration": 8532,
+                        "src": "12143:16:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11869,39 +11869,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4770,
+                      "id": 9390,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "12114:10:7",
+                      "src": "12132:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint256_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint256[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4768,
+                          "id": 9388,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "12118:4:7",
+                          "src": "12136:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4769,
+                        "id": 9389,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "12118:6:7",
+                        "src": "12136:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                           "typeString": "uint256[]"
                         }
                       }
                     },
-                    "id": 4772,
+                    "id": 9392,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11909,27 +11909,27 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "12114:28:7",
+                    "src": "12132:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_memory",
                       "typeString": "uint256[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12079:63:7"
+                  "src": "12097:63:8"
                 },
                 {
                   "assignments": [
-                    4775
+                    9395
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4775,
+                      "id": 9395,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12152:10:7",
+                      "scope": 9470,
+                      "src": "12170:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -11937,10 +11937,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4774,
+                        "id": 9394,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "12152:4:7",
+                        "src": "12170:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -11950,18 +11950,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4777,
+                  "id": 9397,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4776,
+                    "id": 9396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "12165:1:7",
+                    "src": "12183:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -11970,18 +11970,18 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12152:14:7"
+                  "src": "12170:14:8"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4779,
+                      "id": 9399,
                       "name": "i",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12176:6:7",
+                      "scope": 9470,
+                      "src": "12194:6:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -11989,10 +11989,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4778,
+                        "id": 9398,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "12176:4:7",
+                        "src": "12194:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12002,10 +12002,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4780,
+                  "id": 9400,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12176:6:7"
+                  "src": "12194:6:8"
                 },
                 {
                   "body": {
@@ -12015,7 +12015,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4804,
+                      "id": 9424,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12026,19 +12026,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4797,
+                        "id": 9417,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4791,
+                          "id": 9411,
                           "name": "pending",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4756,
-                          "src": "12247:7:7",
+                          "referencedDeclaration": 9376,
+                          "src": "12265:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -12048,7 +12048,7 @@
                         "operator": "&&",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4796,
+                          "id": 9416,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12056,33 +12056,33 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "12258:25:7",
+                          "src": "12276:25:8",
                           "subExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4792,
+                                "id": 9412,
                                 "name": "transactions",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3895,
-                                "src": "12259:12:7",
+                                "referencedDeclaration": 8515,
+                                "src": "12277:12:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                   "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                                 }
                               },
-                              "id": 4794,
+                              "id": 9414,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4793,
+                                "id": 9413,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4779,
-                                "src": "12272:1:7",
+                                "referencedDeclaration": 9399,
+                                "src": "12290:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -12093,21 +12093,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12259:15:7",
+                              "src": "12277:15:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                                 "typeString": "struct MultiSigWallet.Transaction storage ref"
                               }
                             },
-                            "id": 4795,
+                            "id": 9415,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "12259:24:7",
+                            "referencedDeclaration": 8540,
+                            "src": "12277:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -12118,7 +12118,7 @@
                             "typeString": "bool"
                           }
                         },
-                        "src": "12247:36:7",
+                        "src": "12265:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -12132,19 +12132,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4803,
+                        "id": 9423,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4798,
+                          "id": 9418,
                           "name": "executed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4758,
-                          "src": "12299:8:7",
+                          "referencedDeclaration": 9378,
+                          "src": "12317:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -12158,26 +12158,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4799,
+                              "id": 9419,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "12311:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "12329:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4801,
+                            "id": 9421,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4800,
+                              "id": 9420,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4779,
-                              "src": "12324:1:7",
+                              "referencedDeclaration": 9399,
+                              "src": "12342:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12188,51 +12188,51 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "12311:15:7",
+                            "src": "12329:15:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4802,
+                          "id": 9422,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "12311:24:7",
+                          "referencedDeclaration": 8540,
+                          "src": "12329:24:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "12299:36:7",
+                        "src": "12317:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "12247:88:7",
+                      "src": "12265:88:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4816,
+                    "id": 9436,
                     "nodeType": "IfStatement",
-                    "src": "12243:196:7",
+                    "src": "12261:196:8",
                     "trueBody": {
-                      "id": 4815,
+                      "id": 9435,
                       "nodeType": "Block",
-                      "src": "12349:90:7",
+                      "src": "12367:90:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4809,
+                            "id": 9429,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12241,26 +12241,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4805,
+                                "id": 9425,
                                 "name": "transactionIdsTemp",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4767,
-                                "src": "12367:18:7",
+                                "referencedDeclaration": 9387,
+                                "src": "12385:18:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                                   "typeString": "uint256[] memory"
                                 }
                               },
-                              "id": 4807,
+                              "id": 9427,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4806,
+                                "id": 9426,
                                 "name": "count",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4775,
-                                "src": "12386:5:7",
+                                "referencedDeclaration": 9395,
+                                "src": "12404:5:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -12271,7 +12271,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "12367:25:7",
+                              "src": "12385:25:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12281,43 +12281,43 @@
                             "operator": "=",
                             "rightHandSide": {
                               "argumentTypes": null,
-                              "id": 4808,
+                              "id": 9428,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4779,
-                              "src": "12395:1:7",
+                              "referencedDeclaration": 9399,
+                              "src": "12413:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "12367:29:7",
+                            "src": "12385:29:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4810,
+                          "id": 9430,
                           "nodeType": "ExpressionStatement",
-                          "src": "12367:29:7"
+                          "src": "12385:29:8"
                         },
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4813,
+                            "id": 9433,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4811,
+                              "id": 9431,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4775,
-                              "src": "12414:5:7",
+                              "referencedDeclaration": 9395,
+                              "src": "12432:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -12328,14 +12328,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4812,
+                              "id": 9432,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "12423:1:7",
+                              "src": "12441:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -12343,15 +12343,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "12414:10:7",
+                            "src": "12432:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4814,
+                          "id": 9434,
                           "nodeType": "ExpressionStatement",
-                          "src": "12414:10:7"
+                          "src": "12432:10:8"
                         }
                       ]
                     }
@@ -12362,19 +12362,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4787,
+                    "id": 9407,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4785,
+                      "id": 9405,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4779,
-                      "src": "12204:1:7",
+                      "referencedDeclaration": 9399,
+                      "src": "12222:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12384,40 +12384,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4786,
+                      "id": 9406,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "12208:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "12226:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "12204:20:7",
+                    "src": "12222:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4817,
+                  "id": 9437,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4783,
+                      "id": 9403,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4781,
+                        "id": 9401,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12197:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12215:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12428,14 +12428,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4782,
+                        "id": 9402,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "12201:1:7",
+                        "src": "12219:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -12443,20 +12443,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "12197:5:7",
+                      "src": "12215:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4784,
+                    "id": 9404,
                     "nodeType": "ExpressionStatement",
-                    "src": "12197:5:7"
+                    "src": "12215:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4789,
+                      "id": 9409,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12464,15 +12464,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "12226:3:7",
+                      "src": "12244:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4788,
+                        "id": 9408,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12226:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12244:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12483,29 +12483,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4790,
+                    "id": 9410,
                     "nodeType": "ExpressionStatement",
-                    "src": "12226:3:7"
+                    "src": "12244:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "12192:247:7"
+                  "src": "12210:247:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4826,
+                    "id": 9446,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4818,
+                      "id": 9438,
                       "name": "_transactionIds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4762,
-                      "src": "12448:15:7",
+                      "referencedDeclaration": 9382,
+                      "src": "12466:15:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                         "typeString": "uint256[] memory"
@@ -12522,19 +12522,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4824,
+                          "id": 9444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4822,
+                            "id": 9442,
                             "name": "to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4754,
-                            "src": "12477:2:7",
+                            "referencedDeclaration": 9374,
+                            "src": "12495:2:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -12544,18 +12544,18 @@
                           "operator": "-",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4823,
+                            "id": 9443,
                             "name": "from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4752,
-                            "src": "12482:4:7",
+                            "referencedDeclaration": 9372,
+                            "src": "12500:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "12477:9:7",
+                          "src": "12495:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -12569,39 +12569,39 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4821,
+                        "id": 9441,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "NewExpression",
-                        "src": "12466:10:7",
+                        "src": "12484:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint256_$dyn_memory_$",
                           "typeString": "function (uint256) pure returns (uint256[] memory)"
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 4819,
+                            "id": 9439,
                             "name": "uint",
                             "nodeType": "ElementaryTypeName",
-                            "src": "12470:4:7",
+                            "src": "12488:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4820,
+                          "id": 9440,
                           "length": null,
                           "nodeType": "ArrayTypeName",
-                          "src": "12470:6:7",
+                          "src": "12488:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                             "typeString": "uint256[]"
                           }
                         }
                       },
-                      "id": 4825,
+                      "id": 9445,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12609,27 +12609,27 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "12466:21:7",
+                      "src": "12484:21:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_memory",
                         "typeString": "uint256[] memory"
                       }
                     },
-                    "src": "12448:39:7",
+                    "src": "12466:39:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                       "typeString": "uint256[] memory"
                     }
                   },
-                  "id": 4827,
+                  "id": 9447,
                   "nodeType": "ExpressionStatement",
-                  "src": "12448:39:7"
+                  "src": "12466:39:8"
                 },
                 {
                   "body": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4846,
+                      "id": 9466,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12638,37 +12638,37 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4838,
+                          "id": 9458,
                           "name": "_transactionIds",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4762,
-                          "src": "12537:15:7",
+                          "referencedDeclaration": 9382,
+                          "src": "12555:15:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                             "typeString": "uint256[] memory"
                           }
                         },
-                        "id": 4842,
+                        "id": 9462,
                         "indexExpression": {
                           "argumentTypes": null,
                           "commonType": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4841,
+                          "id": 9461,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4839,
+                            "id": 9459,
                             "name": "i",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4779,
-                            "src": "12553:1:7",
+                            "referencedDeclaration": 9399,
+                            "src": "12571:1:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -12678,18 +12678,18 @@
                           "operator": "-",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4840,
+                            "id": 9460,
                             "name": "from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4752,
-                            "src": "12557:4:7",
+                            "referencedDeclaration": 9372,
+                            "src": "12575:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "12553:8:7",
+                          "src": "12571:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -12700,7 +12700,7 @@
                         "isPure": false,
                         "lValueRequested": true,
                         "nodeType": "IndexAccess",
-                        "src": "12537:25:7",
+                        "src": "12555:25:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12712,26 +12712,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4843,
+                          "id": 9463,
                           "name": "transactionIdsTemp",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4767,
-                          "src": "12565:18:7",
+                          "referencedDeclaration": 9387,
+                          "src": "12583:18:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                             "typeString": "uint256[] memory"
                           }
                         },
-                        "id": 4845,
+                        "id": 9465,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4844,
+                          "id": 9464,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4779,
-                          "src": "12584:1:7",
+                          "referencedDeclaration": 9399,
+                          "src": "12602:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -12742,21 +12742,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "12565:21:7",
+                        "src": "12583:21:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "12537:49:7",
+                      "src": "12555:49:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4847,
+                    "id": 9467,
                     "nodeType": "ExpressionStatement",
-                    "src": "12537:49:7"
+                    "src": "12555:49:8"
                   },
                   "condition": {
                     "argumentTypes": null,
@@ -12764,19 +12764,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4834,
+                    "id": 9454,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4832,
+                      "id": 9452,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4779,
-                      "src": "12512:1:7",
+                      "referencedDeclaration": 9399,
+                      "src": "12530:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -12786,40 +12786,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4833,
+                      "id": 9453,
                       "name": "to",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4754,
-                      "src": "12516:2:7",
+                      "referencedDeclaration": 9374,
+                      "src": "12534:2:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "12512:6:7",
+                    "src": "12530:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4848,
+                  "id": 9468,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4830,
+                      "id": 9450,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4828,
+                        "id": 9448,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12502:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12520:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12829,31 +12829,31 @@
                       "operator": "=",
                       "rightHandSide": {
                         "argumentTypes": null,
-                        "id": 4829,
+                        "id": 9449,
                         "name": "from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4752,
-                        "src": "12506:4:7",
+                        "referencedDeclaration": 9372,
+                        "src": "12524:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "12502:8:7",
+                      "src": "12520:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4831,
+                    "id": 9451,
                     "nodeType": "ExpressionStatement",
-                    "src": "12502:8:7"
+                    "src": "12520:8:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4836,
+                      "id": 9456,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12861,15 +12861,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "12520:3:7",
+                      "src": "12538:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4835,
+                        "id": 9455,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12520:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12538:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -12880,17 +12880,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4837,
+                    "id": 9457,
                     "nodeType": "ExpressionStatement",
-                    "src": "12520:3:7"
+                    "src": "12538:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "12497:89:7"
+                  "src": "12515:89:8"
                 }
               ]
             },
             "documentation": "@dev Returns list of transaction IDs in defined range.\n @param from Index start position of transaction array.\n @param to Index end position of transaction array.\n @param pending Include pending transactions.\n @param executed Include executed transactions.\n @return Returns array of transaction IDs.",
-            "id": 4850,
+            "id": 9470,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -12898,16 +12898,16 @@
             "name": "getTransactionIds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4759,
+              "id": 9379,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4752,
+                  "id": 9372,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11955:9:7",
+                  "scope": 9470,
+                  "src": "11973:9:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -12915,10 +12915,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4751,
+                    "id": 9371,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11955:4:7",
+                    "src": "11973:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -12929,11 +12929,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4754,
+                  "id": 9374,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11966:7:7",
+                  "scope": 9470,
+                  "src": "11984:7:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -12941,10 +12941,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4753,
+                    "id": 9373,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11966:4:7",
+                    "src": "11984:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -12955,11 +12955,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4756,
+                  "id": 9376,
                   "name": "pending",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11975:12:7",
+                  "scope": 9470,
+                  "src": "11993:12:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -12967,10 +12967,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4755,
+                    "id": 9375,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11975:4:7",
+                    "src": "11993:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -12981,11 +12981,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4758,
+                  "id": 9378,
                   "name": "executed",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11989:13:7",
+                  "scope": 9470,
+                  "src": "12007:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -12993,10 +12993,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4757,
+                    "id": 9377,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11989:4:7",
+                    "src": "12007:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -13006,20 +13006,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11954:49:7"
+              "src": "11972:49:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4763,
+              "id": 9383,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4762,
+                  "id": 9382,
                   "name": "_transactionIds",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "12041:22:7",
+                  "scope": 9470,
+                  "src": "12059:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13028,19 +13028,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4760,
+                      "id": 9380,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
-                      "src": "12041:4:7",
+                      "src": "12059:4:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4761,
+                    "id": 9381,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "12041:6:7",
+                    "src": "12059:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                       "typeString": "uint256[]"
@@ -13050,33 +13050,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "12040:24:7"
+              "src": "12058:24:8"
             },
-            "scope": 4851,
-            "src": "11928:665:7",
+            "scope": 9471,
+            "src": "11946:665:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 4852,
-        "src": "187:12408:7"
+        "scope": 9472,
+        "src": "205:12408:8"
       }
     ],
-    "src": "0:12596:7"
+    "src": "0:12614:8"
   },
   "legacyAST": {
     "absolutePath": "contracts/MultiSigWallet.sol",
     "exportedSymbols": {
       "MultiSigWallet": [
-        4851
+        9471
       ]
     },
-    "id": 4852,
+    "id": 9472,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 3846,
+        "id": 8466,
         "literals": [
           "solidity",
           "^",
@@ -13084,7 +13084,7 @@
           ".15"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:7"
+        "src": "0:24:8"
       },
       {
         "baseContracts": [],
@@ -13092,9 +13092,9 @@
         "contractKind": "contract",
         "documentation": "@title Multisignature wallet - Allows multiple parties to agree on transactions before execution.\n @author Stefan George - <stefan.george@consensys.net>",
         "fullyImplemented": true,
-        "id": 4851,
+        "id": 9471,
         "linearizedBaseContracts": [
-          4851
+          9471
         ],
         "name": "MultiSigWallet",
         "nodeType": "ContractDefinition",
@@ -13102,21 +13102,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3852,
+            "id": 8472,
             "name": "Confirmation",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3851,
+              "id": 8471,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3848,
+                  "id": 8468,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3852,
-                  "src": "267:22:7",
+                  "scope": 8472,
+                  "src": "285:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13124,10 +13124,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3847,
+                    "id": 8467,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "267:7:7",
+                    "src": "285:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13138,12 +13138,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3850,
+                  "id": 8470,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3852,
-                  "src": "291:26:7",
+                  "scope": 8472,
+                  "src": "309:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13151,10 +13151,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3849,
+                    "id": 8469,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "291:4:7",
+                    "src": "309:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13164,28 +13164,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "266:52:7"
+              "src": "284:52:8"
             },
-            "src": "248:71:7"
+            "src": "266:71:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3858,
+            "id": 8478,
             "name": "Revocation",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3857,
+              "id": 8477,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3854,
+                  "id": 8474,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3858,
-                  "src": "341:22:7",
+                  "scope": 8478,
+                  "src": "359:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13193,10 +13193,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3853,
+                    "id": 8473,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "341:7:7",
+                    "src": "359:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13207,12 +13207,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3856,
+                  "id": 8476,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3858,
-                  "src": "365:26:7",
+                  "scope": 8478,
+                  "src": "383:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13220,10 +13220,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3855,
+                    "id": 8475,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "365:4:7",
+                    "src": "383:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13233,28 +13233,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "340:52:7"
+              "src": "358:52:8"
             },
-            "src": "324:69:7"
+            "src": "342:69:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3862,
+            "id": 8482,
             "name": "Submission",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3861,
+              "id": 8481,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3860,
+                  "id": 8480,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3862,
-                  "src": "415:26:7",
+                  "scope": 8482,
+                  "src": "433:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13262,10 +13262,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3859,
+                    "id": 8479,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "415:4:7",
+                    "src": "433:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13275,28 +13275,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "414:28:7"
+              "src": "432:28:8"
             },
-            "src": "398:45:7"
+            "src": "416:45:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3866,
+            "id": 8486,
             "name": "Execution",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3865,
+              "id": 8485,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3864,
+                  "id": 8484,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3866,
-                  "src": "464:26:7",
+                  "scope": 8486,
+                  "src": "482:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13304,10 +13304,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3863,
+                    "id": 8483,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "464:4:7",
+                    "src": "482:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13317,28 +13317,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "463:28:7"
+              "src": "481:28:8"
             },
-            "src": "448:44:7"
+            "src": "466:44:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3870,
+            "id": 8490,
             "name": "ExecutionFailure",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3869,
+              "id": 8489,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3868,
+                  "id": 8488,
                   "indexed": true,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3870,
-                  "src": "520:26:7",
+                  "scope": 8490,
+                  "src": "538:26:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13346,10 +13346,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3867,
+                    "id": 8487,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "520:4:7",
+                    "src": "538:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13359,28 +13359,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "519:28:7"
+              "src": "537:28:8"
             },
-            "src": "497:51:7"
+            "src": "515:51:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3876,
+            "id": 8496,
             "name": "Deposit",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3875,
+              "id": 8495,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3872,
+                  "id": 8492,
                   "indexed": true,
                   "name": "sender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3876,
-                  "src": "567:22:7",
+                  "scope": 8496,
+                  "src": "585:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13388,10 +13388,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3871,
+                    "id": 8491,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "567:7:7",
+                    "src": "585:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13402,12 +13402,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 3874,
+                  "id": 8494,
                   "indexed": false,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3876,
-                  "src": "591:10:7",
+                  "scope": 8496,
+                  "src": "609:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13415,10 +13415,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3873,
+                    "id": 8493,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "591:4:7",
+                    "src": "609:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13428,28 +13428,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "566:36:7"
+              "src": "584:36:8"
             },
-            "src": "553:50:7"
+            "src": "571:50:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3880,
+            "id": 8500,
             "name": "OwnerAddition",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3879,
+              "id": 8499,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3878,
+                  "id": 8498,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3880,
-                  "src": "628:21:7",
+                  "scope": 8500,
+                  "src": "646:21:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13457,10 +13457,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3877,
+                    "id": 8497,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "628:7:7",
+                    "src": "646:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13470,28 +13470,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "627:23:7"
+              "src": "645:23:8"
             },
-            "src": "608:43:7"
+            "src": "626:43:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3884,
+            "id": 8504,
             "name": "OwnerRemoval",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3883,
+              "id": 8503,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3882,
+                  "id": 8502,
                   "indexed": true,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3884,
-                  "src": "675:21:7",
+                  "scope": 8504,
+                  "src": "693:21:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13499,10 +13499,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3881,
+                    "id": 8501,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "675:7:7",
+                    "src": "693:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -13512,28 +13512,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "674:23:7"
+              "src": "692:23:8"
             },
-            "src": "656:42:7"
+            "src": "674:42:8"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 3888,
+            "id": 8508,
             "name": "RequirementChange",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 3887,
+              "id": 8507,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3886,
+                  "id": 8506,
                   "indexed": false,
                   "name": "required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3888,
-                  "src": "727:13:7",
+                  "scope": 8508,
+                  "src": "745:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -13541,10 +13541,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3885,
+                    "id": 8505,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "727:4:7",
+                    "src": "745:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -13554,17 +13554,17 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "726:15:7"
+              "src": "744:15:8"
             },
-            "src": "703:39:7"
+            "src": "721:39:8"
           },
           {
             "constant": true,
-            "id": 3891,
+            "id": 8511,
             "name": "MAX_OWNER_COUNT",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "781:41:7",
+            "scope": 9471,
+            "src": "799:41:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13572,10 +13572,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3889,
+              "id": 8509,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "781:4:7",
+              "src": "799:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -13584,14 +13584,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3530",
-              "id": 3890,
+              "id": 8510,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "820:2:7",
+              "src": "838:2:8",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_50_by_1",
@@ -13603,44 +13603,44 @@
           },
           {
             "constant": false,
-            "id": 3895,
+            "id": 8515,
             "name": "transactions",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "860:48:7",
+            "scope": 9471,
+            "src": "878:48:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
               "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction)"
             },
             "typeName": {
-              "id": 3894,
+              "id": 8514,
               "keyType": {
-                "id": 3892,
+                "id": 8512,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "868:4:7",
+                "src": "886:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "860:28:7",
+              "src": "878:28:8",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 3893,
+                "id": 8513,
                 "name": "Transaction",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 3921,
-                "src": "876:11:7",
+                "referencedDeclaration": 8541,
+                "src": "894:11:8",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                   "typeString": "struct MultiSigWallet.Transaction"
                 }
               }
@@ -13650,11 +13650,11 @@
           },
           {
             "constant": false,
-            "id": 3901,
+            "id": 8521,
             "name": "confirmations",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "914:62:7",
+            "scope": 9471,
+            "src": "932:62:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13662,46 +13662,46 @@
               "typeString": "mapping(uint256 => mapping(address => bool))"
             },
             "typeName": {
-              "id": 3900,
+              "id": 8520,
               "keyType": {
-                "id": 3896,
+                "id": 8516,
                 "name": "uint",
                 "nodeType": "ElementaryTypeName",
-                "src": "922:4:7",
+                "src": "940:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_uint256",
                   "typeString": "uint256"
                 }
               },
               "nodeType": "Mapping",
-              "src": "914:41:7",
+              "src": "932:41:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                 "typeString": "mapping(uint256 => mapping(address => bool))"
               },
               "valueType": {
-                "id": 3899,
+                "id": 8519,
                 "keyType": {
-                  "id": 3897,
+                  "id": 8517,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "938:7:7",
+                  "src": "956:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "930:24:7",
+                "src": "948:24:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                   "typeString": "mapping(address => bool)"
                 },
                 "valueType": {
-                  "id": 3898,
+                  "id": 8518,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "949:4:7",
+                  "src": "967:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -13714,11 +13714,11 @@
           },
           {
             "constant": false,
-            "id": 3905,
+            "id": 8525,
             "name": "isOwner",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "982:39:7",
+            "scope": 9471,
+            "src": "1000:39:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13726,28 +13726,28 @@
               "typeString": "mapping(address => bool)"
             },
             "typeName": {
-              "id": 3904,
+              "id": 8524,
               "keyType": {
-                "id": 3902,
+                "id": 8522,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "990:7:7",
+                "src": "1008:7:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "982:24:7",
+              "src": "1000:24:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                 "typeString": "mapping(address => bool)"
               },
               "valueType": {
-                "id": 3903,
+                "id": 8523,
                 "name": "bool",
                 "nodeType": "ElementaryTypeName",
-                "src": "1001:4:7",
+                "src": "1019:4:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_bool",
                   "typeString": "bool"
@@ -13759,11 +13759,11 @@
           },
           {
             "constant": false,
-            "id": 3908,
+            "id": 8528,
             "name": "owners",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1027:23:7",
+            "scope": 9471,
+            "src": "1045:23:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13772,19 +13772,19 @@
             },
             "typeName": {
               "baseType": {
-                "id": 3906,
+                "id": 8526,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "1027:7:7",
+                "src": "1045:7:8",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
-              "id": 3907,
+              "id": 8527,
               "length": null,
               "nodeType": "ArrayTypeName",
-              "src": "1027:9:7",
+              "src": "1045:9:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                 "typeString": "address[]"
@@ -13795,11 +13795,11 @@
           },
           {
             "constant": false,
-            "id": 3910,
+            "id": 8530,
             "name": "required",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1056:20:7",
+            "scope": 9471,
+            "src": "1074:20:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13807,10 +13807,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3909,
+              "id": 8529,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "1056:4:7",
+              "src": "1074:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -13821,11 +13821,11 @@
           },
           {
             "constant": false,
-            "id": 3912,
+            "id": 8532,
             "name": "transactionCount",
             "nodeType": "VariableDeclaration",
-            "scope": 4851,
-            "src": "1082:28:7",
+            "scope": 9471,
+            "src": "1100:28:8",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -13833,10 +13833,10 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 3911,
+              "id": 8531,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
-              "src": "1082:4:7",
+              "src": "1100:4:8",
               "typeDescriptions": {
                 "typeIdentifier": "t_uint256",
                 "typeString": "uint256"
@@ -13847,15 +13847,15 @@
           },
           {
             "canonicalName": "MultiSigWallet.Transaction",
-            "id": 3921,
+            "id": 8541,
             "members": [
               {
                 "constant": false,
-                "id": 3914,
+                "id": 8534,
                 "name": "destination",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1146:19:7",
+                "scope": 8541,
+                "src": "1164:19:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -13863,10 +13863,10 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 3913,
+                  "id": 8533,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1146:7:7",
+                  "src": "1164:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
@@ -13877,11 +13877,11 @@
               },
               {
                 "constant": false,
-                "id": 3916,
+                "id": 8536,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1175:10:7",
+                "scope": 8541,
+                "src": "1193:10:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -13889,10 +13889,10 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 3915,
+                  "id": 8535,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1175:4:7",
+                  "src": "1193:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -13903,11 +13903,11 @@
               },
               {
                 "constant": false,
-                "id": 3918,
+                "id": 8538,
                 "name": "data",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1195:10:7",
+                "scope": 8541,
+                "src": "1213:10:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -13915,10 +13915,10 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 3917,
+                  "id": 8537,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1195:5:7",
+                  "src": "1213:5:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bytes_storage_ptr",
                     "typeString": "bytes"
@@ -13929,11 +13929,11 @@
               },
               {
                 "constant": false,
-                "id": 3920,
+                "id": 8540,
                 "name": "executed",
                 "nodeType": "VariableDeclaration",
-                "scope": 3921,
-                "src": "1215:13:7",
+                "scope": 8541,
+                "src": "1233:13:8",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {
@@ -13941,10 +13941,10 @@
                   "typeString": "bool"
                 },
                 "typeName": {
-                  "id": 3919,
+                  "id": 8539,
                   "name": "bool",
                   "nodeType": "ElementaryTypeName",
-                  "src": "1215:4:7",
+                  "src": "1233:4:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_bool",
                     "typeString": "bool"
@@ -13956,15 +13956,15 @@
             ],
             "name": "Transaction",
             "nodeType": "StructDefinition",
-            "scope": 4851,
-            "src": "1117:118:7",
+            "scope": 9471,
+            "src": "1135:118:8",
             "visibility": "public"
           },
           {
             "body": {
-              "id": 3933,
+              "id": 8553,
               "nodeType": "Block",
-              "src": "1296:64:7",
+              "src": "1314:64:8",
               "statements": [
                 {
                   "expression": {
@@ -13976,7 +13976,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3929,
+                        "id": 8549,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -13985,18 +13985,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 3924,
+                            "id": 8544,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "1314:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "1332:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 3925,
+                          "id": 8545,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14004,7 +14004,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1314:10:7",
+                          "src": "1332:10:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14017,14 +14017,14 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 3927,
+                              "id": 8547,
                               "name": "this",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 7818,
-                              "src": "1336:4:7",
+                              "referencedDeclaration": 11650,
+                              "src": "1354:4:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_contract$_MultiSigWallet_$4851",
+                                "typeIdentifier": "t_contract$_MultiSigWallet_$9471",
                                 "typeString": "contract MultiSigWallet"
                               }
                             }
@@ -14032,24 +14032,24 @@
                           "expression": {
                             "argumentTypes": [
                               {
-                                "typeIdentifier": "t_contract$_MultiSigWallet_$4851",
+                                "typeIdentifier": "t_contract$_MultiSigWallet_$9471",
                                 "typeString": "contract MultiSigWallet"
                               }
                             ],
-                            "id": 3926,
+                            "id": 8546,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1328:7:7",
+                            "src": "1346:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 3928,
+                          "id": 8548,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14057,13 +14057,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1328:13:7",
+                          "src": "1346:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1314:27:7",
+                        "src": "1332:27:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -14077,21 +14077,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3923,
+                      "id": 8543,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1306:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1324:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3930,
+                    "id": 8550,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14099,41 +14099,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1306:36:7",
+                    "src": "1324:36:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3931,
+                  "id": 8551,
                   "nodeType": "ExpressionStatement",
-                  "src": "1306:36:7"
+                  "src": "1324:36:8"
                 },
                 {
-                  "id": 3932,
+                  "id": 8552,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1352:1:7"
+                  "src": "1370:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3934,
+            "id": 8554,
             "name": "onlyWallet",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3922,
+              "id": 8542,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1293:2:7"
+              "src": "1311:2:8"
             },
-            "src": "1274:86:7",
+            "src": "1292:86:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3946,
+              "id": 8566,
               "nodeType": "Block",
-              "src": "1408:52:7",
+              "src": "1426:52:8",
               "statements": [
                 {
                   "expression": {
@@ -14141,7 +14141,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 3942,
+                        "id": 8562,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14149,31 +14149,31 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "1426:15:7",
+                        "src": "1444:15:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3939,
+                            "id": 8559,
                             "name": "isOwner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3905,
-                            "src": "1427:7:7",
+                            "referencedDeclaration": 8525,
+                            "src": "1445:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 3941,
+                          "id": 8561,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 3940,
+                            "id": 8560,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3936,
-                            "src": "1435:5:7",
+                            "referencedDeclaration": 8556,
+                            "src": "1453:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14184,7 +14184,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1427:14:7",
+                          "src": "1445:14:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -14203,21 +14203,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3938,
+                      "id": 8558,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1418:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1436:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3943,
+                    "id": 8563,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14225,38 +14225,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1418:24:7",
+                    "src": "1436:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3944,
+                  "id": 8564,
                   "nodeType": "ExpressionStatement",
-                  "src": "1418:24:7"
+                  "src": "1436:24:8"
                 },
                 {
-                  "id": 3945,
+                  "id": 8565,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1452:1:7"
+                  "src": "1470:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3947,
+            "id": 8567,
             "name": "ownerDoesNotExist",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3937,
+              "id": 8557,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3936,
+                  "id": 8556,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3947,
-                  "src": "1393:13:7",
+                  "scope": 8567,
+                  "src": "1411:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14264,10 +14264,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3935,
+                    "id": 8555,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1393:7:7",
+                    "src": "1411:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14277,16 +14277,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1392:15:7"
+              "src": "1410:15:8"
             },
-            "src": "1366:94:7",
+            "src": "1384:94:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3958,
+              "id": 8578,
               "nodeType": "Block",
-              "src": "1502:51:7",
+              "src": "1520:51:8",
               "statements": [
                 {
                   "expression": {
@@ -14296,26 +14296,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 3952,
+                          "id": 8572,
                           "name": "isOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3905,
-                          "src": "1520:7:7",
+                          "referencedDeclaration": 8525,
+                          "src": "1538:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                             "typeString": "mapping(address => bool)"
                           }
                         },
-                        "id": 3954,
+                        "id": 8574,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3953,
+                          "id": 8573,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3949,
-                          "src": "1528:5:7",
+                          "referencedDeclaration": 8569,
+                          "src": "1546:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14326,7 +14326,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1520:14:7",
+                        "src": "1538:14:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -14340,21 +14340,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3951,
+                      "id": 8571,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1512:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1530:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3955,
+                    "id": 8575,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14362,38 +14362,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1512:23:7",
+                    "src": "1530:23:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3956,
+                  "id": 8576,
                   "nodeType": "ExpressionStatement",
-                  "src": "1512:23:7"
+                  "src": "1530:23:8"
                 },
                 {
-                  "id": 3957,
+                  "id": 8577,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1545:1:7"
+                  "src": "1563:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3959,
+            "id": 8579,
             "name": "ownerExists",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3950,
+              "id": 8570,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3949,
+                  "id": 8569,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3959,
-                  "src": "1487:13:7",
+                  "scope": 8579,
+                  "src": "1505:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14401,10 +14401,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3948,
+                    "id": 8568,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1487:7:7",
+                    "src": "1505:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14414,16 +14414,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1486:15:7"
+              "src": "1504:15:8"
             },
-            "src": "1466:87:7",
+            "src": "1484:87:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3973,
+              "id": 8593,
               "nodeType": "Block",
-              "src": "1606:81:7",
+              "src": "1624:81:8",
               "statements": [
                 {
                   "expression": {
@@ -14435,7 +14435,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 3969,
+                        "id": 8589,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14446,26 +14446,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3964,
+                              "id": 8584,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "1624:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "1642:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 3966,
+                            "id": 8586,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3965,
+                              "id": 8585,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3961,
-                              "src": "1637:13:7",
+                              "referencedDeclaration": 8581,
+                              "src": "1655:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -14476,21 +14476,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1624:27:7",
+                            "src": "1642:27:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 3967,
+                          "id": 8587,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "destination",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3914,
-                          "src": "1624:39:7",
+                          "referencedDeclaration": 8534,
+                          "src": "1642:39:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14501,14 +14501,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 3968,
+                          "id": 8588,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1667:1:7",
+                          "src": "1685:1:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -14516,7 +14516,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "1624:44:7",
+                        "src": "1642:44:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -14530,21 +14530,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3963,
+                      "id": 8583,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1616:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1634:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3970,
+                    "id": 8590,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14552,38 +14552,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1616:53:7",
+                    "src": "1634:53:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3971,
+                  "id": 8591,
                   "nodeType": "ExpressionStatement",
-                  "src": "1616:53:7"
+                  "src": "1634:53:8"
                 },
                 {
-                  "id": 3972,
+                  "id": 8592,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1679:1:7"
+                  "src": "1697:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3974,
+            "id": 8594,
             "name": "transactionExists",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3962,
+              "id": 8582,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3961,
+                  "id": 8581,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3974,
-                  "src": "1586:18:7",
+                  "scope": 8594,
+                  "src": "1604:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14591,10 +14591,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3960,
+                    "id": 8580,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1586:4:7",
+                    "src": "1604:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14604,16 +14604,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1585:20:7"
+              "src": "1603:20:8"
             },
-            "src": "1559:128:7",
+            "src": "1577:128:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 3989,
+              "id": 8609,
               "nodeType": "Block",
-              "src": "1747:72:7",
+              "src": "1765:72:8",
               "statements": [
                 {
                   "expression": {
@@ -14625,26 +14625,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 3981,
+                            "id": 8601,
                             "name": "confirmations",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3901,
-                            "src": "1765:13:7",
+                            "referencedDeclaration": 8521,
+                            "src": "1783:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                               "typeString": "mapping(uint256 => mapping(address => bool))"
                             }
                           },
-                          "id": 3983,
+                          "id": 8603,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 3982,
+                            "id": 8602,
                             "name": "transactionId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3976,
-                            "src": "1779:13:7",
+                            "referencedDeclaration": 8596,
+                            "src": "1797:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -14655,21 +14655,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1765:28:7",
+                          "src": "1783:28:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                             "typeString": "mapping(address => bool)"
                           }
                         },
-                        "id": 3985,
+                        "id": 8605,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 3984,
+                          "id": 8604,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3978,
-                          "src": "1794:5:7",
+                          "referencedDeclaration": 8598,
+                          "src": "1812:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -14680,7 +14680,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1765:35:7",
+                        "src": "1783:35:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -14694,21 +14694,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3980,
+                      "id": 8600,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1757:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1775:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 3986,
+                    "id": 8606,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14716,38 +14716,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1757:44:7",
+                    "src": "1775:44:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 3987,
+                  "id": 8607,
                   "nodeType": "ExpressionStatement",
-                  "src": "1757:44:7"
+                  "src": "1775:44:8"
                 },
                 {
-                  "id": 3988,
+                  "id": 8608,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1811:1:7"
+                  "src": "1829:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 3990,
+            "id": 8610,
             "name": "confirmed",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3979,
+              "id": 8599,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3976,
+                  "id": 8596,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3990,
-                  "src": "1712:18:7",
+                  "scope": 8610,
+                  "src": "1730:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14755,10 +14755,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3975,
+                    "id": 8595,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1712:4:7",
+                    "src": "1730:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14769,11 +14769,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3978,
+                  "id": 8598,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 3990,
-                  "src": "1732:13:7",
+                  "scope": 8610,
+                  "src": "1750:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14781,10 +14781,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3977,
+                    "id": 8597,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1732:7:7",
+                    "src": "1750:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -14794,16 +14794,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1711:35:7"
+              "src": "1729:35:8"
             },
-            "src": "1693:126:7",
+            "src": "1711:126:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4006,
+              "id": 8626,
               "nodeType": "Block",
-              "src": "1882:73:7",
+              "src": "1900:73:8",
               "statements": [
                 {
                   "expression": {
@@ -14811,7 +14811,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4002,
+                        "id": 8622,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14819,33 +14819,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "1900:36:7",
+                        "src": "1918:36:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 3997,
+                              "id": 8617,
                               "name": "confirmations",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3901,
-                              "src": "1901:13:7",
+                              "referencedDeclaration": 8521,
+                              "src": "1919:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(uint256 => mapping(address => bool))"
                               }
                             },
-                            "id": 3999,
+                            "id": 8619,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 3998,
+                              "id": 8618,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3992,
-                              "src": "1915:13:7",
+                              "referencedDeclaration": 8612,
+                              "src": "1933:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -14856,21 +14856,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1901:28:7",
+                            "src": "1919:28:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4001,
+                          "id": 8621,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4000,
+                            "id": 8620,
                             "name": "owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3994,
-                            "src": "1930:5:7",
+                            "referencedDeclaration": 8614,
+                            "src": "1948:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -14881,7 +14881,7 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1901:35:7",
+                          "src": "1919:35:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -14900,21 +14900,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 3996,
+                      "id": 8616,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "1892:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "1910:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4003,
+                    "id": 8623,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14922,38 +14922,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1892:45:7",
+                    "src": "1910:45:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4004,
+                  "id": 8624,
                   "nodeType": "ExpressionStatement",
-                  "src": "1892:45:7"
+                  "src": "1910:45:8"
                 },
                 {
-                  "id": 4005,
+                  "id": 8625,
                   "nodeType": "PlaceholderStatement",
-                  "src": "1947:1:7"
+                  "src": "1965:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4007,
+            "id": 8627,
             "name": "notConfirmed",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 3995,
+              "id": 8615,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 3992,
+                  "id": 8612,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4007,
-                  "src": "1847:18:7",
+                  "scope": 8627,
+                  "src": "1865:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14961,10 +14961,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 3991,
+                    "id": 8611,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1847:4:7",
+                    "src": "1865:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -14975,11 +14975,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 3994,
+                  "id": 8614,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4007,
-                  "src": "1867:13:7",
+                  "scope": 8627,
+                  "src": "1885:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -14987,10 +14987,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 3993,
+                    "id": 8613,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1867:7:7",
+                    "src": "1885:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -15000,16 +15000,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1846:35:7"
+              "src": "1864:35:8"
             },
-            "src": "1825:130:7",
+            "src": "1843:130:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4020,
+              "id": 8640,
               "nodeType": "Block",
-              "src": "2002:74:7",
+              "src": "2020:74:8",
               "statements": [
                 {
                   "expression": {
@@ -15017,7 +15017,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4016,
+                        "id": 8636,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15025,33 +15025,33 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "2020:37:7",
+                        "src": "2038:37:8",
                         "subExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4012,
+                              "id": 8632,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "2021:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "2039:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4014,
+                            "id": 8634,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4013,
+                              "id": 8633,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4009,
-                              "src": "2034:13:7",
+                              "referencedDeclaration": 8629,
+                              "src": "2052:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -15062,21 +15062,21 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "2021:27:7",
+                            "src": "2039:27:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4015,
+                          "id": 8635,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "2021:36:7",
+                          "referencedDeclaration": 8540,
+                          "src": "2039:36:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -15095,21 +15095,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4011,
+                      "id": 8631,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2012:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2030:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4017,
+                    "id": 8637,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15117,38 +15117,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2012:46:7",
+                    "src": "2030:46:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4018,
+                  "id": 8638,
                   "nodeType": "ExpressionStatement",
-                  "src": "2012:46:7"
+                  "src": "2030:46:8"
                 },
                 {
-                  "id": 4019,
+                  "id": 8639,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2068:1:7"
+                  "src": "2086:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4021,
+            "id": 8641,
             "name": "notExecuted",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4010,
+              "id": 8630,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4009,
+                  "id": 8629,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4021,
-                  "src": "1982:18:7",
+                  "scope": 8641,
+                  "src": "2000:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15156,10 +15156,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4008,
+                    "id": 8628,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1982:4:7",
+                    "src": "2000:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15169,16 +15169,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1981:20:7"
+              "src": "1999:20:8"
             },
-            "src": "1961:115:7",
+            "src": "1979:115:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4032,
+              "id": 8652,
               "nodeType": "Block",
-              "src": "2117:50:7",
+              "src": "2135:50:8",
               "statements": [
                 {
                   "expression": {
@@ -15190,19 +15190,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 4028,
+                        "id": 8648,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4026,
+                          "id": 8646,
                           "name": "_address",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4023,
-                          "src": "2135:8:7",
+                          "referencedDeclaration": 8643,
+                          "src": "2153:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15213,14 +15213,14 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 4027,
+                          "id": 8647,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "2147:1:7",
+                          "src": "2165:1:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -15228,7 +15228,7 @@
                           },
                           "value": "0"
                         },
-                        "src": "2135:13:7",
+                        "src": "2153:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15242,21 +15242,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4025,
+                      "id": 8645,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2127:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2145:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4029,
+                    "id": 8649,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15264,38 +15264,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2127:22:7",
+                    "src": "2145:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4030,
+                  "id": 8650,
                   "nodeType": "ExpressionStatement",
-                  "src": "2127:22:7"
+                  "src": "2145:22:8"
                 },
                 {
-                  "id": 4031,
+                  "id": 8651,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2159:1:7"
+                  "src": "2177:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4033,
+            "id": 8653,
             "name": "notNull",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4024,
+              "id": 8644,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4023,
+                  "id": 8643,
                   "name": "_address",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4033,
-                  "src": "2099:16:7",
+                  "scope": 8653,
+                  "src": "2117:16:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15303,10 +15303,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4022,
+                    "id": 8642,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2099:7:7",
+                    "src": "2117:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -15316,16 +15316,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2098:18:7"
+              "src": "2116:18:8"
             },
-            "src": "2082:85:7",
+            "src": "2100:85:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4058,
+              "id": 8678,
               "nodeType": "Block",
-              "src": "2232:130:7",
+              "src": "2250:130:8",
               "statements": [
                 {
                   "expression": {
@@ -15337,7 +15337,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4054,
+                        "id": 8674,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -15348,7 +15348,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 4050,
+                          "id": 8670,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15359,7 +15359,7 @@
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             },
-                            "id": 4046,
+                            "id": 8666,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -15370,19 +15370,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 4042,
+                              "id": 8662,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4040,
+                                "id": 8660,
                                 "name": "ownerCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4035,
-                                "src": "2250:10:7",
+                                "referencedDeclaration": 8655,
+                                "src": "2268:10:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -15392,18 +15392,18 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 4041,
+                                "id": 8661,
                                 "name": "MAX_OWNER_COUNT",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3891,
-                                "src": "2264:15:7",
+                                "referencedDeclaration": 8511,
+                                "src": "2282:15:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "2250:29:7",
+                              "src": "2268:29:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -15417,19 +15417,19 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 4045,
+                              "id": 8665,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4043,
+                                "id": 8663,
                                 "name": "_required",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4037,
-                                "src": "2283:9:7",
+                                "referencedDeclaration": 8657,
+                                "src": "2301:9:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -15439,24 +15439,24 @@
                               "operator": "<=",
                               "rightExpression": {
                                 "argumentTypes": null,
-                                "id": 4044,
+                                "id": 8664,
                                 "name": "ownerCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4035,
-                                "src": "2296:10:7",
+                                "referencedDeclaration": 8655,
+                                "src": "2314:10:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "src": "2283:23:7",
+                              "src": "2301:23:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               }
                             },
-                            "src": "2250:56:7",
+                            "src": "2268:56:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -15470,19 +15470,19 @@
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             },
-                            "id": 4049,
+                            "id": 8669,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftExpression": {
                               "argumentTypes": null,
-                              "id": 4047,
+                              "id": 8667,
                               "name": "_required",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4037,
-                              "src": "2310:9:7",
+                              "referencedDeclaration": 8657,
+                              "src": "2328:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -15493,14 +15493,14 @@
                             "rightExpression": {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 4048,
+                              "id": 8668,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "2323:1:7",
+                              "src": "2341:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -15508,13 +15508,13 @@
                               },
                               "value": "0"
                             },
-                            "src": "2310:14:7",
+                            "src": "2328:14:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
                             }
                           },
-                          "src": "2250:74:7",
+                          "src": "2268:74:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -15528,19 +15528,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4053,
+                          "id": 8673,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4051,
+                            "id": 8671,
                             "name": "ownerCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4035,
-                            "src": "2328:10:7",
+                            "referencedDeclaration": 8655,
+                            "src": "2346:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -15551,14 +15551,14 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 4052,
+                            "id": 8672,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "2342:1:7",
+                            "src": "2360:1:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -15566,13 +15566,13 @@
                             },
                             "value": "0"
                           },
-                          "src": "2328:15:7",
+                          "src": "2346:15:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "2250:93:7",
+                        "src": "2268:93:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -15586,21 +15586,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 4039,
+                      "id": 8659,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        7772,
-                        7773
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 7772,
-                      "src": "2242:7:7",
+                      "referencedDeclaration": 11602,
+                      "src": "2260:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 4055,
+                    "id": 8675,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15608,38 +15608,38 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "2242:102:7",
+                    "src": "2260:102:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4056,
+                  "id": 8676,
                   "nodeType": "ExpressionStatement",
-                  "src": "2242:102:7"
+                  "src": "2260:102:8"
                 },
                 {
-                  "id": 4057,
+                  "id": 8677,
                   "nodeType": "PlaceholderStatement",
-                  "src": "2354:1:7"
+                  "src": "2372:1:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4059,
+            "id": 8679,
             "name": "validRequirement",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 4038,
+              "id": 8658,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4035,
+                  "id": 8655,
                   "name": "ownerCount",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4059,
-                  "src": "2199:15:7",
+                  "scope": 8679,
+                  "src": "2217:15:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15647,10 +15647,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4034,
+                    "id": 8654,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2199:4:7",
+                    "src": "2217:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15661,11 +15661,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4037,
+                  "id": 8657,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4059,
-                  "src": "2216:14:7",
+                  "scope": 8679,
+                  "src": "2234:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -15673,10 +15673,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4036,
+                    "id": 8656,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2216:4:7",
+                    "src": "2234:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -15686,16 +15686,16 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2198:33:7"
+              "src": "2216:33:8"
             },
-            "src": "2173:189:7",
+            "src": "2191:189:8",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4074,
+              "id": 8694,
               "nodeType": "Block",
-              "src": "2462:78:7",
+              "src": "2480:78:8",
               "statements": [
                 {
                   "condition": {
@@ -15704,7 +15704,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4065,
+                    "id": 8685,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15713,18 +15713,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4062,
+                        "id": 8682,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 7769,
-                        "src": "2476:3:7",
+                        "referencedDeclaration": 11599,
+                        "src": "2494:3:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 4063,
+                      "id": 8683,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -15732,7 +15732,7 @@
                       "memberName": "value",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "2476:9:7",
+                      "src": "2494:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -15743,14 +15743,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4064,
+                      "id": 8684,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2488:1:7",
+                      "src": "2506:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -15758,16 +15758,16 @@
                       },
                       "value": "0"
                     },
-                    "src": "2476:13:7",
+                    "src": "2494:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4073,
+                  "id": 8693,
                   "nodeType": "IfStatement",
-                  "src": "2472:61:7",
+                  "src": "2490:61:8",
                   "trueBody": {
                     "expression": {
                       "argumentTypes": null,
@@ -15776,18 +15776,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4067,
+                            "id": 8687,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2511:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "2529:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4068,
+                          "id": 8688,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15795,7 +15795,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2511:10:7",
+                          "src": "2529:10:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -15805,18 +15805,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4069,
+                            "id": 8689,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 7769,
-                            "src": "2523:3:7",
+                            "referencedDeclaration": 11599,
+                            "src": "2541:3:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 4070,
+                          "id": 8690,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15824,7 +15824,7 @@
                           "memberName": "value",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "2523:9:7",
+                          "src": "2541:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -15842,18 +15842,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4066,
+                        "id": 8686,
                         "name": "Deposit",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3876,
-                        "src": "2503:7:7",
+                        "referencedDeclaration": 8496,
+                        "src": "2521:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                           "typeString": "function (address,uint256)"
                         }
                       },
-                      "id": 4071,
+                      "id": 8691,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -15861,21 +15861,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "2503:30:7",
+                      "src": "2521:30:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 4072,
+                    "id": 8692,
                     "nodeType": "ExpressionStatement",
-                    "src": "2503:30:7"
+                    "src": "2521:30:8"
                   }
                 }
               ]
             },
             "documentation": "@dev Fallback function allows to deposit ether.",
-            "id": 4075,
+            "id": 8695,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -15883,35 +15883,35 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4060,
+              "id": 8680,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2432:2:7"
+              "src": "2450:2:8"
             },
             "payable": true,
             "returnParameters": {
-              "id": 4061,
+              "id": 8681,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2462:0:7"
+              "src": "2480:0:8"
             },
-            "scope": 4851,
-            "src": "2424:116:7",
+            "scope": 9471,
+            "src": "2442:116:8",
             "stateMutability": "payable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4132,
+              "id": 8752,
               "nodeType": "Block",
-              "src": "2905:227:7",
+              "src": "2923:227:8",
               "statements": [
                 {
                   "body": {
-                    "id": 4122,
+                    "id": 8742,
                     "nodeType": "Block",
-                    "src": "2957:113:7",
+                    "src": "2975:113:8",
                     "statements": [
                       {
                         "expression": {
@@ -15923,14 +15923,14 @@
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
                               },
-                              "id": 4111,
+                              "id": 8731,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 4105,
+                                "id": 8725,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -15938,47 +15938,47 @@
                                 "nodeType": "UnaryOperation",
                                 "operator": "!",
                                 "prefix": true,
-                                "src": "2979:20:7",
+                                "src": "2997:20:8",
                                 "subExpression": {
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4100,
+                                    "id": 8720,
                                     "name": "isOwner",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3905,
-                                    "src": "2980:7:7",
+                                    "referencedDeclaration": 8525,
+                                    "src": "2998:7:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                                       "typeString": "mapping(address => bool)"
                                     }
                                   },
-                                  "id": 4104,
+                                  "id": 8724,
                                   "indexExpression": {
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 4101,
+                                      "id": 8721,
                                       "name": "_owners",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4078,
-                                      "src": "2988:7:7",
+                                      "referencedDeclaration": 8698,
+                                      "src": "3006:7:8",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                         "typeString": "address[] memory"
                                       }
                                     },
-                                    "id": 4103,
+                                    "id": 8723,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 4102,
+                                      "id": 8722,
                                       "name": "i",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 4089,
-                                      "src": "2996:1:7",
+                                      "referencedDeclaration": 8709,
+                                      "src": "3014:1:8",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_uint256",
                                         "typeString": "uint256"
@@ -15989,7 +15989,7 @@
                                     "isPure": false,
                                     "lValueRequested": false,
                                     "nodeType": "IndexAccess",
-                                    "src": "2988:10:7",
+                                    "src": "3006:10:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_address",
                                       "typeString": "address"
@@ -16000,7 +16000,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "2980:19:7",
+                                  "src": "2998:19:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -16019,7 +16019,7 @@
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
                                 },
-                                "id": 4110,
+                                "id": 8730,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -16028,26 +16028,26 @@
                                   "argumentTypes": null,
                                   "baseExpression": {
                                     "argumentTypes": null,
-                                    "id": 4106,
+                                    "id": 8726,
                                     "name": "_owners",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4078,
-                                    "src": "3003:7:7",
+                                    "referencedDeclaration": 8698,
+                                    "src": "3021:7:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                       "typeString": "address[] memory"
                                     }
                                   },
-                                  "id": 4108,
+                                  "id": 8728,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 4107,
+                                    "id": 8727,
                                     "name": "i",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4089,
-                                    "src": "3011:1:7",
+                                    "referencedDeclaration": 8709,
+                                    "src": "3029:1:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -16058,7 +16058,7 @@
                                   "isPure": false,
                                   "lValueRequested": false,
                                   "nodeType": "IndexAccess",
-                                  "src": "3003:10:7",
+                                  "src": "3021:10:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -16069,14 +16069,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "30",
-                                  "id": 4109,
+                                  "id": 8729,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "3017:1:7",
+                                  "src": "3035:1:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_0_by_1",
@@ -16084,13 +16084,13 @@
                                   },
                                   "value": "0"
                                 },
-                                "src": "3003:15:7",
+                                "src": "3021:15:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "src": "2979:39:7",
+                              "src": "2997:39:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bool",
                                 "typeString": "bool"
@@ -16104,21 +16104,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 4099,
+                            "id": 8719,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              7772,
-                              7773
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 7772,
-                            "src": "2971:7:7",
+                            "referencedDeclaration": 11602,
+                            "src": "2989:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 4112,
+                          "id": 8732,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -16126,20 +16126,20 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "2971:48:7",
+                          "src": "2989:48:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_tuple$__$",
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 4113,
+                        "id": 8733,
                         "nodeType": "ExpressionStatement",
-                        "src": "2971:48:7"
+                        "src": "2989:48:8"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4120,
+                          "id": 8740,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -16148,42 +16148,42 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4114,
+                              "id": 8734,
                               "name": "isOwner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3905,
-                              "src": "3033:7:7",
+                              "referencedDeclaration": 8525,
+                              "src": "3051:7:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                                 "typeString": "mapping(address => bool)"
                               }
                             },
-                            "id": 4118,
+                            "id": 8738,
                             "indexExpression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4115,
+                                "id": 8735,
                                 "name": "_owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4078,
-                                "src": "3041:7:7",
+                                "referencedDeclaration": 8698,
+                                "src": "3059:7:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                   "typeString": "address[] memory"
                                 }
                               },
-                              "id": 4117,
+                              "id": 8737,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4116,
+                                "id": 8736,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4089,
-                                "src": "3049:1:7",
+                                "referencedDeclaration": 8709,
+                                "src": "3067:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -16194,7 +16194,7 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3041:10:7",
+                              "src": "3059:10:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -16205,7 +16205,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3033:19:7",
+                            "src": "3051:19:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -16216,14 +16216,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4119,
+                            "id": 8739,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3055:4:7",
+                            "src": "3073:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -16231,15 +16231,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "3033:26:7",
+                          "src": "3051:26:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4121,
+                        "id": 8741,
                         "nodeType": "ExpressionStatement",
-                        "src": "3033:26:7"
+                        "src": "3051:26:8"
                       }
                     ]
                   },
@@ -16249,19 +16249,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4095,
+                    "id": 8715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4092,
+                      "id": 8712,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4089,
-                      "src": "2932:1:7",
+                      "referencedDeclaration": 8709,
+                      "src": "2950:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -16273,18 +16273,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4093,
+                        "id": 8713,
                         "name": "_owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4078,
-                        "src": "2936:7:7",
+                        "referencedDeclaration": 8698,
+                        "src": "2954:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                           "typeString": "address[] memory"
                         }
                       },
-                      "id": 4094,
+                      "id": 8714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16292,31 +16292,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "2936:14:7",
+                      "src": "2954:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "2932:18:7",
+                    "src": "2950:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4123,
+                  "id": 8743,
                   "initializationExpression": {
                     "assignments": [
-                      4089
+                      8709
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4089,
+                        "id": 8709,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4133,
-                        "src": "2920:6:7",
+                        "scope": 8753,
+                        "src": "2938:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -16324,10 +16324,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4088,
+                          "id": 8708,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "2920:4:7",
+                          "src": "2938:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -16337,18 +16337,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4091,
+                    "id": 8711,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4090,
+                      "id": 8710,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "2929:1:7",
+                      "src": "2947:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -16357,12 +16357,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "2920:10:7"
+                    "src": "2938:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4097,
+                      "id": 8717,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16370,15 +16370,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "2952:3:7",
+                      "src": "2970:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4096,
+                        "id": 8716,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4089,
-                        "src": "2952:1:7",
+                        "referencedDeclaration": 8709,
+                        "src": "2970:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -16389,29 +16389,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4098,
+                    "id": 8718,
                     "nodeType": "ExpressionStatement",
-                    "src": "2952:3:7"
+                    "src": "2970:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "2915:155:7"
+                  "src": "2933:155:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4126,
+                    "id": 8746,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4124,
+                      "id": 8744,
                       "name": "owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3908,
-                      "src": "3079:6:7",
+                      "referencedDeclaration": 8528,
+                      "src": "3097:6:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_storage",
                         "typeString": "address[] storage ref"
@@ -16421,43 +16421,43 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4125,
+                      "id": 8745,
                       "name": "_owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4078,
-                      "src": "3088:7:7",
+                      "referencedDeclaration": 8698,
+                      "src": "3106:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
                       }
                     },
-                    "src": "3079:16:7",
+                    "src": "3097:16:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                       "typeString": "address[] storage ref"
                     }
                   },
-                  "id": 4127,
+                  "id": 8747,
                   "nodeType": "ExpressionStatement",
-                  "src": "3079:16:7"
+                  "src": "3097:16:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4130,
+                    "id": 8750,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4128,
+                      "id": 8748,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "3105:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "3123:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -16467,31 +16467,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4129,
+                      "id": 8749,
                       "name": "_required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4080,
-                      "src": "3116:9:7",
+                      "referencedDeclaration": 8700,
+                      "src": "3134:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3105:20:7",
+                    "src": "3123:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4131,
+                  "id": 8751,
                   "nodeType": "ExpressionStatement",
-                  "src": "3105:20:7"
+                  "src": "3123:20:8"
                 }
               ]
             },
             "documentation": "@dev Contract constructor sets initial owners and required number of confirmations.\n @param _owners List of initial owners.\n @param _required Number of required confirmations.",
-            "id": 4133,
+            "id": 8753,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -16502,18 +16502,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4083,
+                      "id": 8703,
                       "name": "_owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4078,
-                      "src": "2874:7:7",
+                      "referencedDeclaration": 8698,
+                      "src": "2892:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
                       }
                     },
-                    "id": 4084,
+                    "id": 8704,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16521,7 +16521,7 @@
                     "memberName": "length",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "2874:14:7",
+                    "src": "2892:14:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16529,49 +16529,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4085,
+                    "id": 8705,
                     "name": "_required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4080,
-                    "src": "2890:9:7",
+                    "referencedDeclaration": 8700,
+                    "src": "2908:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4086,
+                "id": 8706,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4082,
+                  "id": 8702,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "2857:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "2875:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "2857:43:7"
+                "src": "2875:43:8"
               }
             ],
             "name": "MultiSigWallet",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4081,
+              "id": 8701,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4078,
+                  "id": 8698,
                   "name": "_owners",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4133,
-                  "src": "2807:17:7",
+                  "scope": 8753,
+                  "src": "2825:17:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16580,19 +16580,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4076,
+                      "id": 8696,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "2807:7:7",
+                      "src": "2825:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4077,
+                    "id": 8697,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "2807:9:7",
+                    "src": "2825:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -16603,11 +16603,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4080,
+                  "id": 8700,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4133,
-                  "src": "2826:14:7",
+                  "scope": 8753,
+                  "src": "2844:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -16615,10 +16615,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4079,
+                    "id": 8699,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2826:4:7",
+                    "src": "2844:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -16628,31 +16628,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2806:35:7"
+              "src": "2824:35:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4087,
+              "id": 8707,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "2905:0:7"
+              "src": "2923:0:8"
             },
-            "scope": 4851,
-            "src": "2783:349:7",
+            "scope": 9471,
+            "src": "2801:349:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4169,
+              "id": 8789,
               "nodeType": "Block",
-              "src": "3420:96:7",
+              "src": "3438:96:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4157,
+                    "id": 8777,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16661,26 +16661,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4153,
+                        "id": 8773,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "3430:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "3448:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4155,
+                      "id": 8775,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4154,
+                        "id": 8774,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3438:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3456:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -16691,7 +16691,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3430:14:7",
+                      "src": "3448:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -16702,14 +16702,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4156,
+                      "id": 8776,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3447:4:7",
+                      "src": "3465:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -16717,15 +16717,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "3430:21:7",
+                    "src": "3448:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4158,
+                  "id": 8778,
                   "nodeType": "ExpressionStatement",
-                  "src": "3430:21:7"
+                  "src": "3448:21:8"
                 },
                 {
                   "expression": {
@@ -16733,12 +16733,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4162,
+                        "id": 8782,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3473:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3491:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -16754,18 +16754,18 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4159,
+                        "id": 8779,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3461:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3479:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4161,
+                      "id": 8781,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -16773,13 +16773,13 @@
                       "memberName": "push",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3461:11:7",
+                      "src": "3479:11:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_arraypush_nonpayable$_t_address_$returns$_t_uint256_$",
                         "typeString": "function (address) returns (uint256)"
                       }
                     },
-                    "id": 4163,
+                    "id": 8783,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16787,15 +16787,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3461:18:7",
+                    "src": "3479:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4164,
+                  "id": 8784,
                   "nodeType": "ExpressionStatement",
-                  "src": "3461:18:7"
+                  "src": "3479:18:8"
                 },
                 {
                   "expression": {
@@ -16803,12 +16803,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4166,
+                        "id": 8786,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4135,
-                        "src": "3503:5:7",
+                        "referencedDeclaration": 8755,
+                        "src": "3521:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -16822,18 +16822,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4165,
+                      "id": 8785,
                       "name": "OwnerAddition",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3880,
-                      "src": "3489:13:7",
+                      "referencedDeclaration": 8500,
+                      "src": "3507:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4167,
+                    "id": 8787,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16841,108 +16841,108 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3489:20:7",
+                    "src": "3507:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4168,
+                  "id": 8788,
                   "nodeType": "ExpressionStatement",
-                  "src": "3489:20:7"
+                  "src": "3507:20:8"
                 }
               ]
             },
             "documentation": "@dev Allows to add a new owner. Transaction has to be sent by wallet.\n @param owner Address of new owner.",
-            "id": 4170,
+            "id": 8790,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4138,
+                "id": 8758,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4137,
+                  "id": 8757,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "3307:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "3325:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3307:10:7"
+                "src": "3325:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4140,
+                    "id": 8760,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4135,
-                    "src": "3340:5:7",
+                    "referencedDeclaration": 8755,
+                    "src": "3358:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4141,
+                "id": 8761,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4139,
+                  "id": 8759,
                   "name": "ownerDoesNotExist",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3947,
-                  "src": "3322:17:7",
+                  "referencedDeclaration": 8567,
+                  "src": "3340:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3322:24:7"
+                "src": "3340:24:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4143,
+                    "id": 8763,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4135,
-                    "src": "3359:5:7",
+                    "referencedDeclaration": 8755,
+                    "src": "3377:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4144,
+                "id": 8764,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4142,
+                  "id": 8762,
                   "name": "notNull",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4033,
-                  "src": "3351:7:7",
+                  "referencedDeclaration": 8653,
+                  "src": "3369:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3351:14:7"
+                "src": "3369:14:8"
               },
               {
                 "arguments": [
@@ -16952,7 +16952,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4149,
+                    "id": 8769,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -16961,18 +16961,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4146,
+                        "id": 8766,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3387:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3405:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4147,
+                      "id": 8767,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -16980,7 +16980,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3387:13:7",
+                      "src": "3405:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -16991,14 +16991,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4148,
+                      "id": 8768,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3403:1:7",
+                      "src": "3421:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -17006,7 +17006,7 @@
                       },
                       "value": "1"
                     },
-                    "src": "3387:17:7",
+                    "src": "3405:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -17014,49 +17014,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4150,
+                    "id": 8770,
                     "name": "required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3910,
-                    "src": "3406:8:7",
+                    "referencedDeclaration": 8530,
+                    "src": "3424:8:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4151,
+                "id": 8771,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4145,
+                  "id": 8765,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "3370:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "3388:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3370:45:7"
+                "src": "3388:45:8"
               }
             ],
             "name": "addOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4136,
+              "id": 8756,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4135,
+                  "id": 8755,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4170,
-                  "src": "3277:13:7",
+                  "scope": 8790,
+                  "src": "3295:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -17064,10 +17064,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4134,
+                    "id": 8754,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3277:7:7",
+                    "src": "3295:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -17077,31 +17077,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3276:15:7"
+              "src": "3294:15:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4152,
+              "id": 8772,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3420:0:7"
+              "src": "3438:0:8"
             },
-            "scope": 4851,
-            "src": "3259:257:7",
+            "scope": 9471,
+            "src": "3277:257:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4239,
+              "id": 8859,
               "nodeType": "Block",
-              "src": "3728:363:7",
+              "src": "3746:363:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4184,
+                    "id": 8804,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17110,26 +17110,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4180,
+                        "id": 8800,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "3738:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "3756:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4182,
+                      "id": 8802,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4181,
+                        "id": 8801,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "3746:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "3764:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -17140,7 +17140,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3738:14:7",
+                      "src": "3756:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -17151,14 +17151,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4183,
+                      "id": 8803,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3755:5:7",
+                      "src": "3773:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -17166,15 +17166,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "3738:22:7",
+                    "src": "3756:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4185,
+                  "id": 8805,
                   "nodeType": "ExpressionStatement",
-                  "src": "3738:22:7"
+                  "src": "3756:22:8"
                 },
                 {
                   "body": {
@@ -17184,7 +17184,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4203,
+                      "id": 8823,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17193,26 +17193,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4199,
+                          "id": 8819,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "3831:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "3849:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4201,
+                        "id": 8821,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4200,
+                          "id": 8820,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4187,
-                          "src": "3838:1:7",
+                          "referencedDeclaration": 8807,
+                          "src": "3856:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -17223,7 +17223,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3831:9:7",
+                        "src": "3849:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -17233,36 +17233,36 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4202,
+                        "id": 8822,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "3844:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "3862:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "3831:18:7",
+                      "src": "3849:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4217,
+                    "id": 8837,
                     "nodeType": "IfStatement",
-                    "src": "3827:117:7",
+                    "src": "3845:117:8",
                     "trueBody": {
-                      "id": 4216,
+                      "id": 8836,
                       "nodeType": "Block",
-                      "src": "3851:93:7",
+                      "src": "3869:93:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4213,
+                            "id": 8833,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -17271,26 +17271,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4204,
+                                "id": 8824,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "3869:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "3887:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4206,
+                              "id": 8826,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4205,
+                                "id": 8825,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4187,
-                                "src": "3876:1:7",
+                                "referencedDeclaration": 8807,
+                                "src": "3894:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17301,7 +17301,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "3869:9:7",
+                              "src": "3887:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -17313,25 +17313,25 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4207,
+                                "id": 8827,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "3881:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "3899:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4212,
+                              "id": 8832,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "commonType": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 4211,
+                                "id": 8831,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -17340,18 +17340,18 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4208,
+                                    "id": 8828,
                                     "name": "owners",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 3908,
-                                    "src": "3888:6:7",
+                                    "referencedDeclaration": 8528,
+                                    "src": "3906:6:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                       "typeString": "address[] storage ref"
                                     }
                                   },
-                                  "id": 4209,
+                                  "id": 8829,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
@@ -17359,7 +17359,7 @@
                                   "memberName": "length",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3888:13:7",
+                                  "src": "3906:13:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
                                     "typeString": "uint256"
@@ -17370,14 +17370,14 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "31",
-                                  "id": 4210,
+                                  "id": 8830,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "number",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "3904:1:7",
+                                  "src": "3922:1:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_rational_1_by_1",
@@ -17385,7 +17385,7 @@
                                   },
                                   "value": "1"
                                 },
-                                "src": "3888:17:7",
+                                "src": "3906:17:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -17396,26 +17396,26 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3881:25:7",
+                              "src": "3899:25:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "3869:37:7",
+                            "src": "3887:37:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4214,
+                          "id": 8834,
                           "nodeType": "ExpressionStatement",
-                          "src": "3869:37:7"
+                          "src": "3887:37:8"
                         },
                         {
-                          "id": 4215,
+                          "id": 8835,
                           "nodeType": "Break",
-                          "src": "3924:5:7"
+                          "src": "3942:5:8"
                         }
                       ]
                     }
@@ -17426,19 +17426,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4195,
+                    "id": 8815,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4190,
+                      "id": 8810,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4187,
-                      "src": "3787:1:7",
+                      "referencedDeclaration": 8807,
+                      "src": "3805:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -17452,7 +17452,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 4194,
+                      "id": 8814,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17461,18 +17461,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4191,
+                          "id": 8811,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "3791:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "3809:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4192,
+                        "id": 8812,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
@@ -17480,7 +17480,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3791:13:7",
+                        "src": "3809:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -17491,14 +17491,14 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 4193,
+                        "id": 8813,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "3807:1:7",
+                        "src": "3825:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_1_by_1",
@@ -17506,31 +17506,31 @@
                         },
                         "value": "1"
                       },
-                      "src": "3791:17:7",
+                      "src": "3809:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3787:21:7",
+                    "src": "3805:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4218,
+                  "id": 8838,
                   "initializationExpression": {
                     "assignments": [
-                      4187
+                      8807
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4187,
+                        "id": 8807,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4240,
-                        "src": "3775:6:7",
+                        "scope": 8860,
+                        "src": "3793:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -17538,10 +17538,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4186,
+                          "id": 8806,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "3775:4:7",
+                          "src": "3793:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -17551,18 +17551,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4189,
+                    "id": 8809,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4188,
+                      "id": 8808,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3784:1:7",
+                      "src": "3802:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -17571,12 +17571,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "3775:10:7"
+                    "src": "3793:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4197,
+                      "id": 8817,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17584,15 +17584,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "3810:3:7",
+                      "src": "3828:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4196,
+                        "id": 8816,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4187,
-                        "src": "3810:1:7",
+                        "referencedDeclaration": 8807,
+                        "src": "3828:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -17603,17 +17603,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4198,
+                    "id": 8818,
                     "nodeType": "ExpressionStatement",
-                    "src": "3810:3:7"
+                    "src": "3828:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "3770:174:7"
+                  "src": "3788:174:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4223,
+                    "id": 8843,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17622,18 +17622,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4219,
+                        "id": 8839,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3953:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "3971:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4221,
+                      "id": 8841,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -17641,7 +17641,7 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3953:13:7",
+                      "src": "3971:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -17652,14 +17652,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4222,
+                      "id": 8842,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "3970:1:7",
+                      "src": "3988:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -17667,15 +17667,15 @@
                       },
                       "value": "1"
                     },
-                    "src": "3953:18:7",
+                    "src": "3971:18:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4224,
+                  "id": 8844,
                   "nodeType": "ExpressionStatement",
-                  "src": "3953:18:7"
+                  "src": "3971:18:8"
                 },
                 {
                   "condition": {
@@ -17684,19 +17684,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4228,
+                    "id": 8848,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4225,
+                      "id": 8845,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "3985:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "4003:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -17708,18 +17708,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4226,
+                        "id": 8846,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "3996:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "4014:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4227,
+                      "id": 8847,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -17727,22 +17727,22 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "3996:13:7",
+                      "src": "4014:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3985:24:7",
+                    "src": "4003:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4234,
+                  "id": 8854,
                   "nodeType": "IfStatement",
-                  "src": "3981:74:7",
+                  "src": "3999:74:8",
                   "trueBody": {
                     "expression": {
                       "argumentTypes": null,
@@ -17751,18 +17751,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4230,
+                            "id": 8850,
                             "name": "owners",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3908,
-                            "src": "4041:6:7",
+                            "referencedDeclaration": 8528,
+                            "src": "4059:6:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_array$_t_address_$dyn_storage",
                               "typeString": "address[] storage ref"
                             }
                           },
-                          "id": 4231,
+                          "id": 8851,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
@@ -17770,7 +17770,7 @@
                           "memberName": "length",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "4041:13:7",
+                          "src": "4059:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -17784,18 +17784,18 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4229,
+                        "id": 8849,
                         "name": "changeRequirement",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4323,
-                        "src": "4023:17:7",
+                        "referencedDeclaration": 8943,
+                        "src": "4041:17:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                           "typeString": "function (uint256)"
                         }
                       },
-                      "id": 4232,
+                      "id": 8852,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -17803,15 +17803,15 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "4023:32:7",
+                      "src": "4041:32:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_tuple$__$",
                         "typeString": "tuple()"
                       }
                     },
-                    "id": 4233,
+                    "id": 8853,
                     "nodeType": "ExpressionStatement",
-                    "src": "4023:32:7"
+                    "src": "4041:32:8"
                   }
                 },
                 {
@@ -17820,12 +17820,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4236,
+                        "id": 8856,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4172,
-                        "src": "4078:5:7",
+                        "referencedDeclaration": 8792,
+                        "src": "4096:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -17839,18 +17839,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4235,
+                      "id": 8855,
                       "name": "OwnerRemoval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3884,
-                      "src": "4065:12:7",
+                      "referencedDeclaration": 8504,
+                      "src": "4083:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4237,
+                    "id": 8857,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -17858,90 +17858,90 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4065:19:7",
+                    "src": "4083:19:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4238,
+                  "id": 8858,
                   "nodeType": "ExpressionStatement",
-                  "src": "4065:19:7"
+                  "src": "4083:19:8"
                 }
               ]
             },
             "documentation": "@dev Allows to remove an owner. Transaction has to be sent by wallet.\n @param owner Address of owner.",
-            "id": 4240,
+            "id": 8860,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4175,
+                "id": 8795,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4174,
+                  "id": 8794,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "3690:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "3708:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3690:10:7"
+                "src": "3708:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4177,
+                    "id": 8797,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4172,
-                    "src": "3717:5:7",
+                    "referencedDeclaration": 8792,
+                    "src": "3735:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4178,
+                "id": 8798,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4176,
+                  "id": 8796,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "3705:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "3723:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "3705:18:7"
+                "src": "3723:18:8"
               }
             ],
             "name": "removeOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4173,
+              "id": 8793,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4172,
+                  "id": 8792,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4240,
-                  "src": "3660:13:7",
+                  "scope": 8860,
+                  "src": "3678:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -17949,10 +17949,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4171,
+                    "id": 8791,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3660:7:7",
+                    "src": "3678:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -17962,26 +17962,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3659:15:7"
+              "src": "3677:15:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4179,
+              "id": 8799,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "3728:0:7"
+              "src": "3746:0:8"
             },
-            "scope": 4851,
-            "src": "3639:452:7",
+            "scope": 9471,
+            "src": "3657:452:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4301,
+              "id": 8921,
               "nodeType": "Block",
-              "src": "4433:297:7",
+              "src": "4451:297:8",
               "statements": [
                 {
                   "body": {
@@ -17991,7 +17991,7 @@
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       },
-                      "id": 4270,
+                      "id": 8890,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -18000,26 +18000,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4266,
+                          "id": 8886,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "4500:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "4518:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4268,
+                        "id": 8888,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4267,
+                          "id": 8887,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4256,
-                          "src": "4507:1:7",
+                          "referencedDeclaration": 8876,
+                          "src": "4525:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18030,7 +18030,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4500:9:7",
+                        "src": "4518:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -18040,36 +18040,36 @@
                       "operator": "==",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 4269,
+                        "id": 8889,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4513:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4531:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "4500:18:7",
+                      "src": "4518:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4279,
+                    "id": 8899,
                     "nodeType": "IfStatement",
-                    "src": "4496:100:7",
+                    "src": "4514:100:8",
                     "trueBody": {
-                      "id": 4278,
+                      "id": 8898,
                       "nodeType": "Block",
-                      "src": "4520:76:7",
+                      "src": "4538:76:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4275,
+                            "id": 8895,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -18078,26 +18078,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4271,
+                                "id": 8891,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "4538:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "4556:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4273,
+                              "id": 8893,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4272,
+                                "id": 8892,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4256,
-                                "src": "4545:1:7",
+                                "referencedDeclaration": 8876,
+                                "src": "4563:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -18108,7 +18108,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "4538:9:7",
+                              "src": "4556:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -18118,31 +18118,31 @@
                             "operator": "=",
                             "rightHandSide": {
                               "argumentTypes": null,
-                              "id": 4274,
+                              "id": 8894,
                               "name": "newOwner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4244,
-                              "src": "4550:8:7",
+                              "referencedDeclaration": 8864,
+                              "src": "4568:8:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "4538:20:7",
+                            "src": "4556:20:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4276,
+                          "id": 8896,
                           "nodeType": "ExpressionStatement",
-                          "src": "4538:20:7"
+                          "src": "4556:20:8"
                         },
                         {
-                          "id": 4277,
+                          "id": 8897,
                           "nodeType": "Break",
-                          "src": "4576:5:7"
+                          "src": "4594:5:8"
                         }
                       ]
                     }
@@ -18153,19 +18153,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4262,
+                    "id": 8882,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4259,
+                      "id": 8879,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4256,
-                      "src": "4460:1:7",
+                      "referencedDeclaration": 8876,
+                      "src": "4478:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -18177,18 +18177,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4260,
+                        "id": 8880,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "4464:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "4482:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4261,
+                      "id": 8881,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -18196,31 +18196,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "4464:13:7",
+                      "src": "4482:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "4460:17:7",
+                    "src": "4478:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4280,
+                  "id": 8900,
                   "initializationExpression": {
                     "assignments": [
-                      4256
+                      8876
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4256,
+                        "id": 8876,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4302,
-                        "src": "4448:6:7",
+                        "scope": 8922,
+                        "src": "4466:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -18228,10 +18228,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4255,
+                          "id": 8875,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "4448:4:7",
+                          "src": "4466:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -18241,18 +18241,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4258,
+                    "id": 8878,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4257,
+                      "id": 8877,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4457:1:7",
+                      "src": "4475:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -18261,12 +18261,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "4448:10:7"
+                    "src": "4466:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4264,
+                      "id": 8884,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -18274,15 +18274,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "4479:3:7",
+                      "src": "4497:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4263,
+                        "id": 8883,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4256,
-                        "src": "4479:1:7",
+                        "referencedDeclaration": 8876,
+                        "src": "4497:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18293,17 +18293,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4265,
+                    "id": 8885,
                     "nodeType": "ExpressionStatement",
-                    "src": "4479:3:7"
+                    "src": "4497:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "4443:153:7"
+                  "src": "4461:153:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4285,
+                    "id": 8905,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18312,26 +18312,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4281,
+                        "id": 8901,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "4605:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "4623:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4283,
+                      "id": 8903,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4282,
+                        "id": 8902,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4613:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4631:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -18342,7 +18342,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4605:14:7",
+                      "src": "4623:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -18353,14 +18353,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4284,
+                      "id": 8904,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4622:5:7",
+                      "src": "4640:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -18368,20 +18368,20 @@
                       },
                       "value": "false"
                     },
-                    "src": "4605:22:7",
+                    "src": "4623:22:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4286,
+                  "id": 8906,
                   "nodeType": "ExpressionStatement",
-                  "src": "4605:22:7"
+                  "src": "4623:22:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4291,
+                    "id": 8911,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18390,26 +18390,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4287,
+                        "id": 8907,
                         "name": "isOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3905,
-                        "src": "4637:7:7",
+                        "referencedDeclaration": 8525,
+                        "src": "4655:7:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4289,
+                      "id": 8909,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4288,
+                        "id": 8908,
                         "name": "newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4244,
-                        "src": "4645:8:7",
+                        "referencedDeclaration": 8864,
+                        "src": "4663:8:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -18420,7 +18420,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "4637:17:7",
+                      "src": "4655:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -18431,14 +18431,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4290,
+                      "id": 8910,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "4657:4:7",
+                      "src": "4675:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -18446,15 +18446,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "4637:24:7",
+                    "src": "4655:24:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4292,
+                  "id": 8912,
                   "nodeType": "ExpressionStatement",
-                  "src": "4637:24:7"
+                  "src": "4655:24:8"
                 },
                 {
                   "expression": {
@@ -18462,12 +18462,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4294,
+                        "id": 8914,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4242,
-                        "src": "4684:5:7",
+                        "referencedDeclaration": 8862,
+                        "src": "4702:5:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -18481,18 +18481,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4293,
+                      "id": 8913,
                       "name": "OwnerRemoval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3884,
-                      "src": "4671:12:7",
+                      "referencedDeclaration": 8504,
+                      "src": "4689:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4295,
+                    "id": 8915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18500,15 +18500,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4671:19:7",
+                    "src": "4689:19:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4296,
+                  "id": 8916,
                   "nodeType": "ExpressionStatement",
-                  "src": "4671:19:7"
+                  "src": "4689:19:8"
                 },
                 {
                   "expression": {
@@ -18516,12 +18516,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4298,
+                        "id": 8918,
                         "name": "newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4244,
-                        "src": "4714:8:7",
+                        "referencedDeclaration": 8864,
+                        "src": "4732:8:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -18535,18 +18535,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 4297,
+                      "id": 8917,
                       "name": "OwnerAddition",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3880,
-                      "src": "4700:13:7",
+                      "referencedDeclaration": 8500,
+                      "src": "4718:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 4299,
+                    "id": 8919,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18554,123 +18554,123 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4700:23:7",
+                    "src": "4718:23:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4300,
+                  "id": 8920,
                   "nodeType": "ExpressionStatement",
-                  "src": "4700:23:7"
+                  "src": "4718:23:8"
                 }
               ]
             },
             "documentation": "@dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.\n @param owner Address of owner to be replaced.\n @param newOwner Address of new owner.",
-            "id": 4302,
+            "id": 8922,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4247,
+                "id": 8867,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4246,
+                  "id": 8866,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "4363:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "4381:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4363:10:7"
+                "src": "4381:10:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4249,
+                    "id": 8869,
                     "name": "owner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4242,
-                    "src": "4390:5:7",
+                    "referencedDeclaration": 8862,
+                    "src": "4408:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4250,
+                "id": 8870,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4248,
+                  "id": 8868,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "4378:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "4396:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4378:18:7"
+                "src": "4396:18:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4252,
+                    "id": 8872,
                     "name": "newOwner",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4244,
-                    "src": "4419:8:7",
+                    "referencedDeclaration": 8864,
+                    "src": "4437:8:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4253,
+                "id": 8873,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4251,
+                  "id": 8871,
                   "name": "ownerDoesNotExist",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3947,
-                  "src": "4401:17:7",
+                  "referencedDeclaration": 8567,
+                  "src": "4419:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4401:27:7"
+                "src": "4419:27:8"
               }
             ],
             "name": "replaceOwner",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4245,
+              "id": 8865,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4242,
+                  "id": 8862,
                   "name": "owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4302,
-                  "src": "4315:13:7",
+                  "scope": 8922,
+                  "src": "4333:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -18678,10 +18678,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4241,
+                    "id": 8861,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4315:7:7",
+                    "src": "4333:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -18692,11 +18692,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4244,
+                  "id": 8864,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4302,
-                  "src": "4330:16:7",
+                  "scope": 8922,
+                  "src": "4348:16:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -18704,10 +18704,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4243,
+                    "id": 8863,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4330:7:7",
+                    "src": "4348:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -18717,43 +18717,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4314:33:7"
+              "src": "4332:33:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4254,
+              "id": 8874,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "4433:0:7"
+              "src": "4451:0:8"
             },
-            "scope": 4851,
-            "src": "4293:437:7",
+            "scope": 9471,
+            "src": "4311:437:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4322,
+              "id": 8942,
               "nodeType": "Block",
-              "src": "5021:75:7",
+              "src": "5039:75:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4316,
+                    "id": 8936,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4314,
+                      "id": 8934,
                       "name": "required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3910,
-                      "src": "5031:8:7",
+                      "referencedDeclaration": 8530,
+                      "src": "5049:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -18763,26 +18763,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4315,
+                      "id": 8935,
                       "name": "_required",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4304,
-                      "src": "5042:9:7",
+                      "referencedDeclaration": 8924,
+                      "src": "5060:9:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "5031:20:7",
+                    "src": "5049:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4317,
+                  "id": 8937,
                   "nodeType": "ExpressionStatement",
-                  "src": "5031:20:7"
+                  "src": "5049:20:8"
                 },
                 {
                   "expression": {
@@ -18790,12 +18790,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4319,
+                        "id": 8939,
                         "name": "_required",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4304,
-                        "src": "5079:9:7",
+                        "referencedDeclaration": 8924,
+                        "src": "5097:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -18809,18 +18809,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4318,
+                      "id": 8938,
                       "name": "RequirementChange",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3888,
-                      "src": "5061:17:7",
+                      "referencedDeclaration": 8508,
+                      "src": "5079:17:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4320,
+                    "id": 8940,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -18828,42 +18828,42 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5061:28:7",
+                    "src": "5079:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4321,
+                  "id": 8941,
                   "nodeType": "ExpressionStatement",
-                  "src": "5061:28:7"
+                  "src": "5079:28:8"
                 }
               ]
             },
             "documentation": "@dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.\n @param _required Number of required confirmations.",
-            "id": 4323,
+            "id": 8943,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 4307,
+                "id": 8927,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4306,
+                  "id": 8926,
                   "name": "onlyWallet",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3934,
-                  "src": "4959:10:7",
+                  "referencedDeclaration": 8554,
+                  "src": "4977:10:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4959:10:7"
+                "src": "4977:10:8"
               },
               {
                 "arguments": [
@@ -18871,18 +18871,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4309,
+                      "id": 8929,
                       "name": "owners",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3908,
-                      "src": "4991:6:7",
+                      "referencedDeclaration": 8528,
+                      "src": "5009:6:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_storage",
                         "typeString": "address[] storage ref"
                       }
                     },
-                    "id": 4310,
+                    "id": 8930,
                     "isConstant": false,
                     "isLValue": true,
                     "isPure": false,
@@ -18890,7 +18890,7 @@
                     "memberName": "length",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "4991:13:7",
+                    "src": "5009:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -18898,49 +18898,49 @@
                   },
                   {
                     "argumentTypes": null,
-                    "id": 4311,
+                    "id": 8931,
                     "name": "_required",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4304,
-                    "src": "5006:9:7",
+                    "referencedDeclaration": 8924,
+                    "src": "5024:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4312,
+                "id": 8932,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4308,
+                  "id": 8928,
                   "name": "validRequirement",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4059,
-                  "src": "4974:16:7",
+                  "referencedDeclaration": 8679,
+                  "src": "4992:16:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_uint256_$",
                     "typeString": "modifier (uint256,uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "4974:42:7"
+                "src": "4992:42:8"
               }
             ],
             "name": "changeRequirement",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4305,
+              "id": 8925,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4304,
+                  "id": 8924,
                   "name": "_required",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4323,
-                  "src": "4928:14:7",
+                  "scope": 8943,
+                  "src": "4946:14:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -18948,10 +18948,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4303,
+                    "id": 8923,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "4928:4:7",
+                    "src": "4946:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -18961,43 +18961,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "4927:16:7"
+              "src": "4945:16:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4313,
+              "id": 8933,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5021:0:7"
+              "src": "5039:0:8"
             },
-            "scope": 4851,
-            "src": "4901:195:7",
+            "scope": 9471,
+            "src": "4919:195:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4346,
+              "id": 8966,
               "nodeType": "Block",
-              "src": "5475:116:7",
+              "src": "5493:116:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4340,
+                    "id": 8960,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4334,
+                      "id": 8954,
                       "name": "transactionId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4332,
-                      "src": "5485:13:7",
+                      "referencedDeclaration": 8952,
+                      "src": "5503:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -19010,12 +19010,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4336,
+                          "id": 8956,
                           "name": "destination",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4325,
-                          "src": "5516:11:7",
+                          "referencedDeclaration": 8945,
+                          "src": "5534:11:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -19023,12 +19023,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4337,
+                          "id": 8957,
                           "name": "value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4327,
-                          "src": "5529:5:7",
+                          "referencedDeclaration": 8947,
+                          "src": "5547:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -19036,12 +19036,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4338,
+                          "id": 8958,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4329,
-                          "src": "5536:4:7",
+                          "referencedDeclaration": 8949,
+                          "src": "5554:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -19063,18 +19063,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 4335,
+                        "id": 8955,
                         "name": "addTransaction",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4580,
-                        "src": "5501:14:7",
+                        "referencedDeclaration": 9200,
+                        "src": "5519:14:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$returns$_t_uint256_$",
                           "typeString": "function (address,uint256,bytes memory) returns (uint256)"
                         }
                       },
-                      "id": 4339,
+                      "id": 8959,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -19082,21 +19082,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "5501:40:7",
+                      "src": "5519:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "5485:56:7",
+                    "src": "5503:56:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4341,
+                  "id": 8961,
                   "nodeType": "ExpressionStatement",
-                  "src": "5485:56:7"
+                  "src": "5503:56:8"
                 },
                 {
                   "expression": {
@@ -19104,12 +19104,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4343,
+                        "id": 8963,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4332,
-                        "src": "5570:13:7",
+                        "referencedDeclaration": 8952,
+                        "src": "5588:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -19123,18 +19123,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4342,
+                      "id": 8962,
                       "name": "confirmTransaction",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4384,
-                      "src": "5551:18:7",
+                      "referencedDeclaration": 9004,
+                      "src": "5569:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4344,
+                    "id": 8964,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19142,20 +19142,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5551:33:7",
+                    "src": "5569:33:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4345,
+                  "id": 8965,
                   "nodeType": "ExpressionStatement",
-                  "src": "5551:33:7"
+                  "src": "5569:33:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to submit and confirm a transaction.\n @param destination Transaction target address.\n @param value Transaction ether value.\n @param data Transaction data payload.\n @return Returns transaction ID.",
-            "id": 4347,
+            "id": 8967,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -19163,16 +19163,16 @@
             "name": "submitTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4330,
+              "id": 8950,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4325,
+                  "id": 8945,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5382:19:7",
+                  "scope": 8967,
+                  "src": "5400:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -19180,10 +19180,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4324,
+                    "id": 8944,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5382:7:7",
+                    "src": "5400:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -19194,11 +19194,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4327,
+                  "id": 8947,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5403:10:7",
+                  "scope": 8967,
+                  "src": "5421:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -19206,10 +19206,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4326,
+                    "id": 8946,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5403:4:7",
+                    "src": "5421:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -19220,11 +19220,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4329,
+                  "id": 8949,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5415:10:7",
+                  "scope": 8967,
+                  "src": "5433:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -19232,10 +19232,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4328,
+                    "id": 8948,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5415:5:7",
+                    "src": "5433:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -19245,20 +19245,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5381:45:7"
+              "src": "5399:45:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4333,
+              "id": 8953,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4332,
+                  "id": 8952,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4347,
-                  "src": "5451:18:7",
+                  "scope": 8967,
+                  "src": "5469:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -19266,10 +19266,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4331,
+                    "id": 8951,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5451:4:7",
+                    "src": "5469:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -19279,24 +19279,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5450:20:7"
+              "src": "5468:20:8"
             },
-            "scope": 4851,
-            "src": "5355:236:7",
+            "scope": 9471,
+            "src": "5373:236:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4383,
+              "id": 9003,
               "nodeType": "Block",
-              "src": "5869:156:7",
+              "src": "5887:156:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4371,
+                    "id": 8991,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19307,26 +19307,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4364,
+                          "id": 8984,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "5879:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "5897:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4368,
+                        "id": 8988,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4365,
+                          "id": 8985,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4349,
-                          "src": "5893:13:7",
+                          "referencedDeclaration": 8969,
+                          "src": "5911:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -19337,29 +19337,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "5879:28:7",
+                        "src": "5897:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4369,
+                      "id": 8989,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4366,
+                          "id": 8986,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "5908:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "5926:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4367,
+                        "id": 8987,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -19367,7 +19367,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5908:10:7",
+                        "src": "5926:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -19378,7 +19378,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "5879:40:7",
+                      "src": "5897:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -19389,14 +19389,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 4370,
+                      "id": 8990,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "5922:4:7",
+                      "src": "5940:4:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -19404,15 +19404,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "5879:47:7",
+                    "src": "5897:47:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4372,
+                  "id": 8992,
                   "nodeType": "ExpressionStatement",
-                  "src": "5879:47:7"
+                  "src": "5897:47:8"
                 },
                 {
                   "expression": {
@@ -19422,18 +19422,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4374,
+                          "id": 8994,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "5949:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "5967:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4375,
+                        "id": 8995,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -19441,7 +19441,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "5949:10:7",
+                        "src": "5967:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -19449,12 +19449,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4376,
+                        "id": 8996,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4349,
-                        "src": "5961:13:7",
+                        "referencedDeclaration": 8969,
+                        "src": "5979:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -19472,18 +19472,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4373,
+                      "id": 8993,
                       "name": "Confirmation",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3852,
-                      "src": "5936:12:7",
+                      "referencedDeclaration": 8472,
+                      "src": "5954:12:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 4377,
+                    "id": 8997,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19491,15 +19491,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5936:39:7",
+                    "src": "5954:39:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4378,
+                  "id": 8998,
                   "nodeType": "ExpressionStatement",
-                  "src": "5936:39:7"
+                  "src": "5954:39:8"
                 },
                 {
                   "expression": {
@@ -19507,12 +19507,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4380,
+                        "id": 9000,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4349,
-                        "src": "6004:13:7",
+                        "referencedDeclaration": 8969,
+                        "src": "6022:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -19526,18 +19526,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4379,
+                      "id": 8999,
                       "name": "executeTransaction",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4479,
-                      "src": "5985:18:7",
+                      "referencedDeclaration": 9099,
+                      "src": "6003:18:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4381,
+                    "id": 9001,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19545,20 +19545,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "5985:33:7",
+                    "src": "6003:33:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4382,
+                  "id": 9002,
                   "nodeType": "ExpressionStatement",
-                  "src": "5985:33:7"
+                  "src": "6003:33:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to confirm a transaction.\n @param transactionId Transaction ID.",
-            "id": 4384,
+            "id": 9004,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -19569,18 +19569,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4352,
+                      "id": 8972,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "5772:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "5790:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4353,
+                    "id": 8973,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19588,73 +19588,73 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "5772:10:7",
+                    "src": "5790:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4354,
+                "id": 8974,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4351,
+                  "id": 8971,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "5760:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "5778:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5760:23:7"
+                "src": "5778:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4356,
+                    "id": 8976,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4349,
-                    "src": "5806:13:7",
+                    "referencedDeclaration": 8969,
+                    "src": "5824:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4357,
+                "id": 8977,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4355,
+                  "id": 8975,
                   "name": "transactionExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3974,
-                  "src": "5788:17:7",
+                  "referencedDeclaration": 8594,
+                  "src": "5806:17:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5788:32:7"
+                "src": "5806:32:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4359,
+                    "id": 8979,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4349,
-                    "src": "5838:13:7",
+                    "referencedDeclaration": 8969,
+                    "src": "5856:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -19664,18 +19664,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4360,
+                      "id": 8980,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "5853:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "5871:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4361,
+                    "id": 8981,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19683,44 +19683,44 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "5853:10:7",
+                    "src": "5871:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4362,
+                "id": 8982,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4358,
+                  "id": 8978,
                   "name": "notConfirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4007,
-                  "src": "5825:12:7",
+                  "referencedDeclaration": 8627,
+                  "src": "5843:12:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "5825:39:7"
+                "src": "5843:39:8"
               }
             ],
             "name": "confirmTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4350,
+              "id": 8970,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4349,
+                  "id": 8969,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4384,
-                  "src": "5725:18:7",
+                  "scope": 9004,
+                  "src": "5743:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -19728,10 +19728,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4348,
+                    "id": 8968,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "5725:4:7",
+                    "src": "5743:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -19741,31 +19741,31 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "5724:20:7"
+              "src": "5742:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4363,
+              "id": 8983,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "5869:0:7"
+              "src": "5887:0:8"
             },
-            "scope": 4851,
-            "src": "5697:328:7",
+            "scope": 9471,
+            "src": "5715:328:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4416,
+              "id": 9036,
               "nodeType": "Block",
-              "src": "6312:112:7",
+              "src": "6330:112:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4408,
+                    "id": 9028,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19776,26 +19776,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4401,
+                          "id": 9021,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "6322:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "6340:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4405,
+                        "id": 9025,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4402,
+                          "id": 9022,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4386,
-                          "src": "6336:13:7",
+                          "referencedDeclaration": 9006,
+                          "src": "6354:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -19806,29 +19806,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "6322:28:7",
+                        "src": "6340:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4406,
+                      "id": 9026,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4403,
+                          "id": 9023,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "6351:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "6369:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4404,
+                        "id": 9024,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -19836,7 +19836,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6351:10:7",
+                        "src": "6369:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -19847,7 +19847,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "6322:40:7",
+                      "src": "6340:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -19858,14 +19858,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 4407,
+                      "id": 9027,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "6365:5:7",
+                      "src": "6383:5:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -19873,15 +19873,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "6322:48:7",
+                    "src": "6340:48:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4409,
+                  "id": 9029,
                   "nodeType": "ExpressionStatement",
-                  "src": "6322:48:7"
+                  "src": "6340:48:8"
                 },
                 {
                   "expression": {
@@ -19891,18 +19891,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4411,
+                          "id": 9031,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 7769,
-                          "src": "6391:3:7",
+                          "referencedDeclaration": 11599,
+                          "src": "6409:3:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 4412,
+                        "id": 9032,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -19910,7 +19910,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "6391:10:7",
+                        "src": "6409:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -19918,12 +19918,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 4413,
+                        "id": 9033,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4386,
-                        "src": "6403:13:7",
+                        "referencedDeclaration": 9006,
+                        "src": "6421:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -19941,18 +19941,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4410,
+                      "id": 9030,
                       "name": "Revocation",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3858,
-                      "src": "6380:10:7",
+                      "referencedDeclaration": 8478,
+                      "src": "6398:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,uint256)"
                       }
                     },
-                    "id": 4414,
+                    "id": 9034,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -19960,20 +19960,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6380:37:7",
+                    "src": "6398:37:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4415,
+                  "id": 9035,
                   "nodeType": "ExpressionStatement",
-                  "src": "6380:37:7"
+                  "src": "6398:37:8"
                 }
               ]
             },
             "documentation": "@dev Allows an owner to revoke a confirmation for a transaction.\n @param transactionId Transaction ID.",
-            "id": 4417,
+            "id": 9037,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -19984,18 +19984,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4389,
+                      "id": 9009,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6224:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6242:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4390,
+                    "id": 9010,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -20003,40 +20003,40 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6224:10:7",
+                    "src": "6242:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4391,
+                "id": 9011,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4388,
+                  "id": 9008,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "6212:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "6230:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6212:23:7"
+                "src": "6230:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4393,
+                    "id": 9013,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4386,
-                    "src": "6250:13:7",
+                    "referencedDeclaration": 9006,
+                    "src": "6268:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -20046,18 +20046,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4394,
+                      "id": 9014,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6265:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6283:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4395,
+                    "id": 9015,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -20065,77 +20065,77 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6265:10:7",
+                    "src": "6283:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4396,
+                "id": 9016,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4392,
+                  "id": 9012,
                   "name": "confirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3990,
-                  "src": "6240:9:7",
+                  "referencedDeclaration": 8610,
+                  "src": "6258:9:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6240:36:7"
+                "src": "6258:36:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4398,
+                    "id": 9018,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4386,
-                    "src": "6293:13:7",
+                    "referencedDeclaration": 9006,
+                    "src": "6311:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4399,
+                "id": 9019,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4397,
+                  "id": 9017,
                   "name": "notExecuted",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4021,
-                  "src": "6281:11:7",
+                  "referencedDeclaration": 8641,
+                  "src": "6299:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6281:26:7"
+                "src": "6299:26:8"
               }
             ],
             "name": "revokeConfirmation",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4387,
+              "id": 9007,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4386,
+                  "id": 9006,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4417,
-                  "src": "6177:18:7",
+                  "scope": 9037,
+                  "src": "6195:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -20143,10 +20143,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4385,
+                    "id": 9005,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6177:4:7",
+                    "src": "6195:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -20156,26 +20156,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6176:20:7"
+              "src": "6194:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4400,
+              "id": 9020,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6312:0:7"
+              "src": "6330:0:8"
             },
-            "scope": 4851,
-            "src": "6149:275:7",
+            "scope": 9471,
+            "src": "6167:275:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4478,
+              "id": 9098,
               "nodeType": "Block",
-              "src": "6701:407:7",
+              "src": "6719:407:8",
               "statements": [
                 {
                   "condition": {
@@ -20183,12 +20183,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4435,
+                        "id": 9055,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4419,
-                        "src": "6727:13:7",
+                        "referencedDeclaration": 9039,
+                        "src": "6745:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -20202,18 +20202,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4434,
+                      "id": 9054,
                       "name": "isConfirmed",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4542,
-                      "src": "6715:11:7",
+                      "referencedDeclaration": 9162,
+                      "src": "6733:11:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_view$_t_uint256_$returns$_t_bool_$",
                         "typeString": "function (uint256) view returns (bool)"
                       }
                     },
-                    "id": 4436,
+                    "id": 9056,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -20221,48 +20221,48 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "6715:26:7",
+                    "src": "6733:26:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 4477,
+                  "id": 9097,
                   "nodeType": "IfStatement",
-                  "src": "6711:391:7",
+                  "src": "6729:391:8",
                   "trueBody": {
-                    "id": 4476,
+                    "id": 9096,
                     "nodeType": "Block",
-                    "src": "6743:359:7",
+                    "src": "6761:359:8",
                     "statements": [
                       {
                         "assignments": [
-                          4438
+                          9058
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 4438,
+                            "id": 9058,
                             "name": "txn",
                             "nodeType": "VariableDeclaration",
-                            "scope": 4479,
-                            "src": "6757:23:7",
+                            "scope": 9099,
+                            "src": "6775:23:8",
                             "stateVariable": false,
                             "storageLocation": "storage",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                               "typeString": "struct MultiSigWallet.Transaction"
                             },
                             "typeName": {
                               "contractScope": null,
-                              "id": 4437,
+                              "id": 9057,
                               "name": "Transaction",
                               "nodeType": "UserDefinedTypeName",
-                              "referencedDeclaration": 3921,
-                              "src": "6757:11:7",
+                              "referencedDeclaration": 8541,
+                              "src": "6775:11:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                 "typeString": "struct MultiSigWallet.Transaction"
                               }
                             },
@@ -20270,31 +20270,31 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 4442,
+                        "id": 9062,
                         "initialValue": {
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 4439,
+                            "id": 9059,
                             "name": "transactions",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3895,
-                            "src": "6783:12:7",
+                            "referencedDeclaration": 8515,
+                            "src": "6801:12:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                               "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                             }
                           },
-                          "id": 4441,
+                          "id": 9061,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 4440,
+                            "id": 9060,
                             "name": "transactionId",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4419,
-                            "src": "6796:13:7",
+                            "referencedDeclaration": 9039,
+                            "src": "6814:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -20305,19 +20305,19 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "6783:27:7",
+                          "src": "6801:27:8",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                            "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                             "typeString": "struct MultiSigWallet.Transaction storage ref"
                           }
                         },
                         "nodeType": "VariableDeclarationStatement",
-                        "src": "6757:53:7"
+                        "src": "6775:53:8"
                       },
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4447,
+                          "id": 9067,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20326,26 +20326,26 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 4443,
+                              "id": 9063,
                               "name": "txn",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4438,
-                              "src": "6824:3:7",
+                              "referencedDeclaration": 9058,
+                              "src": "6842:3:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                 "typeString": "struct MultiSigWallet.Transaction storage pointer"
                               }
                             },
-                            "id": 4445,
+                            "id": 9065,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": true,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "6824:12:7",
+                            "referencedDeclaration": 8540,
+                            "src": "6842:12:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -20356,14 +20356,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4446,
+                            "id": 9066,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "6839:4:7",
+                            "src": "6857:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -20371,15 +20371,15 @@
                             },
                             "value": "true"
                           },
-                          "src": "6824:19:7",
+                          "src": "6842:19:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "id": 4448,
+                        "id": 9068,
                         "nodeType": "ExpressionStatement",
-                        "src": "6824:19:7"
+                        "src": "6842:19:8"
                       },
                       {
                         "condition": {
@@ -20389,26 +20389,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4450,
+                                "id": 9070,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6875:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6893:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4451,
+                              "id": 9071,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "destination",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3914,
-                              "src": "6875:15:7",
+                              "referencedDeclaration": 8534,
+                              "src": "6893:15:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -20418,26 +20418,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4452,
+                                "id": 9072,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6892:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6910:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4453,
+                              "id": 9073,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3916,
-                              "src": "6892:9:7",
+                              "referencedDeclaration": 8536,
+                              "src": "6910:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -20449,32 +20449,32 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 4454,
+                                  "id": 9074,
                                   "name": "txn",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 4438,
-                                  "src": "6903:3:7",
+                                  "referencedDeclaration": 9058,
+                                  "src": "6921:3:8",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                    "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                     "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                   }
                                 },
-                                "id": 4455,
+                                "id": 9075,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "data",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 3918,
-                                "src": "6903:8:7",
+                                "referencedDeclaration": 8538,
+                                "src": "6921:8:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bytes_storage",
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 4456,
+                              "id": 9076,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
@@ -20482,7 +20482,7 @@
                               "memberName": "length",
                               "nodeType": "MemberAccess",
                               "referencedDeclaration": null,
-                              "src": "6903:15:7",
+                              "src": "6921:15:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -20492,26 +20492,26 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4457,
+                                "id": 9077,
                                 "name": "txn",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4438,
-                                "src": "6920:3:7",
+                                "referencedDeclaration": 9058,
+                                "src": "6938:3:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                  "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                   "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                 }
                               },
-                              "id": 4458,
+                              "id": 9078,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "data",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 3918,
-                              "src": "6920:8:7",
+                              "referencedDeclaration": 8538,
+                              "src": "6938:8:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_storage",
                                 "typeString": "bytes storage ref"
@@ -20537,18 +20537,18 @@
                                 "typeString": "bytes storage ref"
                               }
                             ],
-                            "id": 4449,
+                            "id": 9069,
                             "name": "external_call",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4499,
-                            "src": "6861:13:7",
+                            "referencedDeclaration": 9119,
+                            "src": "6879:13:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$_t_bytes_memory_ptr_$returns$_t_bool_$",
                               "typeString": "function (address,uint256,uint256,bytes memory) returns (bool)"
                             }
                           },
-                          "id": 4459,
+                          "id": 9079,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -20556,16 +20556,16 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "6861:68:7",
+                          "src": "6879:68:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": {
-                          "id": 4474,
+                          "id": 9094,
                           "nodeType": "Block",
-                          "src": "6990:102:7",
+                          "src": "7008:102:8",
                           "statements": [
                             {
                               "expression": {
@@ -20573,12 +20573,12 @@
                                 "arguments": [
                                   {
                                     "argumentTypes": null,
-                                    "id": 4465,
+                                    "id": 9085,
                                     "name": "transactionId",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4419,
-                                    "src": "7025:13:7",
+                                    "referencedDeclaration": 9039,
+                                    "src": "7043:13:8",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
                                       "typeString": "uint256"
@@ -20592,18 +20592,18 @@
                                       "typeString": "uint256"
                                     }
                                   ],
-                                  "id": 4464,
+                                  "id": 9084,
                                   "name": "ExecutionFailure",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 3870,
-                                  "src": "7008:16:7",
+                                  "referencedDeclaration": 8490,
+                                  "src": "7026:16:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                     "typeString": "function (uint256)"
                                   }
                                 },
-                                "id": 4466,
+                                "id": 9086,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20611,20 +20611,20 @@
                                 "lValueRequested": false,
                                 "names": [],
                                 "nodeType": "FunctionCall",
-                                "src": "7008:31:7",
+                                "src": "7026:31:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_tuple$__$",
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 4467,
+                              "id": 9087,
                               "nodeType": "ExpressionStatement",
-                              "src": "7008:31:7"
+                              "src": "7026:31:8"
                             },
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 4472,
+                                "id": 9092,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -20633,26 +20633,26 @@
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 4468,
+                                    "id": 9088,
                                     "name": "txn",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 4438,
-                                    "src": "7057:3:7",
+                                    "referencedDeclaration": 9058,
+                                    "src": "7075:3:8",
                                     "typeDescriptions": {
-                                      "typeIdentifier": "t_struct$_Transaction_$3921_storage_ptr",
+                                      "typeIdentifier": "t_struct$_Transaction_$8541_storage_ptr",
                                       "typeString": "struct MultiSigWallet.Transaction storage pointer"
                                     }
                                   },
-                                  "id": 4470,
+                                  "id": 9090,
                                   "isConstant": false,
                                   "isLValue": true,
                                   "isPure": false,
                                   "lValueRequested": true,
                                   "memberName": "executed",
                                   "nodeType": "MemberAccess",
-                                  "referencedDeclaration": 3920,
-                                  "src": "7057:12:7",
+                                  "referencedDeclaration": 8540,
+                                  "src": "7075:12:8",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
                                     "typeString": "bool"
@@ -20663,14 +20663,14 @@
                                 "rightHandSide": {
                                   "argumentTypes": null,
                                   "hexValue": "66616c7365",
-                                  "id": 4471,
+                                  "id": 9091,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
                                   "kind": "bool",
                                   "lValueRequested": false,
                                   "nodeType": "Literal",
-                                  "src": "7072:5:7",
+                                  "src": "7090:5:8",
                                   "subdenomination": null,
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bool",
@@ -20678,33 +20678,33 @@
                                   },
                                   "value": "false"
                                 },
-                                "src": "7057:20:7",
+                                "src": "7075:20:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_bool",
                                   "typeString": "bool"
                                 }
                               },
-                              "id": 4473,
+                              "id": 9093,
                               "nodeType": "ExpressionStatement",
-                              "src": "7057:20:7"
+                              "src": "7075:20:8"
                             }
                           ]
                         },
-                        "id": 4475,
+                        "id": 9095,
                         "nodeType": "IfStatement",
-                        "src": "6857:235:7",
+                        "src": "6875:235:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 4461,
+                                "id": 9081,
                                 "name": "transactionId",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4419,
-                                "src": "6957:13:7",
+                                "referencedDeclaration": 9039,
+                                "src": "6975:13:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -20718,18 +20718,18 @@
                                   "typeString": "uint256"
                                 }
                               ],
-                              "id": 4460,
+                              "id": 9080,
                               "name": "Execution",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3866,
-                              "src": "6947:9:7",
+                              "referencedDeclaration": 8486,
+                              "src": "6965:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                                 "typeString": "function (uint256)"
                               }
                             },
-                            "id": 4462,
+                            "id": 9082,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -20737,15 +20737,15 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "6947:24:7",
+                            "src": "6965:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_tuple$__$",
                               "typeString": "tuple()"
                             }
                           },
-                          "id": 4463,
+                          "id": 9083,
                           "nodeType": "ExpressionStatement",
-                          "src": "6947:24:7"
+                          "src": "6965:24:8"
                         }
                       }
                     ]
@@ -20754,7 +20754,7 @@
               ]
             },
             "documentation": "@dev Allows anyone to execute a confirmed transaction.\n @param transactionId Transaction ID.",
-            "id": 4479,
+            "id": 9099,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -20765,18 +20765,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4422,
+                      "id": 9042,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6613:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6631:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4423,
+                    "id": 9043,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -20784,40 +20784,40 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6613:10:7",
+                    "src": "6631:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4424,
+                "id": 9044,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4421,
+                  "id": 9041,
                   "name": "ownerExists",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3959,
-                  "src": "6601:11:7",
+                  "referencedDeclaration": 8579,
+                  "src": "6619:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6601:23:7"
+                "src": "6619:23:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4426,
+                    "id": 9046,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4419,
-                    "src": "6639:13:7",
+                    "referencedDeclaration": 9039,
+                    "src": "6657:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -20827,18 +20827,18 @@
                     "argumentTypes": null,
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4427,
+                      "id": 9047,
                       "name": "msg",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 7769,
-                      "src": "6654:3:7",
+                      "referencedDeclaration": 11599,
+                      "src": "6672:3:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_magic_message",
                         "typeString": "msg"
                       }
                     },
-                    "id": 4428,
+                    "id": 9048,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -20846,77 +20846,77 @@
                     "memberName": "sender",
                     "nodeType": "MemberAccess",
                     "referencedDeclaration": null,
-                    "src": "6654:10:7",
+                    "src": "6672:10:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4429,
+                "id": 9049,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4425,
+                  "id": 9045,
                   "name": "confirmed",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 3990,
-                  "src": "6629:9:7",
+                  "referencedDeclaration": 8610,
+                  "src": "6647:9:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$_t_address_$",
                     "typeString": "modifier (uint256,address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6629:36:7"
+                "src": "6647:36:8"
               },
               {
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4431,
+                    "id": 9051,
                     "name": "transactionId",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4419,
-                    "src": "6682:13:7",
+                    "referencedDeclaration": 9039,
+                    "src": "6700:13:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   }
                 ],
-                "id": 4432,
+                "id": 9052,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4430,
+                  "id": 9050,
                   "name": "notExecuted",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4021,
-                  "src": "6670:11:7",
+                  "referencedDeclaration": 8641,
+                  "src": "6688:11:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_uint256_$",
                     "typeString": "modifier (uint256)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "6670:26:7"
+                "src": "6688:26:8"
               }
             ],
             "name": "executeTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4420,
+              "id": 9040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4419,
+                  "id": 9039,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4479,
-                  "src": "6566:18:7",
+                  "scope": 9099,
+                  "src": "6584:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -20924,10 +20924,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4418,
+                    "id": 9038,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "6566:4:7",
+                    "src": "6584:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -20937,37 +20937,37 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "6565:20:7"
+              "src": "6583:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4433,
+              "id": 9053,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "6701:0:7"
+              "src": "6719:0:8"
             },
-            "scope": 4851,
-            "src": "6538:570:7",
+            "scope": 9471,
+            "src": "6556:570:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4498,
+              "id": 9118,
               "nodeType": "Block",
-              "src": "7393:962:7",
+              "src": "7411:962:8",
               "statements": [
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4493,
+                      "id": 9113,
                       "name": "result",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4499,
-                      "src": "7403:11:7",
+                      "scope": 9119,
+                      "src": "7421:11:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -20975,10 +20975,10 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 4492,
+                        "id": 9112,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
-                        "src": "7403:4:7",
+                        "src": "7421:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -20988,87 +20988,87 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4494,
+                  "id": 9114,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "7403:11:7"
+                  "src": "7421:11:8"
                 },
                 {
                   "externalReferences": [
                     {
                       "result": {
-                        "declaration": 4493,
+                        "declaration": 9113,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "7727:6:7",
+                        "src": "7745:6:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "data": {
-                        "declaration": 4487,
+                        "declaration": 9107,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "7640:4:7",
+                        "src": "7658:4:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "destination": {
-                        "declaration": 4481,
+                        "declaration": 9101,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8057:11:7",
+                        "src": "8075:11:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "value": {
-                        "declaration": 4483,
+                        "declaration": 9103,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8082:5:7",
+                        "src": "8100:5:8",
                         "valueSize": 1
                       }
                     },
                     {
                       "dataLength": {
-                        "declaration": 4485,
+                        "declaration": 9105,
                         "isOffset": false,
                         "isSlot": false,
-                        "src": "8116:10:7",
+                        "src": "8134:10:8",
                         "valueSize": 1
                       }
                     }
                   ],
-                  "id": 4495,
+                  "id": 9115,
                   "nodeType": "InlineAssembly",
                   "operations": "{\n    let x := mload(0x40)\n    let d := add(data, 32)\n    result := call(sub(gas(), 34710), destination, value, d, dataLength, x, 0)\n}",
-                  "src": "7424:917:7"
+                  "src": "7442:917:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4496,
+                    "id": 9116,
                     "name": "result",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4493,
-                    "src": "8342:6:7",
+                    "referencedDeclaration": 9113,
+                    "src": "8360:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "functionReturnParameters": 4491,
-                  "id": 4497,
+                  "functionReturnParameters": 9111,
+                  "id": 9117,
                   "nodeType": "Return",
-                  "src": "8335:13:7"
+                  "src": "8353:13:8"
                 }
               ]
             },
             "documentation": null,
-            "id": 4499,
+            "id": 9119,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -21076,16 +21076,16 @@
             "name": "external_call",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4488,
+              "id": 9108,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4481,
+                  "id": 9101,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7308:19:7",
+                  "scope": 9119,
+                  "src": "7326:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21093,10 +21093,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4480,
+                    "id": 9100,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7308:7:7",
+                    "src": "7326:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -21107,11 +21107,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4483,
+                  "id": 9103,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7329:10:7",
+                  "scope": 9119,
+                  "src": "7347:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21119,10 +21119,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4482,
+                    "id": 9102,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7329:4:7",
+                    "src": "7347:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -21133,11 +21133,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4485,
+                  "id": 9105,
                   "name": "dataLength",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7341:15:7",
+                  "scope": 9119,
+                  "src": "7359:15:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21145,10 +21145,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4484,
+                    "id": 9104,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7341:4:7",
+                    "src": "7359:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -21159,11 +21159,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4487,
+                  "id": 9107,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7358:10:7",
+                  "scope": 9119,
+                  "src": "7376:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21171,10 +21171,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4486,
+                    "id": 9106,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7358:5:7",
+                    "src": "7376:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -21184,20 +21184,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7307:62:7"
+              "src": "7325:62:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4491,
+              "id": 9111,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4490,
+                  "id": 9110,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4499,
-                  "src": "7387:4:7",
+                  "scope": 9119,
+                  "src": "7405:4:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21205,10 +21205,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4489,
+                    "id": 9109,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "7387:4:7",
+                    "src": "7405:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -21218,32 +21218,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "7386:6:7"
+              "src": "7404:6:8"
             },
-            "scope": 4851,
-            "src": "7285:1070:7",
+            "scope": 9471,
+            "src": "7303:1070:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "private"
           },
           {
             "body": {
-              "id": 4541,
+              "id": 9161,
               "nodeType": "Block",
-              "src": "8594:241:7",
+              "src": "8612:241:8",
               "statements": [
                 {
                   "assignments": [
-                    4507
+                    9127
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4507,
+                      "id": 9127,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4542,
-                      "src": "8604:10:7",
+                      "scope": 9162,
+                      "src": "8622:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -21251,10 +21251,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4506,
+                        "id": 9126,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "8604:4:7",
+                        "src": "8622:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -21264,18 +21264,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4509,
+                  "id": 9129,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4508,
+                    "id": 9128,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "8617:1:7",
+                    "src": "8635:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -21284,13 +21284,13 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "8604:14:7"
+                  "src": "8622:14:8"
                 },
                 {
                   "body": {
-                    "id": 4539,
+                    "id": 9159,
                     "nodeType": "Block",
-                    "src": "8669:160:7",
+                    "src": "8687:160:8",
                     "statements": [
                       {
                         "condition": {
@@ -21299,26 +21299,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4521,
+                              "id": 9141,
                               "name": "confirmations",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3901,
-                              "src": "8687:13:7",
+                              "referencedDeclaration": 8521,
+                              "src": "8705:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                                 "typeString": "mapping(uint256 => mapping(address => bool))"
                               }
                             },
-                            "id": 4523,
+                            "id": 9143,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4522,
+                              "id": 9142,
                               "name": "transactionId",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4501,
-                              "src": "8701:13:7",
+                              "referencedDeclaration": 9121,
+                              "src": "8719:13:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21329,37 +21329,37 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "8687:28:7",
+                            "src": "8705:28:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                               "typeString": "mapping(address => bool)"
                             }
                           },
-                          "id": 4527,
+                          "id": 9147,
                           "indexExpression": {
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4524,
+                              "id": 9144,
                               "name": "owners",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3908,
-                              "src": "8716:6:7",
+                              "referencedDeclaration": 8528,
+                              "src": "8734:6:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                 "typeString": "address[] storage ref"
                               }
                             },
-                            "id": 4526,
+                            "id": 9146,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4525,
+                              "id": 9145,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4511,
-                              "src": "8723:1:7",
+                              "referencedDeclaration": 9131,
+                              "src": "8741:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21370,7 +21370,7 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "8716:9:7",
+                            "src": "8734:9:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -21381,32 +21381,32 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "8687:39:7",
+                          "src": "8705:39:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4532,
+                        "id": 9152,
                         "nodeType": "IfStatement",
-                        "src": "8683:71:7",
+                        "src": "8701:71:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4530,
+                            "id": 9150,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4528,
+                              "id": 9148,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4507,
-                              "src": "8744:5:7",
+                              "referencedDeclaration": 9127,
+                              "src": "8762:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -21417,14 +21417,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4529,
+                              "id": 9149,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "8753:1:7",
+                              "src": "8771:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -21432,15 +21432,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "8744:10:7",
+                            "src": "8762:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4531,
+                          "id": 9151,
                           "nodeType": "ExpressionStatement",
-                          "src": "8744:10:7"
+                          "src": "8762:10:8"
                         }
                       },
                       {
@@ -21450,19 +21450,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4535,
+                          "id": 9155,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4533,
+                            "id": 9153,
                             "name": "count",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4507,
-                            "src": "8772:5:7",
+                            "referencedDeclaration": 9127,
+                            "src": "8790:5:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -21472,39 +21472,39 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4534,
+                            "id": 9154,
                             "name": "required",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 3910,
-                            "src": "8781:8:7",
+                            "referencedDeclaration": 8530,
+                            "src": "8799:8:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "8772:17:7",
+                          "src": "8790:17:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
                         "falseBody": null,
-                        "id": 4538,
+                        "id": 9158,
                         "nodeType": "IfStatement",
-                        "src": "8768:50:7",
+                        "src": "8786:50:8",
                         "trueBody": {
                           "expression": {
                             "argumentTypes": null,
                             "hexValue": "74727565",
-                            "id": 4536,
+                            "id": 9156,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "bool",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "8814:4:7",
+                            "src": "8832:4:8",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
@@ -21512,10 +21512,10 @@
                             },
                             "value": "true"
                           },
-                          "functionReturnParameters": 4505,
-                          "id": 4537,
+                          "functionReturnParameters": 9125,
+                          "id": 9157,
                           "nodeType": "Return",
-                          "src": "8807:11:7"
+                          "src": "8825:11:8"
                         }
                       }
                     ]
@@ -21526,19 +21526,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4517,
+                    "id": 9137,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4514,
+                      "id": 9134,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4511,
-                      "src": "8645:1:7",
+                      "referencedDeclaration": 9131,
+                      "src": "8663:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -21550,18 +21550,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4515,
+                        "id": 9135,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "8649:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "8667:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4516,
+                      "id": 9136,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -21569,31 +21569,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "8649:13:7",
+                      "src": "8667:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "8645:17:7",
+                    "src": "8663:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4540,
+                  "id": 9160,
                   "initializationExpression": {
                     "assignments": [
-                      4511
+                      9131
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4511,
+                        "id": 9131,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4542,
-                        "src": "8633:6:7",
+                        "scope": 9162,
+                        "src": "8651:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -21601,10 +21601,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4510,
+                          "id": 9130,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "8633:4:7",
+                          "src": "8651:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -21614,18 +21614,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4513,
+                    "id": 9133,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4512,
+                      "id": 9132,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "8642:1:7",
+                      "src": "8660:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -21634,12 +21634,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "8633:10:7"
+                    "src": "8651:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4519,
+                      "id": 9139,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -21647,15 +21647,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "8664:3:7",
+                      "src": "8682:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4518,
+                        "id": 9138,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4511,
-                        "src": "8664:1:7",
+                        "referencedDeclaration": 9131,
+                        "src": "8682:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -21666,17 +21666,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4520,
+                    "id": 9140,
                     "nodeType": "ExpressionStatement",
-                    "src": "8664:3:7"
+                    "src": "8682:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "8628:201:7"
+                  "src": "8646:201:8"
                 }
               ]
             },
             "documentation": "@dev Returns the confirmation status of a transaction.\n @param transactionId Transaction ID.\n @return Confirmation status.",
-            "id": 4542,
+            "id": 9162,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -21684,16 +21684,16 @@
             "name": "isConfirmed",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4502,
+              "id": 9122,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4501,
+                  "id": 9121,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4542,
-                  "src": "8527:18:7",
+                  "scope": 9162,
+                  "src": "8545:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21701,10 +21701,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4500,
+                    "id": 9120,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "8527:4:7",
+                    "src": "8545:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -21714,20 +21714,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "8526:20:7"
+              "src": "8544:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4505,
+              "id": 9125,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4504,
+                  "id": 9124,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4542,
-                  "src": "8584:4:7",
+                  "scope": 9162,
+                  "src": "8602:4:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -21735,10 +21735,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4503,
+                    "id": 9123,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "8584:4:7",
+                    "src": "8602:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -21748,36 +21748,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "8583:6:7"
+              "src": "8601:6:8"
             },
-            "scope": 4851,
-            "src": "8506:329:7",
+            "scope": 9471,
+            "src": "8524:329:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4579,
+              "id": 9199,
               "nodeType": "Block",
-              "src": "9312:303:7",
+              "src": "9330:303:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4558,
+                    "id": 9178,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4556,
+                      "id": 9176,
                       "name": "transactionId",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4554,
-                      "src": "9322:13:7",
+                      "referencedDeclaration": 9174,
+                      "src": "9340:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -21787,31 +21787,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 4557,
+                      "id": 9177,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "9338:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "9356:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9322:32:7",
+                    "src": "9340:32:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4559,
+                  "id": 9179,
                   "nodeType": "ExpressionStatement",
-                  "src": "9322:32:7"
+                  "src": "9340:32:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4569,
+                    "id": 9189,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -21820,26 +21820,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 4560,
+                        "id": 9180,
                         "name": "transactions",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3895,
-                        "src": "9364:12:7",
+                        "referencedDeclaration": 8515,
+                        "src": "9382:12:8",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                           "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                         }
                       },
-                      "id": 4562,
+                      "id": 9182,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 4561,
+                        "id": 9181,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4554,
-                        "src": "9377:13:7",
+                        "referencedDeclaration": 9174,
+                        "src": "9395:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -21850,9 +21850,9 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "9364:27:7",
+                      "src": "9382:27:8",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                        "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                         "typeString": "struct MultiSigWallet.Transaction storage ref"
                       }
                     },
@@ -21863,12 +21863,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4564,
+                          "id": 9184,
                           "name": "destination",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4544,
-                          "src": "9434:11:7",
+                          "referencedDeclaration": 9164,
+                          "src": "9452:11:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -21876,12 +21876,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4565,
+                          "id": 9185,
                           "name": "value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4546,
-                          "src": "9467:5:7",
+                          "referencedDeclaration": 9166,
+                          "src": "9485:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -21889,12 +21889,12 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 4566,
+                          "id": 9186,
                           "name": "data",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4548,
-                          "src": "9493:4:7",
+                          "referencedDeclaration": 9168,
+                          "src": "9511:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
                             "typeString": "bytes memory"
@@ -21903,14 +21903,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "66616c7365",
-                          "id": 4567,
+                          "id": 9187,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "bool",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "9522:5:7",
+                          "src": "9540:5:8",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
@@ -21921,18 +21921,18 @@
                       ],
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4563,
+                        "id": 9183,
                         "name": "Transaction",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3921,
-                        "src": "9394:11:7",
+                        "referencedDeclaration": 8541,
+                        "src": "9412:11:8",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Transaction_$3921_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Transaction_$8541_storage_ptr_$",
                           "typeString": "type(struct MultiSigWallet.Transaction storage pointer)"
                         }
                       },
-                      "id": 4568,
+                      "id": 9188,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -21945,38 +21945,38 @@
                         "executed"
                       ],
                       "nodeType": "FunctionCall",
-                      "src": "9394:148:7",
+                      "src": "9412:148:8",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Transaction_$3921_memory",
+                        "typeIdentifier": "t_struct$_Transaction_$8541_memory",
                         "typeString": "struct MultiSigWallet.Transaction memory"
                       }
                     },
-                    "src": "9364:178:7",
+                    "src": "9382:178:8",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                      "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                       "typeString": "struct MultiSigWallet.Transaction storage ref"
                     }
                   },
-                  "id": 4570,
+                  "id": 9190,
                   "nodeType": "ExpressionStatement",
-                  "src": "9364:178:7"
+                  "src": "9382:178:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4573,
+                    "id": 9193,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4571,
+                      "id": 9191,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "9552:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "9570:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -21987,14 +21987,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "31",
-                      "id": 4572,
+                      "id": 9192,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9572:1:7",
+                      "src": "9590:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_1_by_1",
@@ -22002,15 +22002,15 @@
                       },
                       "value": "1"
                     },
-                    "src": "9552:21:7",
+                    "src": "9570:21:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 4574,
+                  "id": 9194,
                   "nodeType": "ExpressionStatement",
-                  "src": "9552:21:7"
+                  "src": "9570:21:8"
                 },
                 {
                   "expression": {
@@ -22018,12 +22018,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4576,
+                        "id": 9196,
                         "name": "transactionId",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4554,
-                        "src": "9594:13:7",
+                        "referencedDeclaration": 9174,
+                        "src": "9612:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -22037,18 +22037,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4575,
+                      "id": 9195,
                       "name": "Submission",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3862,
-                      "src": "9583:10:7",
+                      "referencedDeclaration": 8482,
+                      "src": "9601:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 4577,
+                    "id": 9197,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -22056,20 +22056,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "9583:25:7",
+                    "src": "9601:25:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 4578,
+                  "id": 9198,
                   "nodeType": "ExpressionStatement",
-                  "src": "9583:25:7"
+                  "src": "9601:25:8"
                 }
               ]
             },
             "documentation": "@dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.\n @param destination Transaction target address.\n @param value Transaction ether value.\n @param data Transaction data payload.\n @return Returns transaction ID.",
-            "id": 4580,
+            "id": 9200,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -22078,49 +22078,49 @@
                 "arguments": [
                   {
                     "argumentTypes": null,
-                    "id": 4551,
+                    "id": 9171,
                     "name": "destination",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 4544,
-                    "src": "9262:11:7",
+                    "referencedDeclaration": 9164,
+                    "src": "9280:11:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   }
                 ],
-                "id": 4552,
+                "id": 9172,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 4550,
+                  "id": 9170,
                   "name": "notNull",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 4033,
-                  "src": "9254:7:7",
+                  "referencedDeclaration": 8653,
+                  "src": "9272:7:8",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$_t_address_$",
                     "typeString": "modifier (address)"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "9254:20:7"
+                "src": "9272:20:8"
               }
             ],
             "name": "addTransaction",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4549,
+              "id": 9169,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4544,
+                  "id": 9164,
                   "name": "destination",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9192:19:7",
+                  "scope": 9200,
+                  "src": "9210:19:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22128,10 +22128,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4543,
+                    "id": 9163,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9192:7:7",
+                    "src": "9210:7:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -22142,11 +22142,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4546,
+                  "id": 9166,
                   "name": "value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9213:10:7",
+                  "scope": 9200,
+                  "src": "9231:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22154,10 +22154,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4545,
+                    "id": 9165,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9213:4:7",
+                    "src": "9231:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -22168,11 +22168,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4548,
+                  "id": 9168,
                   "name": "data",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9225:10:7",
+                  "scope": 9200,
+                  "src": "9243:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22180,10 +22180,10 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 4547,
+                    "id": 9167,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9225:5:7",
+                    "src": "9243:5:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bytes_storage_ptr",
                       "typeString": "bytes"
@@ -22193,20 +22193,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9191:45:7"
+              "src": "9209:45:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4555,
+              "id": 9175,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4554,
+                  "id": 9174,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4580,
-                  "src": "9288:18:7",
+                  "scope": 9200,
+                  "src": "9306:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22214,10 +22214,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4553,
+                    "id": 9173,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9288:4:7",
+                    "src": "9306:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -22227,19 +22227,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9287:20:7"
+              "src": "9305:20:8"
             },
-            "scope": 4851,
-            "src": "9168:447:7",
+            "scope": 9471,
+            "src": "9186:447:8",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 4612,
+              "id": 9232,
               "nodeType": "Block",
-              "src": "9915:157:7",
+              "src": "9933:157:8",
               "statements": [
                 {
                   "body": {
@@ -22249,26 +22249,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4598,
+                          "id": 9218,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "9982:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "10000:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4600,
+                        "id": 9220,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4599,
+                          "id": 9219,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4582,
-                          "src": "9996:13:7",
+                          "referencedDeclaration": 9202,
+                          "src": "10014:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -22279,37 +22279,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "9982:28:7",
+                        "src": "10000:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4604,
+                      "id": 9224,
                       "indexExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4601,
+                          "id": 9221,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "10011:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "10029:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4603,
+                        "id": 9223,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4602,
+                          "id": 9222,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4588,
-                          "src": "10018:1:7",
+                          "referencedDeclaration": 9208,
+                          "src": "10036:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -22320,7 +22320,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "10011:9:7",
+                        "src": "10029:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -22331,37 +22331,37 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "9982:39:7",
+                      "src": "10000:39:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4610,
+                    "id": 9230,
                     "nodeType": "IfStatement",
-                    "src": "9978:88:7",
+                    "src": "9996:88:8",
                     "trueBody": {
-                      "id": 4609,
+                      "id": 9229,
                       "nodeType": "Block",
-                      "src": "10023:43:7",
+                      "src": "10041:43:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4607,
+                            "id": 9227,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4605,
+                              "id": 9225,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4585,
-                              "src": "10041:5:7",
+                              "referencedDeclaration": 9205,
+                              "src": "10059:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -22372,14 +22372,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4606,
+                              "id": 9226,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "10050:1:7",
+                              "src": "10068:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -22387,15 +22387,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "10041:10:7",
+                            "src": "10059:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4608,
+                          "id": 9228,
                           "nodeType": "ExpressionStatement",
-                          "src": "10041:10:7"
+                          "src": "10059:10:8"
                         }
                       ]
                     }
@@ -22406,19 +22406,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4594,
+                    "id": 9214,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4591,
+                      "id": 9211,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4588,
-                      "src": "9942:1:7",
+                      "referencedDeclaration": 9208,
+                      "src": "9960:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -22430,18 +22430,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4592,
+                        "id": 9212,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "9946:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "9964:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4593,
+                      "id": 9213,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -22449,31 +22449,31 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "9946:13:7",
+                      "src": "9964:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "9942:17:7",
+                    "src": "9960:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4611,
+                  "id": 9231,
                   "initializationExpression": {
                     "assignments": [
-                      4588
+                      9208
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4588,
+                        "id": 9208,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4613,
-                        "src": "9930:6:7",
+                        "scope": 9233,
+                        "src": "9948:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -22481,10 +22481,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4587,
+                          "id": 9207,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "9930:4:7",
+                          "src": "9948:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -22494,18 +22494,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4590,
+                    "id": 9210,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4589,
+                      "id": 9209,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "9939:1:7",
+                      "src": "9957:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -22514,12 +22514,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "9930:10:7"
+                    "src": "9948:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4596,
+                      "id": 9216,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -22527,15 +22527,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "9961:3:7",
+                      "src": "9979:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4595,
+                        "id": 9215,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4588,
-                        "src": "9961:1:7",
+                        "referencedDeclaration": 9208,
+                        "src": "9979:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -22546,17 +22546,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4597,
+                    "id": 9217,
                     "nodeType": "ExpressionStatement",
-                    "src": "9961:3:7"
+                    "src": "9979:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "9925:141:7"
+                  "src": "9943:141:8"
                 }
               ]
             },
             "documentation": "@dev Returns number of confirmations of a transaction.\n @param transactionId Transaction ID.\n @return Number of confirmations.",
-            "id": 4613,
+            "id": 9233,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -22564,16 +22564,16 @@
             "name": "getConfirmationCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4583,
+              "id": 9203,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4582,
+                  "id": 9202,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4613,
-                  "src": "9842:18:7",
+                  "scope": 9233,
+                  "src": "9860:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22581,10 +22581,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4581,
+                    "id": 9201,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9842:4:7",
+                    "src": "9860:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -22594,20 +22594,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9841:20:7"
+              "src": "9859:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4586,
+              "id": 9206,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4585,
+                  "id": 9205,
                   "name": "count",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4613,
-                  "src": "9899:10:7",
+                  "scope": 9233,
+                  "src": "9917:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -22615,10 +22615,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4584,
+                    "id": 9204,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "9899:4:7",
+                    "src": "9917:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -22628,19 +22628,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "9898:12:7"
+              "src": "9916:12:8"
             },
-            "scope": 4851,
-            "src": "9812:260:7",
+            "scope": 9471,
+            "src": "9830:260:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4653,
+              "id": 9273,
               "nodeType": "Block",
-              "src": "10445:197:7",
+              "src": "10463:197:8",
               "statements": [
                 {
                   "body": {
@@ -22650,7 +22650,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4645,
+                      "id": 9265,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -22661,19 +22661,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4638,
+                        "id": 9258,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4632,
+                          "id": 9252,
                           "name": "pending",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4615,
-                          "src": "10515:7:7",
+                          "referencedDeclaration": 9235,
+                          "src": "10533:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -22683,7 +22683,7 @@
                         "operator": "&&",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4637,
+                          "id": 9257,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -22691,33 +22691,33 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "10526:25:7",
+                          "src": "10544:25:8",
                           "subExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4633,
+                                "id": 9253,
                                 "name": "transactions",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3895,
-                                "src": "10527:12:7",
+                                "referencedDeclaration": 8515,
+                                "src": "10545:12:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                   "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                                 }
                               },
-                              "id": 4635,
+                              "id": 9255,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4634,
+                                "id": 9254,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4623,
-                                "src": "10540:1:7",
+                                "referencedDeclaration": 9243,
+                                "src": "10558:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -22728,21 +22728,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "10527:15:7",
+                              "src": "10545:15:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                                 "typeString": "struct MultiSigWallet.Transaction storage ref"
                               }
                             },
-                            "id": 4636,
+                            "id": 9256,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "10527:24:7",
+                            "referencedDeclaration": 8540,
+                            "src": "10545:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -22753,7 +22753,7 @@
                             "typeString": "bool"
                           }
                         },
-                        "src": "10515:36:7",
+                        "src": "10533:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -22767,19 +22767,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4644,
+                        "id": 9264,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4639,
+                          "id": 9259,
                           "name": "executed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4617,
-                          "src": "10555:8:7",
+                          "referencedDeclaration": 9237,
+                          "src": "10573:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -22793,26 +22793,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4640,
+                              "id": 9260,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "10567:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "10585:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4642,
+                            "id": 9262,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4641,
+                              "id": 9261,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4623,
-                              "src": "10580:1:7",
+                              "referencedDeclaration": 9243,
+                              "src": "10598:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -22823,63 +22823,63 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "10567:15:7",
+                            "src": "10585:15:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4643,
+                          "id": 9263,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "10567:24:7",
+                          "referencedDeclaration": 8540,
+                          "src": "10585:24:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "10555:36:7",
+                        "src": "10573:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "10515:76:7",
+                      "src": "10533:76:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4651,
+                    "id": 9271,
                     "nodeType": "IfStatement",
-                    "src": "10511:125:7",
+                    "src": "10529:125:8",
                     "trueBody": {
-                      "id": 4650,
+                      "id": 9270,
                       "nodeType": "Block",
-                      "src": "10593:43:7",
+                      "src": "10611:43:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4648,
+                            "id": 9268,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4646,
+                              "id": 9266,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4620,
-                              "src": "10611:5:7",
+                              "referencedDeclaration": 9240,
+                              "src": "10629:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -22890,14 +22890,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4647,
+                              "id": 9267,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "10620:1:7",
+                              "src": "10638:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -22905,15 +22905,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "10611:10:7",
+                            "src": "10629:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4649,
+                          "id": 9269,
                           "nodeType": "ExpressionStatement",
-                          "src": "10611:10:7"
+                          "src": "10629:10:8"
                         }
                       ]
                     }
@@ -22924,19 +22924,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4628,
+                    "id": 9248,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4626,
+                      "id": 9246,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4623,
-                      "src": "10472:1:7",
+                      "referencedDeclaration": 9243,
+                      "src": "10490:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -22946,36 +22946,36 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4627,
+                      "id": 9247,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "10476:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "10494:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "10472:20:7",
+                    "src": "10490:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4652,
+                  "id": 9272,
                   "initializationExpression": {
                     "assignments": [
-                      4623
+                      9243
                     ],
                     "declarations": [
                       {
                         "constant": false,
-                        "id": 4623,
+                        "id": 9243,
                         "name": "i",
                         "nodeType": "VariableDeclaration",
-                        "scope": 4654,
-                        "src": "10460:6:7",
+                        "scope": 9274,
+                        "src": "10478:6:8",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {
@@ -22983,10 +22983,10 @@
                           "typeString": "uint256"
                         },
                         "typeName": {
-                          "id": 4622,
+                          "id": 9242,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "10460:4:7",
+                          "src": "10478:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -22996,18 +22996,18 @@
                         "visibility": "internal"
                       }
                     ],
-                    "id": 4625,
+                    "id": 9245,
                     "initialValue": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 4624,
+                      "id": 9244,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "10469:1:7",
+                      "src": "10487:1:8",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -23016,12 +23016,12 @@
                       "value": "0"
                     },
                     "nodeType": "VariableDeclarationStatement",
-                    "src": "10460:10:7"
+                    "src": "10478:10:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4630,
+                      "id": 9250,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -23029,15 +23029,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "10494:3:7",
+                      "src": "10512:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4629,
+                        "id": 9249,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4623,
-                        "src": "10494:1:7",
+                        "referencedDeclaration": 9243,
+                        "src": "10512:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23048,17 +23048,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4631,
+                    "id": 9251,
                     "nodeType": "ExpressionStatement",
-                    "src": "10494:3:7"
+                    "src": "10512:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "10455:181:7"
+                  "src": "10473:181:8"
                 }
               ]
             },
             "documentation": "@dev Returns total number of transactions after filers are applied.\n @param pending Include pending transactions.\n @param executed Include executed transactions.\n @return Total number of transactions after filters are applied.",
-            "id": 4654,
+            "id": 9274,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -23066,16 +23066,16 @@
             "name": "getTransactionCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4618,
+              "id": 9238,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4615,
+                  "id": 9235,
                   "name": "pending",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10363:12:7",
+                  "scope": 9274,
+                  "src": "10381:12:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23083,10 +23083,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4614,
+                    "id": 9234,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10363:4:7",
+                    "src": "10381:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -23097,11 +23097,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4617,
+                  "id": 9237,
                   "name": "executed",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10377:13:7",
+                  "scope": 9274,
+                  "src": "10395:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23109,10 +23109,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4616,
+                    "id": 9236,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10377:4:7",
+                    "src": "10395:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -23122,20 +23122,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10362:29:7"
+              "src": "10380:29:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4621,
+              "id": 9241,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4620,
+                  "id": 9240,
                   "name": "count",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4654,
-                  "src": "10429:10:7",
+                  "scope": 9274,
+                  "src": "10447:10:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23143,10 +23143,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4619,
+                    "id": 9239,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "10429:4:7",
+                    "src": "10447:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -23156,43 +23156,43 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10428:12:7"
+              "src": "10446:12:8"
             },
-            "scope": 4851,
-            "src": "10334:308:7",
+            "scope": 9471,
+            "src": "10352:308:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4662,
+              "id": 9282,
               "nodeType": "Block",
-              "src": "10799:30:7",
+              "src": "10817:30:8",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4660,
+                    "id": 9280,
                     "name": "owners",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 3908,
-                    "src": "10816:6:7",
+                    "referencedDeclaration": 8528,
+                    "src": "10834:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage",
                       "typeString": "address[] storage ref"
                     }
                   },
-                  "functionReturnParameters": 4659,
-                  "id": 4661,
+                  "functionReturnParameters": 9279,
+                  "id": 9281,
                   "nodeType": "Return",
-                  "src": "10809:13:7"
+                  "src": "10827:13:8"
                 }
               ]
             },
             "documentation": "@dev Returns list of owners.\n @return List of owner addresses.",
-            "id": 4663,
+            "id": 9283,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -23200,23 +23200,23 @@
             "name": "getOwners",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4655,
+              "id": 9275,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "10744:2:7"
+              "src": "10762:2:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4659,
+              "id": 9279,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4658,
+                  "id": 9278,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4663,
-                  "src": "10784:9:7",
+                  "scope": 9283,
+                  "src": "10802:9:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -23225,19 +23225,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4656,
+                      "id": 9276,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "10784:7:7",
+                      "src": "10802:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4657,
+                    "id": 9277,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "10784:9:7",
+                    "src": "10802:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -23247,32 +23247,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "10783:11:7"
+              "src": "10801:11:8"
             },
-            "scope": 4851,
-            "src": "10726:103:7",
+            "scope": 9471,
+            "src": "10744:103:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4749,
+              "id": 9369,
               "nodeType": "Block",
-              "src": "11121:458:7",
+              "src": "11139:458:8",
               "statements": [
                 {
                   "assignments": [
-                    4674
+                    9294
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4674,
+                      "id": 9294,
                       "name": "confirmationsTemp",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11131:34:7",
+                      "scope": 9370,
+                      "src": "11149:34:8",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -23281,19 +23281,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4672,
+                          "id": 9292,
                           "name": "address",
                           "nodeType": "ElementaryTypeName",
-                          "src": "11131:7:7",
+                          "src": "11149:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4673,
+                        "id": 9293,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "11131:9:7",
+                        "src": "11149:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                           "typeString": "address[]"
@@ -23303,7 +23303,7 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4681,
+                  "id": 9301,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
@@ -23311,18 +23311,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 4678,
+                          "id": 9298,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "11182:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "11200:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4679,
+                        "id": 9299,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
@@ -23330,7 +23330,7 @@
                         "memberName": "length",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "11182:13:7",
+                        "src": "11200:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23344,39 +23344,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4677,
+                      "id": 9297,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "11168:13:7",
+                      "src": "11186:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (address[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4675,
+                          "id": 9295,
                           "name": "address",
                           "nodeType": "ElementaryTypeName",
-                          "src": "11172:7:7",
+                          "src": "11190:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "id": 4676,
+                        "id": 9296,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "11172:9:7",
+                        "src": "11190:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                           "typeString": "address[]"
                         }
                       }
                     },
-                    "id": 4680,
+                    "id": 9300,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -23384,27 +23384,27 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "11168:28:7",
+                    "src": "11186:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_memory",
                       "typeString": "address[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11131:65:7"
+                  "src": "11149:65:8"
                 },
                 {
                   "assignments": [
-                    4683
+                    9303
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4683,
+                      "id": 9303,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11206:10:7",
+                      "scope": 9370,
+                      "src": "11224:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -23412,10 +23412,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4682,
+                        "id": 9302,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "11206:4:7",
+                        "src": "11224:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23425,18 +23425,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4685,
+                  "id": 9305,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4684,
+                    "id": 9304,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "11219:1:7",
+                    "src": "11237:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -23445,18 +23445,18 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11206:14:7"
+                  "src": "11224:14:8"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4687,
+                      "id": 9307,
                       "name": "i",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4750,
-                      "src": "11230:6:7",
+                      "scope": 9370,
+                      "src": "11248:6:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -23464,10 +23464,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4686,
+                        "id": 9306,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "11230:4:7",
+                        "src": "11248:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23477,10 +23477,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4688,
+                  "id": 9308,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "11230:6:7"
+                  "src": "11248:6:8"
                 },
                 {
                   "body": {
@@ -23490,26 +23490,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4700,
+                          "id": 9320,
                           "name": "confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3901,
-                          "src": "11298:13:7",
+                          "referencedDeclaration": 8521,
+                          "src": "11316:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_address_$_t_bool_$_$",
                             "typeString": "mapping(uint256 => mapping(address => bool))"
                           }
                         },
-                        "id": 4702,
+                        "id": 9322,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4701,
+                          "id": 9321,
                           "name": "transactionId",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4665,
-                          "src": "11312:13:7",
+                          "referencedDeclaration": 9285,
+                          "src": "11330:13:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23520,37 +23520,37 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11298:28:7",
+                        "src": "11316:28:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
                           "typeString": "mapping(address => bool)"
                         }
                       },
-                      "id": 4706,
+                      "id": 9326,
                       "indexExpression": {
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4703,
+                          "id": 9323,
                           "name": "owners",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 3908,
-                          "src": "11327:6:7",
+                          "referencedDeclaration": 8528,
+                          "src": "11345:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage",
                             "typeString": "address[] storage ref"
                           }
                         },
-                        "id": 4705,
+                        "id": 9325,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4704,
+                          "id": 9324,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11334:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11352:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23561,7 +23561,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11327:9:7",
+                        "src": "11345:9:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -23572,25 +23572,25 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "11298:39:7",
+                      "src": "11316:39:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4720,
+                    "id": 9340,
                     "nodeType": "IfStatement",
-                    "src": "11294:142:7",
+                    "src": "11312:142:8",
                     "trueBody": {
-                      "id": 4719,
+                      "id": 9339,
                       "nodeType": "Block",
-                      "src": "11339:97:7",
+                      "src": "11357:97:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4713,
+                            "id": 9333,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -23599,26 +23599,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4707,
+                                "id": 9327,
                                 "name": "confirmationsTemp",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4674,
-                                "src": "11357:17:7",
+                                "referencedDeclaration": 9294,
+                                "src": "11375:17:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                                   "typeString": "address[] memory"
                                 }
                               },
-                              "id": 4709,
+                              "id": 9329,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4708,
+                                "id": 9328,
                                 "name": "count",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4683,
-                                "src": "11375:5:7",
+                                "referencedDeclaration": 9303,
+                                "src": "11393:5:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -23629,7 +23629,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "11357:24:7",
+                              "src": "11375:24:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -23641,26 +23641,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4710,
+                                "id": 9330,
                                 "name": "owners",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3908,
-                                "src": "11384:6:7",
+                                "referencedDeclaration": 8528,
+                                "src": "11402:6:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_address_$dyn_storage",
                                   "typeString": "address[] storage ref"
                                 }
                               },
-                              "id": 4712,
+                              "id": 9332,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4711,
+                                "id": 9331,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4687,
-                                "src": "11391:1:7",
+                                "referencedDeclaration": 9307,
+                                "src": "11409:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -23671,38 +23671,38 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "11384:9:7",
+                              "src": "11402:9:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               }
                             },
-                            "src": "11357:36:7",
+                            "src": "11375:36:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4714,
+                          "id": 9334,
                           "nodeType": "ExpressionStatement",
-                          "src": "11357:36:7"
+                          "src": "11375:36:8"
                         },
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4717,
+                            "id": 9337,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4715,
+                              "id": 9335,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4683,
-                              "src": "11411:5:7",
+                              "referencedDeclaration": 9303,
+                              "src": "11429:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -23713,14 +23713,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4716,
+                              "id": 9336,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "11420:1:7",
+                              "src": "11438:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -23728,15 +23728,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "11411:10:7",
+                            "src": "11429:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4718,
+                          "id": 9338,
                           "nodeType": "ExpressionStatement",
-                          "src": "11411:10:7"
+                          "src": "11429:10:8"
                         }
                       ]
                     }
@@ -23747,19 +23747,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4696,
+                    "id": 9316,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4693,
+                      "id": 9313,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4687,
-                      "src": "11258:1:7",
+                      "referencedDeclaration": 9307,
+                      "src": "11276:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -23771,18 +23771,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 4694,
+                        "id": 9314,
                         "name": "owners",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3908,
-                        "src": "11262:6:7",
+                        "referencedDeclaration": 8528,
+                        "src": "11280:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_address_$dyn_storage",
                           "typeString": "address[] storage ref"
                         }
                       },
-                      "id": 4695,
+                      "id": 9315,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
@@ -23790,35 +23790,35 @@
                       "memberName": "length",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "11262:13:7",
+                      "src": "11280:13:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11258:17:7",
+                    "src": "11276:17:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4721,
+                  "id": 9341,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4691,
+                      "id": 9311,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4689,
+                        "id": 9309,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11251:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11269:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23829,14 +23829,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4690,
+                        "id": 9310,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "11255:1:7",
+                        "src": "11273:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -23844,20 +23844,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "11251:5:7",
+                      "src": "11269:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4692,
+                    "id": 9312,
                     "nodeType": "ExpressionStatement",
-                    "src": "11251:5:7"
+                    "src": "11269:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4698,
+                      "id": 9318,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -23865,15 +23865,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "11277:3:7",
+                      "src": "11295:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4697,
+                        "id": 9317,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11277:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11295:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -23884,29 +23884,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4699,
+                    "id": 9319,
                     "nodeType": "ExpressionStatement",
-                    "src": "11277:3:7"
+                    "src": "11295:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "11246:190:7"
+                  "src": "11264:190:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4728,
+                    "id": 9348,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4722,
+                      "id": 9342,
                       "name": "_confirmations",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4669,
-                      "src": "11445:14:7",
+                      "referencedDeclaration": 9289,
+                      "src": "11463:14:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                         "typeString": "address[] memory"
@@ -23919,12 +23919,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 4726,
+                          "id": 9346,
                           "name": "count",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4683,
-                          "src": "11476:5:7",
+                          "referencedDeclaration": 9303,
+                          "src": "11494:5:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -23938,39 +23938,39 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4725,
+                        "id": 9345,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "NewExpression",
-                        "src": "11462:13:7",
+                        "src": "11480:13:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_address_$dyn_memory_$",
                           "typeString": "function (uint256) pure returns (address[] memory)"
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 4723,
+                            "id": 9343,
                             "name": "address",
                             "nodeType": "ElementaryTypeName",
-                            "src": "11466:7:7",
+                            "src": "11484:7:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             }
                           },
-                          "id": 4724,
+                          "id": 9344,
                           "length": null,
                           "nodeType": "ArrayTypeName",
-                          "src": "11466:9:7",
+                          "src": "11484:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                             "typeString": "address[]"
                           }
                         }
                       },
-                      "id": 4727,
+                      "id": 9347,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -23978,27 +23978,27 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "11462:20:7",
+                      "src": "11480:20:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_address_$dyn_memory",
                         "typeString": "address[] memory"
                       }
                     },
-                    "src": "11445:37:7",
+                    "src": "11463:37:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                       "typeString": "address[] memory"
                     }
                   },
-                  "id": 4729,
+                  "id": 9349,
                   "nodeType": "ExpressionStatement",
-                  "src": "11445:37:7"
+                  "src": "11463:37:8"
                 },
                 {
                   "body": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4746,
+                      "id": 9366,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -24007,26 +24007,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4740,
+                          "id": 9360,
                           "name": "_confirmations",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4669,
-                          "src": "11532:14:7",
+                          "referencedDeclaration": 9289,
+                          "src": "11550:14:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                             "typeString": "address[] memory"
                           }
                         },
-                        "id": 4742,
+                        "id": 9362,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4741,
+                          "id": 9361,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11547:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11565:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -24037,7 +24037,7 @@
                         "isPure": false,
                         "lValueRequested": true,
                         "nodeType": "IndexAccess",
-                        "src": "11532:17:7",
+                        "src": "11550:17:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -24049,26 +24049,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4743,
+                          "id": 9363,
                           "name": "confirmationsTemp",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4674,
-                          "src": "11552:17:7",
+                          "referencedDeclaration": 9294,
+                          "src": "11570:17:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr",
                             "typeString": "address[] memory"
                           }
                         },
-                        "id": 4745,
+                        "id": 9365,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4744,
+                          "id": 9364,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4687,
-                          "src": "11570:1:7",
+                          "referencedDeclaration": 9307,
+                          "src": "11588:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -24079,21 +24079,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "11552:20:7",
+                        "src": "11570:20:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         }
                       },
-                      "src": "11532:40:7",
+                      "src": "11550:40:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4747,
+                    "id": 9367,
                     "nodeType": "ExpressionStatement",
-                    "src": "11532:40:7"
+                    "src": "11550:40:8"
                   },
                   "condition": {
                     "argumentTypes": null,
@@ -24101,19 +24101,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4736,
+                    "id": 9356,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4734,
+                      "id": 9354,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4687,
-                      "src": "11504:1:7",
+                      "referencedDeclaration": 9307,
+                      "src": "11522:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -24123,40 +24123,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4735,
+                      "id": 9355,
                       "name": "count",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4683,
-                      "src": "11508:5:7",
+                      "referencedDeclaration": 9303,
+                      "src": "11526:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "11504:9:7",
+                    "src": "11522:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4748,
+                  "id": 9368,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4732,
+                      "id": 9352,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4730,
+                        "id": 9350,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11497:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11515:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24167,14 +24167,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4731,
+                        "id": 9351,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "11501:1:7",
+                        "src": "11519:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -24182,20 +24182,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "11497:5:7",
+                      "src": "11515:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4733,
+                    "id": 9353,
                     "nodeType": "ExpressionStatement",
-                    "src": "11497:5:7"
+                    "src": "11515:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4738,
+                      "id": 9358,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -24203,15 +24203,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "11515:3:7",
+                      "src": "11533:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4737,
+                        "id": 9357,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4687,
-                        "src": "11515:1:7",
+                        "referencedDeclaration": 9307,
+                        "src": "11533:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24222,17 +24222,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4739,
+                    "id": 9359,
                     "nodeType": "ExpressionStatement",
-                    "src": "11515:3:7"
+                    "src": "11533:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "11492:80:7"
+                  "src": "11510:80:8"
                 }
               ]
             },
             "documentation": "@dev Returns array with owner addresses, which confirmed transaction.\n @param transactionId Transaction ID.\n @return Returns array of owner addresses.",
-            "id": 4750,
+            "id": 9370,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -24240,16 +24240,16 @@
             "name": "getConfirmations",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4666,
+              "id": 9286,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4665,
+                  "id": 9285,
                   "name": "transactionId",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4750,
-                  "src": "11034:18:7",
+                  "scope": 9370,
+                  "src": "11052:18:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -24257,10 +24257,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4664,
+                    "id": 9284,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11034:4:7",
+                    "src": "11052:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -24270,20 +24270,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11033:20:7"
+              "src": "11051:20:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4670,
+              "id": 9290,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4669,
+                  "id": 9289,
                   "name": "_confirmations",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4750,
-                  "src": "11091:24:7",
+                  "scope": 9370,
+                  "src": "11109:24:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -24292,19 +24292,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4667,
+                      "id": 9287,
                       "name": "address",
                       "nodeType": "ElementaryTypeName",
-                      "src": "11091:7:7",
+                      "src": "11109:7:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "id": 4668,
+                    "id": 9288,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "11091:9:7",
+                    "src": "11109:9:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr",
                       "typeString": "address[]"
@@ -24314,32 +24314,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11090:26:7"
+              "src": "11108:26:8"
             },
-            "scope": 4851,
-            "src": "11008:571:7",
+            "scope": 9471,
+            "src": "11026:571:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 4849,
+              "id": 9469,
               "nodeType": "Block",
-              "src": "12069:524:7",
+              "src": "12087:524:8",
               "statements": [
                 {
                   "assignments": [
-                    4767
+                    9387
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4767,
+                      "id": 9387,
                       "name": "transactionIdsTemp",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12079:32:7",
+                      "scope": 9470,
+                      "src": "12097:32:8",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
@@ -24348,19 +24348,19 @@
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4765,
+                          "id": 9385,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "12079:4:7",
+                          "src": "12097:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4766,
+                        "id": 9386,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "12079:6:7",
+                        "src": "12097:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                           "typeString": "uint256[]"
@@ -24370,18 +24370,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4773,
+                  "id": 9393,
                   "initialValue": {
                     "argumentTypes": null,
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 4771,
+                        "id": 9391,
                         "name": "transactionCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 3912,
-                        "src": "12125:16:7",
+                        "referencedDeclaration": 8532,
+                        "src": "12143:16:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24395,39 +24395,39 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 4770,
+                      "id": 9390,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "NewExpression",
-                      "src": "12114:10:7",
+                      "src": "12132:10:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint256_$dyn_memory_$",
                         "typeString": "function (uint256) pure returns (uint256[] memory)"
                       },
                       "typeName": {
                         "baseType": {
-                          "id": 4768,
+                          "id": 9388,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "12118:4:7",
+                          "src": "12136:4:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 4769,
+                        "id": 9389,
                         "length": null,
                         "nodeType": "ArrayTypeName",
-                        "src": "12118:6:7",
+                        "src": "12136:6:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                           "typeString": "uint256[]"
                         }
                       }
                     },
-                    "id": 4772,
+                    "id": 9392,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -24435,27 +24435,27 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "12114:28:7",
+                    "src": "12132:28:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_memory",
                       "typeString": "uint256[] memory"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12079:63:7"
+                  "src": "12097:63:8"
                 },
                 {
                   "assignments": [
-                    4775
+                    9395
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4775,
+                      "id": 9395,
                       "name": "count",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12152:10:7",
+                      "scope": 9470,
+                      "src": "12170:10:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -24463,10 +24463,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4774,
+                        "id": 9394,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "12152:4:7",
+                        "src": "12170:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24476,18 +24476,18 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4777,
+                  "id": 9397,
                   "initialValue": {
                     "argumentTypes": null,
                     "hexValue": "30",
-                    "id": 4776,
+                    "id": 9396,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "number",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "12165:1:7",
+                    "src": "12183:1:8",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_rational_0_by_1",
@@ -24496,18 +24496,18 @@
                     "value": "0"
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12152:14:7"
+                  "src": "12170:14:8"
                 },
                 {
                   "assignments": [],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 4779,
+                      "id": 9399,
                       "name": "i",
                       "nodeType": "VariableDeclaration",
-                      "scope": 4850,
-                      "src": "12176:6:7",
+                      "scope": 9470,
+                      "src": "12194:6:8",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -24515,10 +24515,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 4778,
+                        "id": 9398,
                         "name": "uint",
                         "nodeType": "ElementaryTypeName",
-                        "src": "12176:4:7",
+                        "src": "12194:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24528,10 +24528,10 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 4780,
+                  "id": 9400,
                   "initialValue": null,
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "12176:6:7"
+                  "src": "12194:6:8"
                 },
                 {
                   "body": {
@@ -24541,7 +24541,7 @@
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       },
-                      "id": 4804,
+                      "id": 9424,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -24552,19 +24552,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4797,
+                        "id": 9417,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4791,
+                          "id": 9411,
                           "name": "pending",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4756,
-                          "src": "12247:7:7",
+                          "referencedDeclaration": 9376,
+                          "src": "12265:7:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -24574,7 +24574,7 @@
                         "operator": "&&",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 4796,
+                          "id": 9416,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -24582,33 +24582,33 @@
                           "nodeType": "UnaryOperation",
                           "operator": "!",
                           "prefix": true,
-                          "src": "12258:25:7",
+                          "src": "12276:25:8",
                           "subExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4792,
+                                "id": 9412,
                                 "name": "transactions",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 3895,
-                                "src": "12259:12:7",
+                                "referencedDeclaration": 8515,
+                                "src": "12277:12:8",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                  "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                   "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                                 }
                               },
-                              "id": 4794,
+                              "id": 9414,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4793,
+                                "id": 9413,
                                 "name": "i",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4779,
-                                "src": "12272:1:7",
+                                "referencedDeclaration": 9399,
+                                "src": "12290:1:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24619,21 +24619,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "12259:15:7",
+                              "src": "12277:15:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                                "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                                 "typeString": "struct MultiSigWallet.Transaction storage ref"
                               }
                             },
-                            "id": 4795,
+                            "id": 9415,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "executed",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 3920,
-                            "src": "12259:24:7",
+                            "referencedDeclaration": 8540,
+                            "src": "12277:24:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_bool",
                               "typeString": "bool"
@@ -24644,7 +24644,7 @@
                             "typeString": "bool"
                           }
                         },
-                        "src": "12247:36:7",
+                        "src": "12265:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -24658,19 +24658,19 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 4803,
+                        "id": 9423,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 4798,
+                          "id": 9418,
                           "name": "executed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4758,
-                          "src": "12299:8:7",
+                          "referencedDeclaration": 9378,
+                          "src": "12317:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -24684,26 +24684,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 4799,
+                              "id": 9419,
                               "name": "transactions",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 3895,
-                              "src": "12311:12:7",
+                              "referencedDeclaration": 8515,
+                              "src": "12329:12:8",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$3921_storage_$",
+                                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Transaction_$8541_storage_$",
                                 "typeString": "mapping(uint256 => struct MultiSigWallet.Transaction storage ref)"
                               }
                             },
-                            "id": 4801,
+                            "id": 9421,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 4800,
+                              "id": 9420,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4779,
-                              "src": "12324:1:7",
+                              "referencedDeclaration": 9399,
+                              "src": "12342:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -24714,51 +24714,51 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "12311:15:7",
+                            "src": "12329:15:8",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Transaction_$3921_storage",
+                              "typeIdentifier": "t_struct$_Transaction_$8541_storage",
                               "typeString": "struct MultiSigWallet.Transaction storage ref"
                             }
                           },
-                          "id": 4802,
+                          "id": 9422,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "executed",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 3920,
-                          "src": "12311:24:7",
+                          "referencedDeclaration": 8540,
+                          "src": "12329:24:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           }
                         },
-                        "src": "12299:36:7",
+                        "src": "12317:36:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         }
                       },
-                      "src": "12247:88:7",
+                      "src": "12265:88:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
                       }
                     },
                     "falseBody": null,
-                    "id": 4816,
+                    "id": 9436,
                     "nodeType": "IfStatement",
-                    "src": "12243:196:7",
+                    "src": "12261:196:8",
                     "trueBody": {
-                      "id": 4815,
+                      "id": 9435,
                       "nodeType": "Block",
-                      "src": "12349:90:7",
+                      "src": "12367:90:8",
                       "statements": [
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4809,
+                            "id": 9429,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -24767,26 +24767,26 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 4805,
+                                "id": 9425,
                                 "name": "transactionIdsTemp",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4767,
-                                "src": "12367:18:7",
+                                "referencedDeclaration": 9387,
+                                "src": "12385:18:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                                   "typeString": "uint256[] memory"
                                 }
                               },
-                              "id": 4807,
+                              "id": 9427,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 4806,
+                                "id": 9426,
                                 "name": "count",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 4775,
-                                "src": "12386:5:7",
+                                "referencedDeclaration": 9395,
+                                "src": "12404:5:8",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -24797,7 +24797,7 @@
                               "isPure": false,
                               "lValueRequested": true,
                               "nodeType": "IndexAccess",
-                              "src": "12367:25:7",
+                              "src": "12385:25:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -24807,43 +24807,43 @@
                             "operator": "=",
                             "rightHandSide": {
                               "argumentTypes": null,
-                              "id": 4808,
+                              "id": 9428,
                               "name": "i",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4779,
-                              "src": "12395:1:7",
+                              "referencedDeclaration": 9399,
+                              "src": "12413:1:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "src": "12367:29:7",
+                            "src": "12385:29:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4810,
+                          "id": 9430,
                           "nodeType": "ExpressionStatement",
-                          "src": "12367:29:7"
+                          "src": "12385:29:8"
                         },
                         {
                           "expression": {
                             "argumentTypes": null,
-                            "id": 4813,
+                            "id": 9433,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "leftHandSide": {
                               "argumentTypes": null,
-                              "id": 4811,
+                              "id": 9431,
                               "name": "count",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 4775,
-                              "src": "12414:5:7",
+                              "referencedDeclaration": 9395,
+                              "src": "12432:5:8",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -24854,14 +24854,14 @@
                             "rightHandSide": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 4812,
+                              "id": 9432,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "12423:1:7",
+                              "src": "12441:1:8",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_1_by_1",
@@ -24869,15 +24869,15 @@
                               },
                               "value": "1"
                             },
-                            "src": "12414:10:7",
+                            "src": "12432:10:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4814,
+                          "id": 9434,
                           "nodeType": "ExpressionStatement",
-                          "src": "12414:10:7"
+                          "src": "12432:10:8"
                         }
                       ]
                     }
@@ -24888,19 +24888,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4787,
+                    "id": 9407,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4785,
+                      "id": 9405,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4779,
-                      "src": "12204:1:7",
+                      "referencedDeclaration": 9399,
+                      "src": "12222:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -24910,40 +24910,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4786,
+                      "id": 9406,
                       "name": "transactionCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 3912,
-                      "src": "12208:16:7",
+                      "referencedDeclaration": 8532,
+                      "src": "12226:16:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "12204:20:7",
+                    "src": "12222:20:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4817,
+                  "id": 9437,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4783,
+                      "id": 9403,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4781,
+                        "id": 9401,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12197:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12215:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -24954,14 +24954,14 @@
                       "rightHandSide": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 4782,
+                        "id": 9402,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "kind": "number",
                         "lValueRequested": false,
                         "nodeType": "Literal",
-                        "src": "12201:1:7",
+                        "src": "12219:1:8",
                         "subdenomination": null,
                         "typeDescriptions": {
                           "typeIdentifier": "t_rational_0_by_1",
@@ -24969,20 +24969,20 @@
                         },
                         "value": "0"
                       },
-                      "src": "12197:5:7",
+                      "src": "12215:5:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4784,
+                    "id": 9404,
                     "nodeType": "ExpressionStatement",
-                    "src": "12197:5:7"
+                    "src": "12215:5:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4789,
+                      "id": 9409,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -24990,15 +24990,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "12226:3:7",
+                      "src": "12244:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4788,
+                        "id": 9408,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12226:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12244:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -25009,29 +25009,29 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4790,
+                    "id": 9410,
                     "nodeType": "ExpressionStatement",
-                    "src": "12226:3:7"
+                    "src": "12244:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "12192:247:7"
+                  "src": "12210:247:8"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 4826,
+                    "id": 9446,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 4818,
+                      "id": 9438,
                       "name": "_transactionIds",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4762,
-                      "src": "12448:15:7",
+                      "referencedDeclaration": 9382,
+                      "src": "12466:15:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                         "typeString": "uint256[] memory"
@@ -25048,19 +25048,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4824,
+                          "id": 9444,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4822,
+                            "id": 9442,
                             "name": "to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4754,
-                            "src": "12477:2:7",
+                            "referencedDeclaration": 9374,
+                            "src": "12495:2:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -25070,18 +25070,18 @@
                           "operator": "-",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4823,
+                            "id": 9443,
                             "name": "from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4752,
-                            "src": "12482:4:7",
+                            "referencedDeclaration": 9372,
+                            "src": "12500:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "12477:9:7",
+                          "src": "12495:9:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -25095,39 +25095,39 @@
                             "typeString": "uint256"
                           }
                         ],
-                        "id": 4821,
+                        "id": 9441,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "NewExpression",
-                        "src": "12466:10:7",
+                        "src": "12484:10:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_uint256_$dyn_memory_$",
                           "typeString": "function (uint256) pure returns (uint256[] memory)"
                         },
                         "typeName": {
                           "baseType": {
-                            "id": 4819,
+                            "id": 9439,
                             "name": "uint",
                             "nodeType": "ElementaryTypeName",
-                            "src": "12470:4:7",
+                            "src": "12488:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "id": 4820,
+                          "id": 9440,
                           "length": null,
                           "nodeType": "ArrayTypeName",
-                          "src": "12470:6:7",
+                          "src": "12488:6:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                             "typeString": "uint256[]"
                           }
                         }
                       },
-                      "id": 4825,
+                      "id": 9445,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -25135,27 +25135,27 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "12466:21:7",
+                      "src": "12484:21:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_array$_t_uint256_$dyn_memory",
                         "typeString": "uint256[] memory"
                       }
                     },
-                    "src": "12448:39:7",
+                    "src": "12466:39:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                       "typeString": "uint256[] memory"
                     }
                   },
-                  "id": 4827,
+                  "id": 9447,
                   "nodeType": "ExpressionStatement",
-                  "src": "12448:39:7"
+                  "src": "12466:39:8"
                 },
                 {
                   "body": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4846,
+                      "id": 9466,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -25164,37 +25164,37 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4838,
+                          "id": 9458,
                           "name": "_transactionIds",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4762,
-                          "src": "12537:15:7",
+                          "referencedDeclaration": 9382,
+                          "src": "12555:15:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                             "typeString": "uint256[] memory"
                           }
                         },
-                        "id": 4842,
+                        "id": 9462,
                         "indexExpression": {
                           "argumentTypes": null,
                           "commonType": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 4841,
+                          "id": 9461,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 4839,
+                            "id": 9459,
                             "name": "i",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4779,
-                            "src": "12553:1:7",
+                            "referencedDeclaration": 9399,
+                            "src": "12571:1:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -25204,18 +25204,18 @@
                           "operator": "-",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 4840,
+                            "id": 9460,
                             "name": "from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 4752,
-                            "src": "12557:4:7",
+                            "referencedDeclaration": 9372,
+                            "src": "12575:4:8",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "12553:8:7",
+                          "src": "12571:8:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -25226,7 +25226,7 @@
                         "isPure": false,
                         "lValueRequested": true,
                         "nodeType": "IndexAccess",
-                        "src": "12537:25:7",
+                        "src": "12555:25:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -25238,26 +25238,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 4843,
+                          "id": 9463,
                           "name": "transactionIdsTemp",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4767,
-                          "src": "12565:18:7",
+                          "referencedDeclaration": 9387,
+                          "src": "12583:18:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr",
                             "typeString": "uint256[] memory"
                           }
                         },
-                        "id": 4845,
+                        "id": 9465,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 4844,
+                          "id": 9464,
                           "name": "i",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 4779,
-                          "src": "12584:1:7",
+                          "referencedDeclaration": 9399,
+                          "src": "12602:1:8",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -25268,21 +25268,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "12565:21:7",
+                        "src": "12583:21:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "12537:49:7",
+                      "src": "12555:49:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4847,
+                    "id": 9467,
                     "nodeType": "ExpressionStatement",
-                    "src": "12537:49:7"
+                    "src": "12555:49:8"
                   },
                   "condition": {
                     "argumentTypes": null,
@@ -25290,19 +25290,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 4834,
+                    "id": 9454,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 4832,
+                      "id": 9452,
                       "name": "i",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4779,
-                      "src": "12512:1:7",
+                      "referencedDeclaration": 9399,
+                      "src": "12530:1:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -25312,40 +25312,40 @@
                     "operator": "<",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 4833,
+                      "id": 9453,
                       "name": "to",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 4754,
-                      "src": "12516:2:7",
+                      "referencedDeclaration": 9374,
+                      "src": "12534:2:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "12512:6:7",
+                    "src": "12530:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 4848,
+                  "id": 9468,
                   "initializationExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4830,
+                      "id": 9450,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftHandSide": {
                         "argumentTypes": null,
-                        "id": 4828,
+                        "id": 9448,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12502:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12520:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -25355,31 +25355,31 @@
                       "operator": "=",
                       "rightHandSide": {
                         "argumentTypes": null,
-                        "id": 4829,
+                        "id": 9449,
                         "name": "from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4752,
-                        "src": "12506:4:7",
+                        "referencedDeclaration": 9372,
+                        "src": "12524:4:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "12502:8:7",
+                      "src": "12520:8:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4831,
+                    "id": 9451,
                     "nodeType": "ExpressionStatement",
-                    "src": "12502:8:7"
+                    "src": "12520:8:8"
                   },
                   "loopExpression": {
                     "expression": {
                       "argumentTypes": null,
-                      "id": 4836,
+                      "id": 9456,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -25387,15 +25387,15 @@
                       "nodeType": "UnaryOperation",
                       "operator": "++",
                       "prefix": false,
-                      "src": "12520:3:7",
+                      "src": "12538:3:8",
                       "subExpression": {
                         "argumentTypes": null,
-                        "id": 4835,
+                        "id": 9455,
                         "name": "i",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 4779,
-                        "src": "12520:1:7",
+                        "referencedDeclaration": 9399,
+                        "src": "12538:1:8",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -25406,17 +25406,17 @@
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4837,
+                    "id": 9457,
                     "nodeType": "ExpressionStatement",
-                    "src": "12520:3:7"
+                    "src": "12538:3:8"
                   },
                   "nodeType": "ForStatement",
-                  "src": "12497:89:7"
+                  "src": "12515:89:8"
                 }
               ]
             },
             "documentation": "@dev Returns list of transaction IDs in defined range.\n @param from Index start position of transaction array.\n @param to Index end position of transaction array.\n @param pending Include pending transactions.\n @param executed Include executed transactions.\n @return Returns array of transaction IDs.",
-            "id": 4850,
+            "id": 9470,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -25424,16 +25424,16 @@
             "name": "getTransactionIds",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 4759,
+              "id": 9379,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4752,
+                  "id": 9372,
                   "name": "from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11955:9:7",
+                  "scope": 9470,
+                  "src": "11973:9:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25441,10 +25441,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4751,
+                    "id": 9371,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11955:4:7",
+                    "src": "11973:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -25455,11 +25455,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4754,
+                  "id": 9374,
                   "name": "to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11966:7:7",
+                  "scope": 9470,
+                  "src": "11984:7:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25467,10 +25467,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4753,
+                    "id": 9373,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11966:4:7",
+                    "src": "11984:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -25481,11 +25481,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4756,
+                  "id": 9376,
                   "name": "pending",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11975:12:7",
+                  "scope": 9470,
+                  "src": "11993:12:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25493,10 +25493,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4755,
+                    "id": 9375,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11975:4:7",
+                    "src": "11993:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -25507,11 +25507,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 4758,
+                  "id": 9378,
                   "name": "executed",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "11989:13:7",
+                  "scope": 9470,
+                  "src": "12007:13:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25519,10 +25519,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 4757,
+                    "id": 9377,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "11989:4:7",
+                    "src": "12007:4:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -25532,20 +25532,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "11954:49:7"
+              "src": "11972:49:8"
             },
             "payable": false,
             "returnParameters": {
-              "id": 4763,
+              "id": 9383,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4762,
+                  "id": 9382,
                   "name": "_transactionIds",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4850,
-                  "src": "12041:22:7",
+                  "scope": 9470,
+                  "src": "12059:22:8",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -25554,19 +25554,19 @@
                   },
                   "typeName": {
                     "baseType": {
-                      "id": 4760,
+                      "id": 9380,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
-                      "src": "12041:4:7",
+                      "src": "12059:4:8",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "id": 4761,
+                    "id": 9381,
                     "length": null,
                     "nodeType": "ArrayTypeName",
-                    "src": "12041:6:7",
+                    "src": "12059:6:8",
                     "typeDescriptions": {
                       "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
                       "typeString": "uint256[]"
@@ -25576,20 +25576,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "12040:24:7"
+              "src": "12058:24:8"
             },
-            "scope": 4851,
-            "src": "11928:665:7",
+            "scope": 9471,
+            "src": "11946:665:8",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 4852,
-        "src": "187:12408:7"
+        "scope": 9472,
+        "src": "205:12408:8"
       }
     ],
-    "src": "0:12596:7"
+    "src": "0:12614:8"
   },
   "compiler": {
     "name": "solc",
@@ -25599,8 +25599,8 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x4abd880ee17184cf529c0b4531073fd7f226836c",
-      "transactionHash": "0x76f842216a0c8a2ea60ec0dc1651e9384f54ab281bea5488ef35c21ac99e0625"
+      "address": "0x9f35e2fdb08b4e99c3840e5acf7603b6697c8acf",
+      "transactionHash": "0x2bdbc2222320b7d78cd6698b706be9d891e9bedb107217227cbc56a03b95721c"
     },
     "4242": {
       "events": {
@@ -25729,10 +25729,10 @@
         }
       },
       "links": {},
-      "address": "0x6c88e07debd749476636ac4841063130df6c62bf",
-      "transactionHash": "0x12a6adc207677c5918b374c9dfd9b00edba6ff4e837e996d105ce97980c2a8c1"
+      "address": "0x0c3dcfe05c0ad4857135c74d60e0c4eb7ae26ba1",
+      "transactionHash": "0x30bd161ecb184566590d4f3bc494714206b332d8974724877cbeb4c014bc4980"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.475Z"
+  "updatedAt": "2019-01-11T16:10:02.034Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/OracleUSD.json b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
index ace11f811..b7e9a13c3 100644
--- a/blockchain/source/migration_artifacts/contracts/OracleUSD.json
+++ b/blockchain/source/migration_artifacts/contracts/OracleUSD.json
@@ -116,22 +116,22 @@
   ],
   "bytecode": "0x60806040526001805534801561001457600080fd5b5060008054600160a060020a0319908116339081179091161790556102c58061003e6000396000f30060806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582017c8960aec5d89e3899911aa2faa4f94936492fa882d20c6373fefeae5bd80450029",
   "deployedBytecode": "0x60806040526004361061006c5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166318b200718114610071578063715018a61461008b5780638da5cb5b146100a0578063eb91d37e146100d1578063f2fde38b146100f8575b600080fd5b34801561007d57600080fd5b50610089600435610119565b005b34801561009757600080fd5b50610089610178565b3480156100ac57600080fd5b506100b56101e4565b60408051600160a060020a039092168252519081900360200190f35b3480156100dd57600080fd5b506100e66101f3565b60408051918252519081900360200190f35b34801561010457600080fd5b50610089600160a060020a03600435166101f9565b600054600160a060020a0316331461013057600080fd5b6000811161013d57600080fd5b60018190556040805182815290517fa6dc15bdb68da224c66db4b3838d9a2b205138e8cff6774e57d0af91e196d6229181900360200190a150565b600054600160a060020a0316331461018f57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b60015490565b600054600160a060020a0316331461021057600080fd5b6102198161021c565b50565b600160a060020a038116151561023157600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582017c8960aec5d89e3899911aa2faa4f94936492fa882d20c6373fefeae5bd80450029",
-  "sourceMap": "89:417:9:-;;;146:1;126:21;;191:55;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;221::9;;;;;;89:417;;;;;;",
-  "deployedSourceMap": "89:417:9:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;252:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;252:156:9;;;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;414:90:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;414:90:9;;;;;;;;;;;;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;252:156:9;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;333:1:9;324:10;;316:19;;;;;;345:12;:21;;;381:20;;;;;;;;;;;;;;;;;252:156;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;414:90:9:-;485:12;;414:90;:::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "sourceMap": "89:417:9:-;;;146:1;126:21;;191:55;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:15;:18;;-1:-1:-1;;;;;;567:18:15;;;575:10;567:18;;;221::9;;;;;;89:417;;;;;;",
+  "deployedSourceMap": "89:417:9:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;252:156;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;252:156:9;;;;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;;;;;-1:-1:-1;;;;;238:20:15;;;;;;;;;;;;;;414:90:9;;8:9:-1;5:2;;;30:1;27;20:12;5:2;414:90:9;;;;;;;;;;;;;;;;;;;;1274:103:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;252:156:9;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;333:1:9;324:10;;316:19;;;;;;345:12;:21;;;381:20;;;;;;;;;;;;;;;;;252:156;:::o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:15;;:::o;414:90:9:-;485:12;;414:90;:::o;1274:103:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract OracleUSD is Ownable {\n\n    uint currentPrice = 1;\n\n    event PriceChanged(uint price);\n\n    constructor() public{\n        owner = msg.sender;\n    }\n\n    function setCurrentPrice(uint _price) public onlyOwner{\n        require(_price > 0);\n        currentPrice = _price;\n        emit PriceChanged(_price);\n    }\n\n    function getCurrentPrice() public view returns (uint) {\n        return currentPrice;\n    }\n}\n",
   "sourcePath": "contracts/OracleUSD.sol",
   "ast": {
     "absolutePath": "contracts/OracleUSD.sol",
     "exportedSymbols": {
       "OracleUSD": [
-        8677
+        9523
       ]
     },
-    "id": 8678,
+    "id": 9524,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 8627,
+        "id": 9473,
         "literals": [
           "solidity",
           "^",
@@ -144,10 +144,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 8628,
+        "id": 9474,
         "nodeType": "ImportDirective",
-        "scope": 8678,
-        "sourceUnit": 10883,
+        "scope": 9524,
+        "sourceUnit": 11167,
         "src": "27:59:9",
         "symbolAliases": [],
         "unitAlias": ""
@@ -158,41 +158,41 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 8629,
+              "id": 9475,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "111:7:9",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 8630,
+            "id": 9476,
             "nodeType": "InheritanceSpecifier",
             "src": "111:7:9"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 8677,
+        "id": 9523,
         "linearizedBaseContracts": [
-          8677,
-          10882
+          9523,
+          11166
         ],
         "name": "OracleUSD",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 8633,
+            "id": 9479,
             "name": "currentPrice",
             "nodeType": "VariableDeclaration",
-            "scope": 8677,
+            "scope": 9523,
             "src": "126:21:9",
             "stateVariable": true,
             "storageLocation": "default",
@@ -201,7 +201,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 8631,
+              "id": 9477,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "126:4:9",
@@ -213,7 +213,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "31",
-              "id": 8632,
+              "id": 9478,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -233,20 +233,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 8637,
+            "id": 9483,
             "name": "PriceChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 8636,
+              "id": 9482,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8635,
+                  "id": 9481,
                   "indexed": false,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8637,
+                  "scope": 9483,
                   "src": "173:10:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -255,7 +255,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8634,
+                    "id": 9480,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "173:4:9",
@@ -274,25 +274,25 @@
           },
           {
             "body": {
-              "id": 8645,
+              "id": 9491,
               "nodeType": "Block",
               "src": "211:35:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8643,
+                    "id": 9489,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 8640,
+                      "id": 9486,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "221:5:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -305,18 +305,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 8641,
+                        "id": 9487,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "229:3:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 8642,
+                      "id": 9488,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -336,14 +336,14 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 8644,
+                  "id": 9490,
                   "nodeType": "ExpressionStatement",
                   "src": "221:18:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8646,
+            "id": 9492,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -351,19 +351,19 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8638,
+              "id": 9484,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "202:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 8639,
+              "id": 9485,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "211:0:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "191:55:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -371,7 +371,7 @@
           },
           {
             "body": {
-              "id": 8667,
+              "id": 9513,
               "nodeType": "Block",
               "src": "306:102:9",
               "statements": [
@@ -385,18 +385,18 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 8656,
+                        "id": 9502,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 8654,
+                          "id": 9500,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 8648,
+                          "referencedDeclaration": 9494,
                           "src": "324:6:9",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -408,7 +408,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 8655,
+                          "id": 9501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -437,21 +437,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 8653,
+                      "id": 9499,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "316:7:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 8657,
+                    "id": 9503,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -465,25 +465,25 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 8658,
+                  "id": 9504,
                   "nodeType": "ExpressionStatement",
                   "src": "316:19:9"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8661,
+                    "id": 9507,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 8659,
+                      "id": 9505,
                       "name": "currentPrice",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8633,
+                      "referencedDeclaration": 9479,
                       "src": "345:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -494,11 +494,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 8660,
+                      "id": 9506,
                       "name": "_price",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8648,
+                      "referencedDeclaration": 9494,
                       "src": "360:6:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -511,7 +511,7 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 8662,
+                  "id": 9508,
                   "nodeType": "ExpressionStatement",
                   "src": "345:21:9"
                 },
@@ -521,11 +521,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 8664,
+                        "id": 9510,
                         "name": "_price",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8648,
+                        "referencedDeclaration": 9494,
                         "src": "394:6:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -540,18 +540,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 8663,
+                      "id": 9509,
                       "name": "PriceChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8637,
+                      "referencedDeclaration": 9483,
                       "src": "381:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 8665,
+                    "id": 9511,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -565,28 +565,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 8666,
+                  "id": 9512,
                   "nodeType": "EmitStatement",
                   "src": "376:25:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8668,
+            "id": 9514,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 8651,
+                "id": 9497,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 8650,
+                  "id": 9496,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "297:9:9",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -600,15 +600,15 @@
             "name": "setCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8649,
+              "id": 9495,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8648,
+                  "id": 9494,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8668,
+                  "scope": 9514,
                   "src": "277:11:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -617,7 +617,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8647,
+                    "id": 9493,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "277:4:9",
@@ -634,12 +634,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 8652,
+              "id": 9498,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "306:0:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "252:156:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -647,33 +647,33 @@
           },
           {
             "body": {
-              "id": 8675,
+              "id": 9521,
               "nodeType": "Block",
               "src": "468:36:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8673,
+                    "id": 9519,
                     "name": "currentPrice",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 8633,
+                    "referencedDeclaration": 9479,
                     "src": "485:12:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 8672,
-                  "id": 8674,
+                  "functionReturnParameters": 9518,
+                  "id": 9520,
                   "nodeType": "Return",
                   "src": "478:19:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8676,
+            "id": 9522,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -681,22 +681,22 @@
             "name": "getCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8669,
+              "id": 9515,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "438:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 8672,
+              "id": 9518,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8671,
+                  "id": 9517,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8676,
+                  "scope": 9522,
                   "src": "462:4:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -705,7 +705,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8670,
+                    "id": 9516,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "462:4:9",
@@ -720,14 +720,14 @@
               ],
               "src": "461:6:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "414:90:9",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 8678,
+        "scope": 9524,
         "src": "89:417:9"
       }
     ],
@@ -737,14 +737,14 @@
     "absolutePath": "contracts/OracleUSD.sol",
     "exportedSymbols": {
       "OracleUSD": [
-        8677
+        9523
       ]
     },
-    "id": 8678,
+    "id": 9524,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 8627,
+        "id": 9473,
         "literals": [
           "solidity",
           "^",
@@ -757,10 +757,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 8628,
+        "id": 9474,
         "nodeType": "ImportDirective",
-        "scope": 8678,
-        "sourceUnit": 10883,
+        "scope": 9524,
+        "sourceUnit": 11167,
         "src": "27:59:9",
         "symbolAliases": [],
         "unitAlias": ""
@@ -771,41 +771,41 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 8629,
+              "id": 9475,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "111:7:9",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 8630,
+            "id": 9476,
             "nodeType": "InheritanceSpecifier",
             "src": "111:7:9"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 8677,
+        "id": 9523,
         "linearizedBaseContracts": [
-          8677,
-          10882
+          9523,
+          11166
         ],
         "name": "OracleUSD",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 8633,
+            "id": 9479,
             "name": "currentPrice",
             "nodeType": "VariableDeclaration",
-            "scope": 8677,
+            "scope": 9523,
             "src": "126:21:9",
             "stateVariable": true,
             "storageLocation": "default",
@@ -814,7 +814,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 8631,
+              "id": 9477,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "126:4:9",
@@ -826,7 +826,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "31",
-              "id": 8632,
+              "id": 9478,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -846,20 +846,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 8637,
+            "id": 9483,
             "name": "PriceChanged",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 8636,
+              "id": 9482,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8635,
+                  "id": 9481,
                   "indexed": false,
                   "name": "price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8637,
+                  "scope": 9483,
                   "src": "173:10:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -868,7 +868,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8634,
+                    "id": 9480,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "173:4:9",
@@ -887,25 +887,25 @@
           },
           {
             "body": {
-              "id": 8645,
+              "id": 9491,
               "nodeType": "Block",
               "src": "211:35:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8643,
+                    "id": 9489,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 8640,
+                      "id": 9486,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "221:5:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -918,18 +918,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 8641,
+                        "id": 9487,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "229:3:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 8642,
+                      "id": 9488,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -949,14 +949,14 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 8644,
+                  "id": 9490,
                   "nodeType": "ExpressionStatement",
                   "src": "221:18:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8646,
+            "id": 9492,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -964,19 +964,19 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8638,
+              "id": 9484,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "202:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 8639,
+              "id": 9485,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "211:0:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "191:55:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -984,7 +984,7 @@
           },
           {
             "body": {
-              "id": 8667,
+              "id": 9513,
               "nodeType": "Block",
               "src": "306:102:9",
               "statements": [
@@ -998,18 +998,18 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 8656,
+                        "id": 9502,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 8654,
+                          "id": 9500,
                           "name": "_price",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 8648,
+                          "referencedDeclaration": 9494,
                           "src": "324:6:9",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -1021,7 +1021,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 8655,
+                          "id": 9501,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1050,21 +1050,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 8653,
+                      "id": 9499,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "316:7:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 8657,
+                    "id": 9503,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1078,25 +1078,25 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 8658,
+                  "id": 9504,
                   "nodeType": "ExpressionStatement",
                   "src": "316:19:9"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8661,
+                    "id": 9507,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 8659,
+                      "id": 9505,
                       "name": "currentPrice",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8633,
+                      "referencedDeclaration": 9479,
                       "src": "345:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -1107,11 +1107,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 8660,
+                      "id": 9506,
                       "name": "_price",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8648,
+                      "referencedDeclaration": 9494,
                       "src": "360:6:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -1124,7 +1124,7 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 8662,
+                  "id": 9508,
                   "nodeType": "ExpressionStatement",
                   "src": "345:21:9"
                 },
@@ -1134,11 +1134,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 8664,
+                        "id": 9510,
                         "name": "_price",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 8648,
+                        "referencedDeclaration": 9494,
                         "src": "394:6:9",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -1153,18 +1153,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 8663,
+                      "id": 9509,
                       "name": "PriceChanged",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 8637,
+                      "referencedDeclaration": 9483,
                       "src": "381:12:9",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 8665,
+                    "id": 9511,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1178,28 +1178,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 8666,
+                  "id": 9512,
                   "nodeType": "EmitStatement",
                   "src": "376:25:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8668,
+            "id": 9514,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 8651,
+                "id": 9497,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 8650,
+                  "id": 9496,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "297:9:9",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -1213,15 +1213,15 @@
             "name": "setCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8649,
+              "id": 9495,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8648,
+                  "id": 9494,
                   "name": "_price",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8668,
+                  "scope": 9514,
                   "src": "277:11:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1230,7 +1230,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8647,
+                    "id": 9493,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "277:4:9",
@@ -1247,12 +1247,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 8652,
+              "id": 9498,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "306:0:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "252:156:9",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -1260,33 +1260,33 @@
           },
           {
             "body": {
-              "id": 8675,
+              "id": 9521,
               "nodeType": "Block",
               "src": "468:36:9",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 8673,
+                    "id": 9519,
                     "name": "currentPrice",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 8633,
+                    "referencedDeclaration": 9479,
                     "src": "485:12:9",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 8672,
-                  "id": 8674,
+                  "functionReturnParameters": 9518,
+                  "id": 9520,
                   "nodeType": "Return",
                   "src": "478:19:9"
                 }
               ]
             },
             "documentation": null,
-            "id": 8676,
+            "id": 9522,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1294,22 +1294,22 @@
             "name": "getCurrentPrice",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 8669,
+              "id": 9515,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "438:2:9"
             },
             "payable": false,
             "returnParameters": {
-              "id": 8672,
+              "id": 9518,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 8671,
+                  "id": 9517,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 8676,
+                  "scope": 9522,
                   "src": "462:4:9",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1318,7 +1318,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 8670,
+                    "id": 9516,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "462:4:9",
@@ -1333,14 +1333,14 @@
               ],
               "src": "461:6:9"
             },
-            "scope": 8677,
+            "scope": 9523,
             "src": "414:90:9",
             "stateMutability": "view",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 8678,
+        "scope": 9524,
         "src": "89:417:9"
       }
     ],
@@ -1396,10 +1396,10 @@
         }
       },
       "links": {},
-      "address": "0x540eeffa179382dec38883a6776d22030acdc2ed",
-      "transactionHash": "0xdfa1dc4802f2e72d29944cb3983d471f80f15e4847e27d8f6fe496bb6087da02"
+      "address": "0x6b9d3c9bb3aa6fbaceb06dd591445f667be875a7",
+      "transactionHash": "0x8d208ef1d40626cbc6350ba3e524d2eabc79108fc5054f2cff105b28f09a3f37"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.410Z"
+  "updatedAt": "2019-01-11T16:10:01.966Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Ownable.json b/blockchain/source/migration_artifacts/contracts/Ownable.json
index baebf9b78..411d3cdb2 100644
--- a/blockchain/source/migration_artifacts/contracts/Ownable.json
+++ b/blockchain/source/migration_artifacts/contracts/Ownable.json
@@ -76,22 +76,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b5060008054600160a060020a0319163317905561020b806100326000396000f3006080604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a6811461005b5780638da5cb5b14610072578063f2fde38b146100a3575b600080fd5b34801561006757600080fd5b506100706100c4565b005b34801561007e57600080fd5b50610087610130565b60408051600160a060020a039092168252519081900360200190f35b3480156100af57600080fd5b50610070600160a060020a036004351661013f565b600054600160a060020a031633146100db57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a0316331461015657600080fd5b61015f81610162565b50565b600160a060020a038116151561017757600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f1c58dca1f6c12ae4235b4425b0c7f7b887fccf38f35218945a4f1dff7ac6c1a0029",
   "deployedBytecode": "0x6080604052600436106100565763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663715018a6811461005b5780638da5cb5b14610072578063f2fde38b146100a3575b600080fd5b34801561006757600080fd5b506100706100c4565b005b34801561007e57600080fd5b50610087610130565b60408051600160a060020a039092168252519081900360200190f35b3480156100af57600080fd5b50610070600160a060020a036004351661013f565b600054600160a060020a031633146100db57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a031681565b600054600160a060020a0316331461015657600080fd5b61015f81610162565b50565b600160a060020a038116151561017757600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a72305820f1c58dca1f6c12ae4235b4425b0c7f7b887fccf38f35218945a4f1dff7ac6c1a0029",
-  "sourceMap": "217:1468:16:-;;;540:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;575:10;567:18;;;217:1468;;;;;;",
-  "deployedSourceMap": "217:1468:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1001:111;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;1001:111;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "sourceMap": "217:1468:15:-;;;540:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:15;:18;;-1:-1:-1;;;;;;567:18:15;575:10;567:18;;;217:1468;;;;;;",
+  "deployedSourceMap": "217:1468:15:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1001:111;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;;;;;-1:-1:-1;;;;;238:20:15;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;1001:111;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:15;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.24;\n\n\n/**\n * @title Ownable\n * @dev The Ownable contract has an owner address, and provides basic authorization control\n * functions, this simplifies the implementation of \"user permissions\".\n */\ncontract Ownable {\n  address public owner;\n\n\n  event OwnershipRenounced(address indexed previousOwner);\n  event OwnershipTransferred(\n    address indexed previousOwner,\n    address indexed newOwner\n  );\n\n\n  /**\n   * @dev The Ownable constructor sets the original `owner` of the contract to the sender\n   * account.\n   */\n  constructor() public {\n    owner = msg.sender;\n  }\n\n  /**\n   * @dev Throws if called by any account other than the owner.\n   */\n  modifier onlyOwner() {\n    require(msg.sender == owner);\n    _;\n  }\n\n  /**\n   * @dev Allows the current owner to relinquish control of the contract.\n   * @notice Renouncing to ownership will leave the contract without an owner.\n   * It will not be possible to call the functions with the `onlyOwner`\n   * modifier anymore.\n   */\n  function renounceOwnership() public onlyOwner {\n    emit OwnershipRenounced(owner);\n    owner = address(0);\n  }\n\n  /**\n   * @dev Allows the current owner to transfer control of the contract to a newOwner.\n   * @param _newOwner The address to transfer ownership to.\n   */\n  function transferOwnership(address _newOwner) public onlyOwner {\n    _transferOwnership(_newOwner);\n  }\n\n  /**\n   * @dev Transfers control of the contract to a newOwner.\n   * @param _newOwner The address to transfer ownership to.\n   */\n  function _transferOwnership(address _newOwner) internal {\n    require(_newOwner != address(0));\n    emit OwnershipTransferred(owner, _newOwner);\n    owner = _newOwner;\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
     "exportedSymbols": {
       "Ownable": [
-        10882
+        11166
       ]
     },
-    "id": 10883,
+    "id": 11167,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10798,
+        "id": 11082,
         "literals": [
           "solidity",
           "^",
@@ -99,7 +99,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:16"
+        "src": "0:24:15"
       },
       {
         "baseContracts": [],
@@ -107,20 +107,20 @@
         "contractKind": "contract",
         "documentation": "@title Ownable\n@dev The Ownable contract has an owner address, and provides basic authorization control\nfunctions, this simplifies the implementation of \"user permissions\".",
         "fullyImplemented": true,
-        "id": 10882,
+        "id": 11166,
         "linearizedBaseContracts": [
-          10882
+          11166
         ],
         "name": "Ownable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 10800,
+            "id": 11084,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 10882,
-            "src": "238:20:16",
+            "scope": 11166,
+            "src": "238:20:15",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -128,10 +128,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 10799,
+              "id": 11083,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "238:7:16",
+              "src": "238:7:15",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -143,21 +143,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10804,
+            "id": 11088,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10803,
+              "id": 11087,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10802,
+                  "id": 11086,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10804,
-                  "src": "289:29:16",
+                  "scope": 11088,
+                  "src": "289:29:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -165,10 +165,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10801,
+                    "id": 11085,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "289:7:16",
+                    "src": "289:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -178,28 +178,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "288:31:16"
+              "src": "288:31:15"
             },
-            "src": "264:56:16"
+            "src": "264:56:15"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10810,
+            "id": 11094,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10809,
+              "id": 11093,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10806,
+                  "id": 11090,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10810,
-                  "src": "355:29:16",
+                  "scope": 11094,
+                  "src": "355:29:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -207,10 +207,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10805,
+                    "id": 11089,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "355:7:16",
+                    "src": "355:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -221,12 +221,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 10808,
+                  "id": 11092,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10810,
-                  "src": "390:24:16",
+                  "scope": 11094,
+                  "src": "390:24:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -234,10 +234,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10807,
+                    "id": 11091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "390:7:16",
+                    "src": "390:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -247,32 +247,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "349:69:16"
+              "src": "349:69:15"
             },
-            "src": "323:96:16"
+            "src": "323:96:15"
           },
           {
             "body": {
-              "id": 10818,
+              "id": 11102,
               "nodeType": "Block",
-              "src": "561:29:16",
+              "src": "561:29:15",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10816,
+                    "id": 11100,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10813,
+                      "id": 11097,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "567:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "567:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -284,18 +284,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 10814,
+                        "id": 11098,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "575:3:16",
+                        "referencedDeclaration": 11599,
+                        "src": "575:3:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 10815,
+                      "id": 11099,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -303,26 +303,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "575:10:16",
+                      "src": "575:10:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "567:18:16",
+                    "src": "567:18:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10817,
+                  "id": 11101,
                   "nodeType": "ExpressionStatement",
-                  "src": "567:18:16"
+                  "src": "567:18:15"
                 }
               ]
             },
             "documentation": "@dev The Ownable constructor sets the original `owner` of the contract to the sender\naccount.",
-            "id": 10819,
+            "id": 11103,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -330,29 +330,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10811,
+              "id": 11095,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:16"
+              "src": "551:2:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10812,
+              "id": 11096,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "561:0:16"
+              "src": "561:0:15"
             },
-            "scope": 10882,
-            "src": "540:50:16",
+            "scope": 11166,
+            "src": "540:50:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10829,
+              "id": 11113,
               "nodeType": "Block",
-              "src": "691:46:16",
+              "src": "691:46:15",
               "statements": [
                 {
                   "expression": {
@@ -364,7 +364,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10825,
+                        "id": 11109,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -373,18 +373,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 10822,
+                            "id": 11106,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "705:3:16",
+                            "referencedDeclaration": 11599,
+                            "src": "705:3:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 10823,
+                          "id": 11107,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -392,7 +392,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "705:10:16",
+                          "src": "705:10:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -402,18 +402,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10824,
+                          "id": 11108,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10800,
-                          "src": "719:5:16",
+                          "referencedDeclaration": 11084,
+                          "src": "719:5:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "705:19:16",
+                        "src": "705:19:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -427,21 +427,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10821,
+                      "id": 11105,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "697:7:16",
+                      "referencedDeclaration": 11602,
+                      "src": "697:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10826,
+                    "id": 11110,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -449,41 +449,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "697:28:16",
+                    "src": "697:28:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10827,
+                  "id": 11111,
                   "nodeType": "ExpressionStatement",
-                  "src": "697:28:16"
+                  "src": "697:28:15"
                 },
                 {
-                  "id": 10828,
+                  "id": 11112,
                   "nodeType": "PlaceholderStatement",
-                  "src": "731:1:16"
+                  "src": "731:1:15"
                 }
               ]
             },
             "documentation": "@dev Throws if called by any account other than the owner.",
-            "id": 10830,
+            "id": 11114,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10820,
+              "id": 11104,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "688:2:16"
+              "src": "688:2:15"
             },
-            "src": "670:67:16",
+            "src": "670:67:15",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10845,
+              "id": 11129,
               "nodeType": "Block",
-              "src": "1047:65:16",
+              "src": "1047:65:15",
               "statements": [
                 {
                   "eventCall": {
@@ -491,12 +491,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10836,
+                        "id": 11120,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "1077:5:16",
+                        "referencedDeclaration": 11084,
+                        "src": "1077:5:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -510,18 +510,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10835,
+                      "id": 11119,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10804,
-                      "src": "1058:18:16",
+                      "referencedDeclaration": 11088,
+                      "src": "1058:18:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 10837,
+                    "id": 11121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -529,32 +529,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1058:25:16",
+                    "src": "1058:25:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10838,
+                  "id": 11122,
                   "nodeType": "EmitStatement",
-                  "src": "1053:30:16"
+                  "src": "1053:30:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10843,
+                    "id": 11127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10839,
+                      "id": 11123,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "1089:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "1089:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -568,14 +568,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 10841,
+                          "id": 11125,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1105:1:16",
+                          "src": "1105:1:15",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -591,20 +591,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 10840,
+                        "id": 11124,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "1097:7:16",
+                        "src": "1097:7:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 10842,
+                      "id": 11126,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -612,76 +612,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:10:16",
+                      "src": "1097:10:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1089:18:16",
+                    "src": "1089:18:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10844,
+                  "id": 11128,
                   "nodeType": "ExpressionStatement",
-                  "src": "1089:18:16"
+                  "src": "1089:18:15"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to relinquish control of the contract.\n@notice Renouncing to ownership will leave the contract without an owner.\nIt will not be possible to call the functions with the `onlyOwner`\nmodifier anymore.",
-            "id": 10846,
+            "id": 11130,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10833,
+                "id": 11117,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10832,
+                  "id": 11116,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1037:9:16",
+                  "referencedDeclaration": 11114,
+                  "src": "1037:9:15",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1037:9:16"
+                "src": "1037:9:15"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10831,
+              "id": 11115,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1027:2:16"
+              "src": "1027:2:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10834,
+              "id": 11118,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1047:0:16"
+              "src": "1047:0:15"
             },
-            "scope": 10882,
-            "src": "1001:111:16",
+            "scope": 11166,
+            "src": "1001:111:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10857,
+              "id": 11141,
               "nodeType": "Block",
-              "src": "1337:40:16",
+              "src": "1337:40:15",
               "statements": [
                 {
                   "expression": {
@@ -689,12 +689,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10854,
+                        "id": 11138,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10848,
-                        "src": "1362:9:16",
+                        "referencedDeclaration": 11132,
+                        "src": "1362:9:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -708,18 +708,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10853,
+                      "id": 11137,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10881,
-                      "src": "1343:18:16",
+                      "referencedDeclaration": 11165,
+                      "src": "1343:18:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 10855,
+                    "id": 11139,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -727,57 +727,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1343:29:16",
+                    "src": "1343:29:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10856,
+                  "id": 11140,
                   "nodeType": "ExpressionStatement",
-                  "src": "1343:29:16"
+                  "src": "1343:29:15"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to transfer control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 10858,
+            "id": 11142,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10851,
+                "id": 11135,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10850,
+                  "id": 11134,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1327:9:16",
+                  "referencedDeclaration": 11114,
+                  "src": "1327:9:15",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1327:9:16"
+                "src": "1327:9:15"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10849,
+              "id": 11133,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10848,
+                  "id": 11132,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10858,
-                  "src": "1301:17:16",
+                  "scope": 11142,
+                  "src": "1301:17:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -785,10 +785,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10847,
+                    "id": 11131,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1301:7:16",
+                    "src": "1301:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -798,26 +798,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1300:19:16"
+              "src": "1300:19:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10852,
+              "id": 11136,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1337:0:16"
+              "src": "1337:0:15"
             },
-            "scope": 10882,
-            "src": "1274:103:16",
+            "scope": 11166,
+            "src": "1274:103:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10880,
+              "id": 11164,
               "nodeType": "Block",
-              "src": "1568:115:16",
+              "src": "1568:115:15",
               "statements": [
                 {
                   "expression": {
@@ -829,19 +829,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10868,
+                        "id": 11152,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10864,
+                          "id": 11148,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10860,
-                          "src": "1582:9:16",
+                          "referencedDeclaration": 11144,
+                          "src": "1582:9:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -855,14 +855,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 10866,
+                              "id": 11150,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1603:1:16",
+                              "src": "1603:1:15",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -878,20 +878,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 10865,
+                            "id": 11149,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1595:7:16",
+                            "src": "1595:7:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 10867,
+                          "id": 11151,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -899,13 +899,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1595:10:16",
+                          "src": "1595:10:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1582:23:16",
+                        "src": "1582:23:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -919,21 +919,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10863,
+                      "id": 11147,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1574:7:16",
+                      "referencedDeclaration": 11602,
+                      "src": "1574:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10869,
+                    "id": 11153,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -941,15 +941,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:32:16",
+                    "src": "1574:32:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10870,
+                  "id": 11154,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:32:16"
+                  "src": "1574:32:15"
                 },
                 {
                   "eventCall": {
@@ -957,12 +957,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10872,
+                        "id": 11156,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "1638:5:16",
+                        "referencedDeclaration": 11084,
+                        "src": "1638:5:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -970,12 +970,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10873,
+                        "id": 11157,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10860,
-                        "src": "1645:9:16",
+                        "referencedDeclaration": 11144,
+                        "src": "1645:9:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -993,18 +993,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10871,
+                      "id": 11155,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10810,
-                      "src": "1617:20:16",
+                      "referencedDeclaration": 11094,
+                      "src": "1617:20:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 10874,
+                    "id": 11158,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1012,32 +1012,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1617:38:16",
+                    "src": "1617:38:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10875,
+                  "id": 11159,
                   "nodeType": "EmitStatement",
-                  "src": "1612:43:16"
+                  "src": "1612:43:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10878,
+                    "id": 11162,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10876,
+                      "id": 11160,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "1661:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "1661:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1047,31 +1047,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10877,
+                      "id": 11161,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10860,
-                      "src": "1669:9:16",
+                      "referencedDeclaration": 11144,
+                      "src": "1669:9:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1661:17:16",
+                    "src": "1661:17:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10879,
+                  "id": 11163,
                   "nodeType": "ExpressionStatement",
-                  "src": "1661:17:16"
+                  "src": "1661:17:15"
                 }
               ]
             },
             "documentation": "@dev Transfers control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 10881,
+            "id": 11165,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1079,16 +1079,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10861,
+              "id": 11145,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10860,
+                  "id": 11144,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10881,
-                  "src": "1540:17:16",
+                  "scope": 11165,
+                  "src": "1540:17:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1096,10 +1096,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10859,
+                    "id": 11143,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1540:7:16",
+                    "src": "1540:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1109,40 +1109,40 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1539:19:16"
+              "src": "1539:19:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10862,
+              "id": 11146,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1568:0:16"
+              "src": "1568:0:15"
             },
-            "scope": 10882,
-            "src": "1512:171:16",
+            "scope": 11166,
+            "src": "1512:171:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 10883,
-        "src": "217:1468:16"
+        "scope": 11167,
+        "src": "217:1468:15"
       }
     ],
-    "src": "0:1686:16"
+    "src": "0:1686:15"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
     "exportedSymbols": {
       "Ownable": [
-        10882
+        11166
       ]
     },
-    "id": 10883,
+    "id": 11167,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10798,
+        "id": 11082,
         "literals": [
           "solidity",
           "^",
@@ -1150,7 +1150,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:16"
+        "src": "0:24:15"
       },
       {
         "baseContracts": [],
@@ -1158,20 +1158,20 @@
         "contractKind": "contract",
         "documentation": "@title Ownable\n@dev The Ownable contract has an owner address, and provides basic authorization control\nfunctions, this simplifies the implementation of \"user permissions\".",
         "fullyImplemented": true,
-        "id": 10882,
+        "id": 11166,
         "linearizedBaseContracts": [
-          10882
+          11166
         ],
         "name": "Ownable",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 10800,
+            "id": 11084,
             "name": "owner",
             "nodeType": "VariableDeclaration",
-            "scope": 10882,
-            "src": "238:20:16",
+            "scope": 11166,
+            "src": "238:20:15",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -1179,10 +1179,10 @@
               "typeString": "address"
             },
             "typeName": {
-              "id": 10799,
+              "id": 11083,
               "name": "address",
               "nodeType": "ElementaryTypeName",
-              "src": "238:7:16",
+              "src": "238:7:15",
               "typeDescriptions": {
                 "typeIdentifier": "t_address",
                 "typeString": "address"
@@ -1194,21 +1194,21 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10804,
+            "id": 11088,
             "name": "OwnershipRenounced",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10803,
+              "id": 11087,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10802,
+                  "id": 11086,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10804,
-                  "src": "289:29:16",
+                  "scope": 11088,
+                  "src": "289:29:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1216,10 +1216,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10801,
+                    "id": 11085,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "289:7:16",
+                    "src": "289:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1229,28 +1229,28 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "288:31:16"
+              "src": "288:31:15"
             },
-            "src": "264:56:16"
+            "src": "264:56:15"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10810,
+            "id": 11094,
             "name": "OwnershipTransferred",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10809,
+              "id": 11093,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10806,
+                  "id": 11090,
                   "indexed": true,
                   "name": "previousOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10810,
-                  "src": "355:29:16",
+                  "scope": 11094,
+                  "src": "355:29:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1258,10 +1258,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10805,
+                    "id": 11089,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "355:7:16",
+                    "src": "355:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1272,12 +1272,12 @@
                 },
                 {
                   "constant": false,
-                  "id": 10808,
+                  "id": 11092,
                   "indexed": true,
                   "name": "newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10810,
-                  "src": "390:24:16",
+                  "scope": 11094,
+                  "src": "390:24:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1285,10 +1285,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10807,
+                    "id": 11091,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "390:7:16",
+                    "src": "390:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1298,32 +1298,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "349:69:16"
+              "src": "349:69:15"
             },
-            "src": "323:96:16"
+            "src": "323:96:15"
           },
           {
             "body": {
-              "id": 10818,
+              "id": 11102,
               "nodeType": "Block",
-              "src": "561:29:16",
+              "src": "561:29:15",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10816,
+                    "id": 11100,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10813,
+                      "id": 11097,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "567:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "567:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1335,18 +1335,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 10814,
+                        "id": 11098,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
-                        "src": "575:3:16",
+                        "referencedDeclaration": 11599,
+                        "src": "575:3:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 10815,
+                      "id": 11099,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1354,26 +1354,26 @@
                       "memberName": "sender",
                       "nodeType": "MemberAccess",
                       "referencedDeclaration": null,
-                      "src": "575:10:16",
+                      "src": "575:10:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "567:18:16",
+                    "src": "567:18:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10817,
+                  "id": 11101,
                   "nodeType": "ExpressionStatement",
-                  "src": "567:18:16"
+                  "src": "567:18:15"
                 }
               ]
             },
             "documentation": "@dev The Ownable constructor sets the original `owner` of the contract to the sender\naccount.",
-            "id": 10819,
+            "id": 11103,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1381,29 +1381,29 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10811,
+              "id": 11095,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:16"
+              "src": "551:2:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10812,
+              "id": 11096,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "561:0:16"
+              "src": "561:0:15"
             },
-            "scope": 10882,
-            "src": "540:50:16",
+            "scope": 11166,
+            "src": "540:50:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10829,
+              "id": 11113,
               "nodeType": "Block",
-              "src": "691:46:16",
+              "src": "691:46:15",
               "statements": [
                 {
                   "expression": {
@@ -1415,7 +1415,7 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10825,
+                        "id": 11109,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1424,18 +1424,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 10822,
+                            "id": 11106,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "705:3:16",
+                            "referencedDeclaration": 11599,
+                            "src": "705:3:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 10823,
+                          "id": 11107,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1443,7 +1443,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "705:10:16",
+                          "src": "705:10:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1453,18 +1453,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10824,
+                          "id": 11108,
                           "name": "owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10800,
-                          "src": "719:5:16",
+                          "referencedDeclaration": 11084,
+                          "src": "719:5:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "705:19:16",
+                        "src": "705:19:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1478,21 +1478,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10821,
+                      "id": 11105,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "697:7:16",
+                      "referencedDeclaration": 11602,
+                      "src": "697:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10826,
+                    "id": 11110,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1500,41 +1500,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "697:28:16",
+                    "src": "697:28:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10827,
+                  "id": 11111,
                   "nodeType": "ExpressionStatement",
-                  "src": "697:28:16"
+                  "src": "697:28:15"
                 },
                 {
-                  "id": 10828,
+                  "id": 11112,
                   "nodeType": "PlaceholderStatement",
-                  "src": "731:1:16"
+                  "src": "731:1:15"
                 }
               ]
             },
             "documentation": "@dev Throws if called by any account other than the owner.",
-            "id": 10830,
+            "id": 11114,
             "name": "onlyOwner",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10820,
+              "id": 11104,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "688:2:16"
+              "src": "688:2:15"
             },
-            "src": "670:67:16",
+            "src": "670:67:15",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10845,
+              "id": 11129,
               "nodeType": "Block",
-              "src": "1047:65:16",
+              "src": "1047:65:15",
               "statements": [
                 {
                   "eventCall": {
@@ -1542,12 +1542,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10836,
+                        "id": 11120,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "1077:5:16",
+                        "referencedDeclaration": 11084,
+                        "src": "1077:5:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1561,18 +1561,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10835,
+                      "id": 11119,
                       "name": "OwnershipRenounced",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10804,
-                      "src": "1058:18:16",
+                      "referencedDeclaration": 11088,
+                      "src": "1058:18:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 10837,
+                    "id": 11121,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1580,32 +1580,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1058:25:16",
+                    "src": "1058:25:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10838,
+                  "id": 11122,
                   "nodeType": "EmitStatement",
-                  "src": "1053:30:16"
+                  "src": "1053:30:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10843,
+                    "id": 11127,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10839,
+                      "id": 11123,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "1089:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "1089:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -1619,14 +1619,14 @@
                         {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 10841,
+                          "id": 11125,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "1105:1:16",
+                          "src": "1105:1:15",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1642,20 +1642,20 @@
                             "typeString": "int_const 0"
                           }
                         ],
-                        "id": 10840,
+                        "id": 11124,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
                         "lValueRequested": false,
                         "nodeType": "ElementaryTypeNameExpression",
-                        "src": "1097:7:16",
+                        "src": "1097:7:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_type$_t_address_$",
                           "typeString": "type(address)"
                         },
                         "typeName": "address"
                       },
-                      "id": 10842,
+                      "id": 11126,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1663,76 +1663,76 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:10:16",
+                      "src": "1097:10:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1089:18:16",
+                    "src": "1089:18:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10844,
+                  "id": 11128,
                   "nodeType": "ExpressionStatement",
-                  "src": "1089:18:16"
+                  "src": "1089:18:15"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to relinquish control of the contract.\n@notice Renouncing to ownership will leave the contract without an owner.\nIt will not be possible to call the functions with the `onlyOwner`\nmodifier anymore.",
-            "id": 10846,
+            "id": 11130,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10833,
+                "id": 11117,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10832,
+                  "id": 11116,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1037:9:16",
+                  "referencedDeclaration": 11114,
+                  "src": "1037:9:15",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1037:9:16"
+                "src": "1037:9:15"
               }
             ],
             "name": "renounceOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10831,
+              "id": 11115,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1027:2:16"
+              "src": "1027:2:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10834,
+              "id": 11118,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1047:0:16"
+              "src": "1047:0:15"
             },
-            "scope": 10882,
-            "src": "1001:111:16",
+            "scope": 11166,
+            "src": "1001:111:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10857,
+              "id": 11141,
               "nodeType": "Block",
-              "src": "1337:40:16",
+              "src": "1337:40:15",
               "statements": [
                 {
                   "expression": {
@@ -1740,12 +1740,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10854,
+                        "id": 11138,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10848,
-                        "src": "1362:9:16",
+                        "referencedDeclaration": 11132,
+                        "src": "1362:9:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1759,18 +1759,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10853,
+                      "id": 11137,
                       "name": "_transferOwnership",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10881,
-                      "src": "1343:18:16",
+                      "referencedDeclaration": 11165,
+                      "src": "1343:18:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 10855,
+                    "id": 11139,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1778,57 +1778,57 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1343:29:16",
+                    "src": "1343:29:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10856,
+                  "id": 11140,
                   "nodeType": "ExpressionStatement",
-                  "src": "1343:29:16"
+                  "src": "1343:29:15"
                 }
               ]
             },
             "documentation": "@dev Allows the current owner to transfer control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 10858,
+            "id": 11142,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10851,
+                "id": 11135,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10850,
+                  "id": 11134,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "1327:9:16",
+                  "referencedDeclaration": 11114,
+                  "src": "1327:9:15",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "1327:9:16"
+                "src": "1327:9:15"
               }
             ],
             "name": "transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10849,
+              "id": 11133,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10848,
+                  "id": 11132,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10858,
-                  "src": "1301:17:16",
+                  "scope": 11142,
+                  "src": "1301:17:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1836,10 +1836,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10847,
+                    "id": 11131,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1301:7:16",
+                    "src": "1301:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1849,26 +1849,26 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1300:19:16"
+              "src": "1300:19:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10852,
+              "id": 11136,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1337:0:16"
+              "src": "1337:0:15"
             },
-            "scope": 10882,
-            "src": "1274:103:16",
+            "scope": 11166,
+            "src": "1274:103:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10880,
+              "id": 11164,
               "nodeType": "Block",
-              "src": "1568:115:16",
+              "src": "1568:115:15",
               "statements": [
                 {
                   "expression": {
@@ -1880,19 +1880,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 10868,
+                        "id": 11152,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10864,
+                          "id": 11148,
                           "name": "_newOwner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10860,
-                          "src": "1582:9:16",
+                          "referencedDeclaration": 11144,
+                          "src": "1582:9:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1906,14 +1906,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 10866,
+                              "id": 11150,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "1603:1:16",
+                              "src": "1603:1:15",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -1929,20 +1929,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 10865,
+                            "id": 11149,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "1595:7:16",
+                            "src": "1595:7:15",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 10867,
+                          "id": 11151,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1950,13 +1950,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "1595:10:16",
+                          "src": "1595:10:15",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "1582:23:16",
+                        "src": "1582:23:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1970,21 +1970,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10863,
+                      "id": 11147,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "1574:7:16",
+                      "referencedDeclaration": 11602,
+                      "src": "1574:7:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10869,
+                    "id": 11153,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1992,15 +1992,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1574:32:16",
+                    "src": "1574:32:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10870,
+                  "id": 11154,
                   "nodeType": "ExpressionStatement",
-                  "src": "1574:32:16"
+                  "src": "1574:32:15"
                 },
                 {
                   "eventCall": {
@@ -2008,12 +2008,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10872,
+                        "id": 11156,
                         "name": "owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10800,
-                        "src": "1638:5:16",
+                        "referencedDeclaration": 11084,
+                        "src": "1638:5:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2021,12 +2021,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 10873,
+                        "id": 11157,
                         "name": "_newOwner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10860,
-                        "src": "1645:9:16",
+                        "referencedDeclaration": 11144,
+                        "src": "1645:9:15",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2044,18 +2044,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 10871,
+                      "id": 11155,
                       "name": "OwnershipTransferred",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10810,
-                      "src": "1617:20:16",
+                      "referencedDeclaration": 11094,
+                      "src": "1617:20:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$",
                         "typeString": "function (address,address)"
                       }
                     },
-                    "id": 10874,
+                    "id": 11158,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2063,32 +2063,32 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1617:38:16",
+                    "src": "1617:38:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10875,
+                  "id": 11159,
                   "nodeType": "EmitStatement",
-                  "src": "1612:43:16"
+                  "src": "1612:43:15"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10878,
+                    "id": 11162,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10876,
+                      "id": 11160,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
-                      "src": "1661:5:16",
+                      "referencedDeclaration": 11084,
+                      "src": "1661:5:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2098,31 +2098,31 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10877,
+                      "id": 11161,
                       "name": "_newOwner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10860,
-                      "src": "1669:9:16",
+                      "referencedDeclaration": 11144,
+                      "src": "1669:9:15",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
                       }
                     },
-                    "src": "1661:17:16",
+                    "src": "1661:17:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "id": 10879,
+                  "id": 11163,
                   "nodeType": "ExpressionStatement",
-                  "src": "1661:17:16"
+                  "src": "1661:17:15"
                 }
               ]
             },
             "documentation": "@dev Transfers control of the contract to a newOwner.\n@param _newOwner The address to transfer ownership to.",
-            "id": 10881,
+            "id": 11165,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2130,16 +2130,16 @@
             "name": "_transferOwnership",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10861,
+              "id": 11145,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10860,
+                  "id": 11144,
                   "name": "_newOwner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10881,
-                  "src": "1540:17:16",
+                  "scope": 11165,
+                  "src": "1540:17:15",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2147,10 +2147,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10859,
+                    "id": 11143,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1540:7:16",
+                    "src": "1540:7:15",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2160,27 +2160,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1539:19:16"
+              "src": "1539:19:15"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10862,
+              "id": 11146,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "1568:0:16"
+              "src": "1568:0:15"
             },
-            "scope": 10882,
-            "src": "1512:171:16",
+            "scope": 11166,
+            "src": "1512:171:15",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 10883,
-        "src": "217:1468:16"
+        "scope": 11167,
+        "src": "217:1468:15"
       }
     ],
-    "src": "0:1686:16"
+    "src": "0:1686:15"
   },
   "compiler": {
     "name": "solc",
@@ -2188,5 +2188,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.952Z"
+  "updatedAt": "2019-01-11T15:59:13.123Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/Pausable.json b/blockchain/source/migration_artifacts/contracts/Pausable.json
index 02a577100..ace4b4d7f 100644
--- a/blockchain/source/migration_artifacts/contracts/Pausable.json
+++ b/blockchain/source/migration_artifacts/contracts/Pausable.json
@@ -114,22 +114,22 @@
   ],
   "bytecode": "0x608060405260008054600160a860020a031916331790556103c4806100256000396000f3006080604052600436106100775763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633f4ba83a811461007c5780635c975abb14610093578063715018a6146100bc5780638456cb59146100d15780638da5cb5b146100e6578063f2fde38b14610117575b600080fd5b34801561008857600080fd5b50610091610138565b005b34801561009f57600080fd5b506100a86101bf565b604080519115158252519081900360200190f35b3480156100c857600080fd5b506100916101e0565b3480156100dd57600080fd5b5061009161024c565b3480156100f257600080fd5b506100fb6102e9565b60408051600160a060020a039092168252519081900360200190f35b34801561012357600080fd5b50610091600160a060020a03600435166102f8565b600054600160a060020a0316331461014f57600080fd5b60005474010000000000000000000000000000000000000000900460ff16151561017857600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005474010000000000000000000000000000000000000000900460ff1681565b600054600160a060020a031633146101f757600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a0316331461026357600080fd5b60005474010000000000000000000000000000000000000000900460ff161561028b57600080fd5b6000805474ff00000000000000000000000000000000000000001916740100000000000000000000000000000000000000001781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600054600160a060020a031681565b600054600160a060020a0316331461030f57600080fd5b6103188161031b565b50565b600160a060020a038116151561033057600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582056cc310923aaf34129a45de00e2ba3a49678d81490d65c412f75569fc383e3870029",
   "deployedBytecode": "0x6080604052600436106100775763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633f4ba83a811461007c5780635c975abb14610093578063715018a6146100bc5780638456cb59146100d15780638da5cb5b146100e6578063f2fde38b14610117575b600080fd5b34801561008857600080fd5b50610091610138565b005b34801561009f57600080fd5b506100a86101bf565b604080519115158252519081900360200190f35b3480156100c857600080fd5b506100916101e0565b3480156100dd57600080fd5b5061009161024c565b3480156100f257600080fd5b506100fb6102e9565b60408051600160a060020a039092168252519081900360200190f35b34801561012357600080fd5b50610091600160a060020a03600435166102f8565b600054600160a060020a0316331461014f57600080fd5b60005474010000000000000000000000000000000000000000900460ff16151561017857600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005474010000000000000000000000000000000000000000900460ff1681565b600054600160a060020a031633146101f757600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a0316331461026357600080fd5b60005474010000000000000000000000000000000000000000900460ff161561028b57600080fd5b6000805474ff00000000000000000000000000000000000000001916740100000000000000000000000000000000000000001781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600054600160a060020a031681565b600054600160a060020a0316331461030f57600080fd5b6103188161031b565b50565b600160a060020a038116151561033057600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a7230582056cc310923aaf34129a45de00e2ba3a49678d81490d65c412f75569fc383e3870029",
-  "sourceMap": "177:755:14:-;;;268:5;247:26;;-1:-1:-1;;;;;;567:18:16;575:10;567:18;;;177:755:14;;;;;;",
-  "deployedSourceMap": "177:755:14:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;;;;;;;;;;;;;;;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;838:92:14;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;;;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;;;;;;;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;;;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;;;;;744:7;;;;720:6;744:7;666:90::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "sourceMap": "177:755:13:-;;;268:5;247:26;;-1:-1:-1;;;;;;567:18:15;575:10;567:18;;;177:755:13;;;;;;",
+  "deployedSourceMap": "177:755:13:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:13;;;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:13;;;;;;;;;;;;;;;;;;;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;666:90:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:13;;;;238:20:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;;;;;-1:-1:-1;;;;;238:20:15;;;;;;;;;;;;;;1274:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;838:92:13;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;568:6:13;;;;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:13;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;;;;;;;:::o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;666:90:13:-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;416:6:13;;;;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:13;;;;;744:7;;;;720:6;744:7;666:90::o;238:20:15:-;;;-1:-1:-1;;;;;238:20:15;;:::o;1274:103::-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1512:171::-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.24;\n\n\nimport \"../ownership/Ownable.sol\";\n\n\n/**\n * @title Pausable\n * @dev Base contract which allows children to implement an emergency stop mechanism.\n */\ncontract Pausable is Ownable {\n  event Pause();\n  event Unpause();\n\n  bool public paused = false;\n\n\n  /**\n   * @dev Modifier to make a function callable only when the contract is not paused.\n   */\n  modifier whenNotPaused() {\n    require(!paused);\n    _;\n  }\n\n  /**\n   * @dev Modifier to make a function callable only when the contract is paused.\n   */\n  modifier whenPaused() {\n    require(paused);\n    _;\n  }\n\n  /**\n   * @dev called by the owner to pause, triggers stopped state\n   */\n  function pause() public onlyOwner whenNotPaused {\n    paused = true;\n    emit Pause();\n  }\n\n  /**\n   * @dev called by the owner to unpause, returns to normal state\n   */\n  function unpause() public onlyOwner whenPaused {\n    paused = false;\n    emit Unpause();\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
     "exportedSymbols": {
       "Pausable": [
-        10702
+        10986
       ]
     },
-    "id": 10703,
+    "id": 10987,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10644,
+        "id": 10928,
         "literals": [
           "solidity",
           "^",
@@ -137,16 +137,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:14"
+        "src": "0:24:13"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "../ownership/Ownable.sol",
-        "id": 10645,
+        "id": 10929,
         "nodeType": "ImportDirective",
-        "scope": 10703,
-        "sourceUnit": 10883,
-        "src": "27:34:14",
+        "scope": 10987,
+        "sourceUnit": 11167,
+        "src": "27:34:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -156,31 +156,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10646,
+              "id": 10930,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "198:7:14",
+              "referencedDeclaration": 11166,
+              "src": "198:7:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 10647,
+            "id": 10931,
             "nodeType": "InheritanceSpecifier",
-            "src": "198:7:14"
+            "src": "198:7:13"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": "@title Pausable\n@dev Base contract which allows children to implement an emergency stop mechanism.",
         "fullyImplemented": true,
-        "id": 10702,
+        "id": 10986,
         "linearizedBaseContracts": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "name": "Pausable",
         "nodeType": "ContractDefinition",
@@ -188,38 +188,38 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10649,
+            "id": 10933,
             "name": "Pause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10648,
+              "id": 10932,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "221:2:14"
+              "src": "221:2:13"
             },
-            "src": "210:14:14"
+            "src": "210:14:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10651,
+            "id": 10935,
             "name": "Unpause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10650,
+              "id": 10934,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "240:2:14"
+              "src": "240:2:13"
             },
-            "src": "227:16:14"
+            "src": "227:16:13"
           },
           {
             "constant": false,
-            "id": 10654,
+            "id": 10938,
             "name": "paused",
             "nodeType": "VariableDeclaration",
-            "scope": 10702,
-            "src": "247:26:14",
+            "scope": 10986,
+            "src": "247:26:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -227,10 +227,10 @@
               "typeString": "bool"
             },
             "typeName": {
-              "id": 10652,
+              "id": 10936,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
-              "src": "247:4:14",
+              "src": "247:4:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
@@ -239,14 +239,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "66616c7365",
-              "id": 10653,
+              "id": 10937,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "bool",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "268:5:14",
+              "src": "268:5:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
@@ -258,9 +258,9 @@
           },
           {
             "body": {
-              "id": 10662,
+              "id": 10946,
               "nodeType": "Block",
-              "src": "401:34:14",
+              "src": "401:34:13",
               "statements": [
                 {
                   "expression": {
@@ -268,7 +268,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10658,
+                        "id": 10942,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -276,15 +276,15 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "415:7:14",
+                        "src": "415:7:13",
                         "subExpression": {
                           "argumentTypes": null,
-                          "id": 10657,
+                          "id": 10941,
                           "name": "paused",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10654,
-                          "src": "416:6:14",
+                          "referencedDeclaration": 10938,
+                          "src": "416:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -303,21 +303,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10656,
+                      "id": 10940,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "407:7:14",
+                      "referencedDeclaration": 11602,
+                      "src": "407:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10659,
+                    "id": 10943,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -325,41 +325,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "407:16:14",
+                    "src": "407:16:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10660,
+                  "id": 10944,
                   "nodeType": "ExpressionStatement",
-                  "src": "407:16:14"
+                  "src": "407:16:13"
                 },
                 {
-                  "id": 10661,
+                  "id": 10945,
                   "nodeType": "PlaceholderStatement",
-                  "src": "429:1:14"
+                  "src": "429:1:13"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is not paused.",
-            "id": 10663,
+            "id": 10947,
             "name": "whenNotPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10655,
+              "id": 10939,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "398:2:14"
+              "src": "398:2:13"
             },
-            "src": "376:59:14",
+            "src": "376:59:13",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10670,
+              "id": 10954,
               "nodeType": "Block",
-              "src": "554:33:14",
+              "src": "554:33:13",
               "statements": [
                 {
                   "expression": {
@@ -367,12 +367,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10666,
+                        "id": 10950,
                         "name": "paused",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10654,
-                        "src": "568:6:14",
+                        "referencedDeclaration": 10938,
+                        "src": "568:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -386,21 +386,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10665,
+                      "id": 10949,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "560:7:14",
+                      "referencedDeclaration": 11602,
+                      "src": "560:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10667,
+                    "id": 10951,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -408,58 +408,58 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "560:15:14",
+                    "src": "560:15:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10668,
+                  "id": 10952,
                   "nodeType": "ExpressionStatement",
-                  "src": "560:15:14"
+                  "src": "560:15:13"
                 },
                 {
-                  "id": 10669,
+                  "id": 10953,
                   "nodeType": "PlaceholderStatement",
-                  "src": "581:1:14"
+                  "src": "581:1:13"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is paused.",
-            "id": 10671,
+            "id": 10955,
             "name": "whenPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10664,
+              "id": 10948,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:14"
+              "src": "551:2:13"
             },
-            "src": "532:55:14",
+            "src": "532:55:13",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10685,
+              "id": 10969,
               "nodeType": "Block",
-              "src": "714:42:14",
+              "src": "714:42:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10680,
+                    "id": 10964,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10678,
+                      "id": 10962,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10654,
-                      "src": "720:6:14",
+                      "referencedDeclaration": 10938,
+                      "src": "720:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -470,14 +470,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 10679,
+                      "id": 10963,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "729:4:14",
+                      "src": "729:4:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -485,15 +485,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "720:13:14",
+                    "src": "720:13:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 10681,
+                  "id": 10965,
                   "nodeType": "ExpressionStatement",
-                  "src": "720:13:14"
+                  "src": "720:13:13"
                 },
                 {
                   "eventCall": {
@@ -501,18 +501,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 10682,
+                      "id": 10966,
                       "name": "Pause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10649,
-                      "src": "744:5:14",
+                      "referencedDeclaration": 10933,
+                      "src": "744:5:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 10683,
+                    "id": 10967,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -520,106 +520,106 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "744:7:14",
+                    "src": "744:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10684,
+                  "id": 10968,
                   "nodeType": "EmitStatement",
-                  "src": "739:12:14"
+                  "src": "739:12:13"
                 }
               ]
             },
             "documentation": "@dev called by the owner to pause, triggers stopped state",
-            "id": 10686,
+            "id": 10970,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10674,
+                "id": 10958,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10673,
+                  "id": 10957,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "690:9:14",
+                  "referencedDeclaration": 11114,
+                  "src": "690:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "690:9:14"
+                "src": "690:9:13"
               },
               {
                 "arguments": null,
-                "id": 10676,
+                "id": 10960,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10675,
+                  "id": 10959,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "700:13:14",
+                  "referencedDeclaration": 10947,
+                  "src": "700:13:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "700:13:14"
+                "src": "700:13:13"
               }
             ],
             "name": "pause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10672,
+              "id": 10956,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "680:2:14"
+              "src": "680:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10677,
+              "id": 10961,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "714:0:14"
+              "src": "714:0:13"
             },
-            "scope": 10702,
-            "src": "666:90:14",
+            "scope": 10986,
+            "src": "666:90:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10700,
+              "id": 10984,
               "nodeType": "Block",
-              "src": "885:45:14",
+              "src": "885:45:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10695,
+                    "id": 10979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10693,
+                      "id": 10977,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10654,
-                      "src": "891:6:14",
+                      "referencedDeclaration": 10938,
+                      "src": "891:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -630,14 +630,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 10694,
+                      "id": 10978,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "900:5:14",
+                      "src": "900:5:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -645,15 +645,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "891:14:14",
+                    "src": "891:14:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 10696,
+                  "id": 10980,
                   "nodeType": "ExpressionStatement",
-                  "src": "891:14:14"
+                  "src": "891:14:13"
                 },
                 {
                   "eventCall": {
@@ -661,18 +661,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 10697,
+                      "id": 10981,
                       "name": "Unpause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10651,
-                      "src": "916:7:14",
+                      "referencedDeclaration": 10935,
+                      "src": "916:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 10698,
+                    "id": 10982,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -680,103 +680,103 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "916:9:14",
+                    "src": "916:9:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10699,
+                  "id": 10983,
                   "nodeType": "EmitStatement",
-                  "src": "911:14:14"
+                  "src": "911:14:13"
                 }
               ]
             },
             "documentation": "@dev called by the owner to unpause, returns to normal state",
-            "id": 10701,
+            "id": 10985,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10689,
+                "id": 10973,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10688,
+                  "id": 10972,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "864:9:14",
+                  "referencedDeclaration": 11114,
+                  "src": "864:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "864:9:14"
+                "src": "864:9:13"
               },
               {
                 "arguments": null,
-                "id": 10691,
+                "id": 10975,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10690,
+                  "id": 10974,
                   "name": "whenPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10671,
-                  "src": "874:10:14",
+                  "referencedDeclaration": 10955,
+                  "src": "874:10:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "874:10:14"
+                "src": "874:10:13"
               }
             ],
             "name": "unpause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10687,
+              "id": 10971,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "854:2:14"
+              "src": "854:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10692,
+              "id": 10976,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "885:0:14"
+              "src": "885:0:13"
             },
-            "scope": 10702,
-            "src": "838:92:14",
+            "scope": 10986,
+            "src": "838:92:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10703,
-        "src": "177:755:14"
+        "scope": 10987,
+        "src": "177:755:13"
       }
     ],
-    "src": "0:933:14"
+    "src": "0:933:13"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
     "exportedSymbols": {
       "Pausable": [
-        10702
+        10986
       ]
     },
-    "id": 10703,
+    "id": 10987,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10644,
+        "id": 10928,
         "literals": [
           "solidity",
           "^",
@@ -784,16 +784,16 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:14"
+        "src": "0:24:13"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "../ownership/Ownable.sol",
-        "id": 10645,
+        "id": 10929,
         "nodeType": "ImportDirective",
-        "scope": 10703,
-        "sourceUnit": 10883,
-        "src": "27:34:14",
+        "scope": 10987,
+        "sourceUnit": 11167,
+        "src": "27:34:13",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -803,31 +803,31 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10646,
+              "id": 10930,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
-              "src": "198:7:14",
+              "referencedDeclaration": 11166,
+              "src": "198:7:13",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 10647,
+            "id": 10931,
             "nodeType": "InheritanceSpecifier",
-            "src": "198:7:14"
+            "src": "198:7:13"
           }
         ],
         "contractDependencies": [
-          10882
+          11166
         ],
         "contractKind": "contract",
         "documentation": "@title Pausable\n@dev Base contract which allows children to implement an emergency stop mechanism.",
         "fullyImplemented": true,
-        "id": 10702,
+        "id": 10986,
         "linearizedBaseContracts": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "name": "Pausable",
         "nodeType": "ContractDefinition",
@@ -835,38 +835,38 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10649,
+            "id": 10933,
             "name": "Pause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10648,
+              "id": 10932,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "221:2:14"
+              "src": "221:2:13"
             },
-            "src": "210:14:14"
+            "src": "210:14:13"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 10651,
+            "id": 10935,
             "name": "Unpause",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 10650,
+              "id": 10934,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "240:2:14"
+              "src": "240:2:13"
             },
-            "src": "227:16:14"
+            "src": "227:16:13"
           },
           {
             "constant": false,
-            "id": 10654,
+            "id": 10938,
             "name": "paused",
             "nodeType": "VariableDeclaration",
-            "scope": 10702,
-            "src": "247:26:14",
+            "scope": 10986,
+            "src": "247:26:13",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -874,10 +874,10 @@
               "typeString": "bool"
             },
             "typeName": {
-              "id": 10652,
+              "id": 10936,
               "name": "bool",
               "nodeType": "ElementaryTypeName",
-              "src": "247:4:14",
+              "src": "247:4:13",
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
                 "typeString": "bool"
@@ -886,14 +886,14 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "66616c7365",
-              "id": 10653,
+              "id": 10937,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "bool",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "268:5:14",
+              "src": "268:5:13",
               "subdenomination": null,
               "typeDescriptions": {
                 "typeIdentifier": "t_bool",
@@ -905,9 +905,9 @@
           },
           {
             "body": {
-              "id": 10662,
+              "id": 10946,
               "nodeType": "Block",
-              "src": "401:34:14",
+              "src": "401:34:13",
               "statements": [
                 {
                   "expression": {
@@ -915,7 +915,7 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10658,
+                        "id": 10942,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -923,15 +923,15 @@
                         "nodeType": "UnaryOperation",
                         "operator": "!",
                         "prefix": true,
-                        "src": "415:7:14",
+                        "src": "415:7:13",
                         "subExpression": {
                           "argumentTypes": null,
-                          "id": 10657,
+                          "id": 10941,
                           "name": "paused",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10654,
-                          "src": "416:6:14",
+                          "referencedDeclaration": 10938,
+                          "src": "416:6:13",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
@@ -950,21 +950,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10656,
+                      "id": 10940,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "407:7:14",
+                      "referencedDeclaration": 11602,
+                      "src": "407:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10659,
+                    "id": 10943,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -972,41 +972,41 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "407:16:14",
+                    "src": "407:16:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10660,
+                  "id": 10944,
                   "nodeType": "ExpressionStatement",
-                  "src": "407:16:14"
+                  "src": "407:16:13"
                 },
                 {
-                  "id": 10661,
+                  "id": 10945,
                   "nodeType": "PlaceholderStatement",
-                  "src": "429:1:14"
+                  "src": "429:1:13"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is not paused.",
-            "id": 10663,
+            "id": 10947,
             "name": "whenNotPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10655,
+              "id": 10939,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "398:2:14"
+              "src": "398:2:13"
             },
-            "src": "376:59:14",
+            "src": "376:59:13",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10670,
+              "id": 10954,
               "nodeType": "Block",
-              "src": "554:33:14",
+              "src": "554:33:13",
               "statements": [
                 {
                   "expression": {
@@ -1014,12 +1014,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 10666,
+                        "id": 10950,
                         "name": "paused",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10654,
-                        "src": "568:6:14",
+                        "referencedDeclaration": 10938,
+                        "src": "568:6:13",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1033,21 +1033,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10665,
+                      "id": 10949,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "560:7:14",
+                      "referencedDeclaration": 11602,
+                      "src": "560:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10667,
+                    "id": 10951,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1055,58 +1055,58 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "560:15:14",
+                    "src": "560:15:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10668,
+                  "id": 10952,
                   "nodeType": "ExpressionStatement",
-                  "src": "560:15:14"
+                  "src": "560:15:13"
                 },
                 {
-                  "id": 10669,
+                  "id": 10953,
                   "nodeType": "PlaceholderStatement",
-                  "src": "581:1:14"
+                  "src": "581:1:13"
                 }
               ]
             },
             "documentation": "@dev Modifier to make a function callable only when the contract is paused.",
-            "id": 10671,
+            "id": 10955,
             "name": "whenPaused",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 10664,
+              "id": 10948,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "551:2:14"
+              "src": "551:2:13"
             },
-            "src": "532:55:14",
+            "src": "532:55:13",
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10685,
+              "id": 10969,
               "nodeType": "Block",
-              "src": "714:42:14",
+              "src": "714:42:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10680,
+                    "id": 10964,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10678,
+                      "id": 10962,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10654,
-                      "src": "720:6:14",
+                      "referencedDeclaration": 10938,
+                      "src": "720:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1117,14 +1117,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "74727565",
-                      "id": 10679,
+                      "id": 10963,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "729:4:14",
+                      "src": "729:4:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1132,15 +1132,15 @@
                       },
                       "value": "true"
                     },
-                    "src": "720:13:14",
+                    "src": "720:13:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 10681,
+                  "id": 10965,
                   "nodeType": "ExpressionStatement",
-                  "src": "720:13:14"
+                  "src": "720:13:13"
                 },
                 {
                   "eventCall": {
@@ -1148,18 +1148,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 10682,
+                      "id": 10966,
                       "name": "Pause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10649,
-                      "src": "744:5:14",
+                      "referencedDeclaration": 10933,
+                      "src": "744:5:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 10683,
+                    "id": 10967,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1167,106 +1167,106 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "744:7:14",
+                    "src": "744:7:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10684,
+                  "id": 10968,
                   "nodeType": "EmitStatement",
-                  "src": "739:12:14"
+                  "src": "739:12:13"
                 }
               ]
             },
             "documentation": "@dev called by the owner to pause, triggers stopped state",
-            "id": 10686,
+            "id": 10970,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10674,
+                "id": 10958,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10673,
+                  "id": 10957,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "690:9:14",
+                  "referencedDeclaration": 11114,
+                  "src": "690:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "690:9:14"
+                "src": "690:9:13"
               },
               {
                 "arguments": null,
-                "id": 10676,
+                "id": 10960,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10675,
+                  "id": 10959,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
-                  "src": "700:13:14",
+                  "referencedDeclaration": 10947,
+                  "src": "700:13:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "700:13:14"
+                "src": "700:13:13"
               }
             ],
             "name": "pause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10672,
+              "id": 10956,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "680:2:14"
+              "src": "680:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10677,
+              "id": 10961,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "714:0:14"
+              "src": "714:0:13"
             },
-            "scope": 10702,
-            "src": "666:90:14",
+            "scope": 10986,
+            "src": "666:90:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 10700,
+              "id": 10984,
               "nodeType": "Block",
-              "src": "885:45:14",
+              "src": "885:45:13",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10695,
+                    "id": 10979,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10693,
+                      "id": 10977,
                       "name": "paused",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10654,
-                      "src": "891:6:14",
+                      "referencedDeclaration": 10938,
+                      "src": "891:6:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
                         "typeString": "bool"
@@ -1277,14 +1277,14 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "66616c7365",
-                      "id": 10694,
+                      "id": 10978,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "bool",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "900:5:14",
+                      "src": "900:5:13",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -1292,15 +1292,15 @@
                       },
                       "value": "false"
                     },
-                    "src": "891:14:14",
+                    "src": "891:14:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
-                  "id": 10696,
+                  "id": 10980,
                   "nodeType": "ExpressionStatement",
-                  "src": "891:14:14"
+                  "src": "891:14:13"
                 },
                 {
                   "eventCall": {
@@ -1308,18 +1308,18 @@
                     "arguments": [],
                     "expression": {
                       "argumentTypes": [],
-                      "id": 10697,
+                      "id": 10981,
                       "name": "Unpause",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10651,
-                      "src": "916:7:14",
+                      "referencedDeclaration": 10935,
+                      "src": "916:7:13",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
                         "typeString": "function ()"
                       }
                     },
-                    "id": 10698,
+                    "id": 10982,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1327,90 +1327,90 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "916:9:14",
+                    "src": "916:9:13",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10699,
+                  "id": 10983,
                   "nodeType": "EmitStatement",
-                  "src": "911:14:14"
+                  "src": "911:14:13"
                 }
               ]
             },
             "documentation": "@dev called by the owner to unpause, returns to normal state",
-            "id": 10701,
+            "id": 10985,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10689,
+                "id": 10973,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10688,
+                  "id": 10972,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
-                  "src": "864:9:14",
+                  "referencedDeclaration": 11114,
+                  "src": "864:9:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "864:9:14"
+                "src": "864:9:13"
               },
               {
                 "arguments": null,
-                "id": 10691,
+                "id": 10975,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10690,
+                  "id": 10974,
                   "name": "whenPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10671,
-                  "src": "874:10:14",
+                  "referencedDeclaration": 10955,
+                  "src": "874:10:13",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
                     "typeString": "modifier ()"
                   }
                 },
                 "nodeType": "ModifierInvocation",
-                "src": "874:10:14"
+                "src": "874:10:13"
               }
             ],
             "name": "unpause",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10687,
+              "id": 10971,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "854:2:14"
+              "src": "854:2:13"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10692,
+              "id": 10976,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "885:0:14"
+              "src": "885:0:13"
             },
-            "scope": 10702,
-            "src": "838:92:14",
+            "scope": 10986,
+            "src": "838:92:13",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10703,
-        "src": "177:755:14"
+        "scope": 10987,
+        "src": "177:755:13"
       }
     ],
-    "src": "0:933:14"
+    "src": "0:933:13"
   },
   "compiler": {
     "name": "solc",
@@ -1418,5 +1418,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.949Z"
+  "updatedAt": "2019-01-11T15:59:13.118Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
index f7ddb0b2e..b0dfb88d8 100644
--- a/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
+++ b/blockchain/source/migration_artifacts/contracts/ProfileRegistry.json
@@ -449,22 +449,22 @@
   ],
   "bytecode": "0x60806040526000805460a060020a60ff021916815560015534801561002357600080fd5b5060008054600160a060020a031990811633908117909116811782558152600260205260409020805460ff191660ff179055611311806100646000396000f3006080604052600436106101045763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041662707c75811461010957806274fc391461013e5780630553701a146101d75780631af60f72146101f857806323eee3e6146102355780632eb4b2a51461027a5780633e34e129146102945780633f4ba83a1461035d5780635c975abb146103725780636209a63314610387578063663b3e22146103bd578063715018a6146103d55780638456cb59146103ea5780638997d27a146103ff5780638da5cb5b1461043957806393d767421461044e578063e7bcef44146104b7578063f2fde38b146104de578063fa52c7d8146104ff575b600080fd5b34801561011557600080fd5b5061012a600160a060020a0360043516610520565b604080519115158252519081900360200190f35b34801561014a57600080fd5b50610162600160a060020a0360043516602435610564565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561019c578181015183820152602001610184565b50505050905090810190601f1680156101c95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101e357600080fd5b5061012a600160a060020a0360043516610618565b34801561020457600080fd5b50610219600160a060020a0360043516610670565b60408051600160a060020a039092168252519081900360200190f35b34801561024157600080fd5b50610256600160a060020a0360043516610706565b6040518082600481111561026657fe5b60ff16815260200191505060405180910390f35b34801561028657600080fd5b50610292600435610766565b005b3480156102a057600080fd5b506102ac600435610a48565b6040518085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561031f578181015183820152602001610307565b50505050905090810190601f16801561034c5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036957600080fd5b50610292610b1a565b34801561037e57600080fd5b5061012a610b90565b34801561039357600080fd5b506103ab600160a060020a0360043516602435610ba0565b60408051918252519081900360200190f35b3480156103c957600080fd5b506102ac600435610bc8565b3480156103e157600080fd5b50610292610c87565b3480156103f657600080fd5b50610292610cf3565b34801561040b57600080fd5b50610420600160a060020a0360043516610d6e565b60408051600092830b90920b8252519081900360200190f35b34801561044557600080fd5b50610219610d8b565b34801561045a57600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610292948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610d9a9650505050505050565b3480156104c357600080fd5b50610219600160a060020a036004351660243560000b6110c3565b3480156104ea57600080fd5b50610292600160a060020a0360043516611170565b34801561050b57600080fd5b50610420600160a060020a0360043516611193565b60008054600160a060020a0316331461053857600080fd5b50600160a060020a0381166000908152600260205260409020805460ff191660ff17905560015b919050565b600160a060020a038216600090815260046020908152604080832084845282529182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084526060939283018282801561060b5780601f106105e05761010080835404028352916020019161060b565b820191906000526020600020905b8154815290600101906020018083116105ee57829003601f168201915b5050505050905092915050565b60008054600160a060020a0316331461063057600080fd5b61063982610d6e565b60000b60001914151561064b57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600061067b33610d6e565b60000b60001914151561068d57600080fd5b60005460a060020a900460ff16156106a457600080fd5b60006106af83610d6e565b60000b136106bc57600080fd5b600160a060020a038216600081815260026020526040808220805460ff19169055517fa7a579573d398d7b67cd7450121bb250bbd060b29eabafdebc3ce0918658635c9190a25090565b60008061071583610579610564565b5111156107245750600461055f565b600061073283610515610564565b5111156107415750600361055f565b600061074f836104b1610564565b51111561075e5750600261055f565b50600161055f565b61076e611224565b60005460a060020a900460ff161561078557600080fd5b60008281526003602081815260409283902083516080810185528154600160a060020a0390811682526001808401549091168285015260028084015483880152948301805487516101009382161593909302600019011695909504601f8101859004850282018501909652858152909491936060860193919290918301828280156108515780601f1061082657610100808354040283529160200191610851565b820191906000526020600020905b81548152906001019060200180831161083457829003601f168201915b505050505081525050905033600160a060020a03168160200151600160a060020a0316148061088957508051600160a060020a031633145b806108a0575061089833610d6e565b60000b600019145b15156108ab57600080fd5b604051606082015180517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4709290819060208401908083835b602083106109025780518252601f1990920191602091820191016108e3565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161415151561094057600080fd5b60208082018051600160a060020a03908116600090815260058085526040808320818801805185529087528184205486518616855283885282852082518652885282852060001990910190559451909316825284528181209251815291909252205415156109e957604080516020818101808452600080845285830151600160a060020a031681526004835284812086860151825290925292902090516109e7929061124a565b505b6040805160208181018084526000808452868152600392839052939093209151610a189392909101919061124a565b5060405182907f9a100d2018161ede6ca34c8007992b09bbffc636a636014a922e4c875041262890600090a25050565b6000818152600360208181526040808420805460018083015460028085015494909701805486516101009482161594909402600019011697909704601f810187900487028301870190955284825287968796606096600160a060020a039586169695909316949391928391830182828015610b045780601f10610ad957610100808354040283529160200191610b04565b820191906000526020600020905b815481529060010190602001808311610ae757829003601f168201915b5050505050905093509350935093509193509193565b600054600160a060020a03163314610b3157600080fd5b60005460a060020a900460ff161515610b4957600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005460a060020a900460ff1681565b600160a060020a03919091166000908152600560209081526040808320938352929052205490565b6003602081815260009283526040928390208054600180830154600280850154968501805489516101009582161595909502600019011691909104601f8101879004870284018701909852878352600160a060020a039384169793909116959491929091830182828015610c7d5780601f10610c5257610100808354040283529160200191610c7d565b820191906000526020600020905b815481529060010190602001808311610c6057829003601f168201915b5050505050905084565b600054600160a060020a03163314610c9e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a03163314610d0a57600080fd5b60005460a060020a900460ff1615610d2157600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600160a060020a0316600090815260026020526040812054900b90565b600054600160a060020a031681565b60008054819060a060020a900460ff1615610db457600080fd5b61044c8410610de857600a60648504069150610dcf33610d6e565b60000b8260000b13151515610de357600080fd5b610dfd565b600160a060020a0385163314610dfd57600080fd5b60405183517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470918591819060208401908083835b60208310610e505780518252601f199092019160209182019101610e31565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151515610e8e57600080fd5b5060026103e884041480610fd457600160a060020a03851660009081526005602090815260408083208784529091529020541515610efd57600160a060020a038516600090815260046020908152604080832087845282529091208451610ef79286019061124a565b50610fd4565b826040518082805190602001908083835b60208310610f2d5780518252601f199092019160209182019101610f0e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916610f688686610564565b6040518082805190602001908083835b60208310610f975780518252601f199092019160209182019101610f78565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916141515610fd457600080fd5b600160a060020a0380861660008181526005602090815260408083208984528252808320805460019081019091558054810180825582516080810184523381528085019687528084018c8152606082018c815292875260038087529490962081518154908a1673ffffffffffffffffffffffffffffffffffffffff19918216178255975193810180549490991693909716929092179096559251600285015593518051929461108b9390850192919091019061124a565b50506001546040519091507fb9bb1df26fde5c1295a7ccd167330e5d6cb9df14fe4c3884669a64433cc9e76090600090a25050505050565b60006110ce33610d6e565b60000b6000191415156110e057600080fd5b60005460a060020a900460ff16156110f757600080fd5b600082810b1361110657600080fd5b61110f83610d6e565b60000b1561111c57600080fd5b600160a060020a038316600081815260026020526040808220805460ff191660ff87850b16179055517f02db26aafd16e8ecd93c4fa202917d50b1693f30b1594e57f7a432ede944eefc9190a25090919050565b600054600160a060020a0316331461118757600080fd5b611190816111a7565b50565b600260205260009081526040812054900b81565b600160a060020a03811615156111bc57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b604080516080810182526000808252602082018190529181019190915260608082015290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b6112e291905b808211156112c457600081556001016112ce565b905600a165627a7a7230582062063412dc64c0ee657ce05f8e88f1f13a7c8937a61cd4f42db5d324754e10750029",
   "deployedBytecode": "0x6080604052600436106101045763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041662707c75811461010957806274fc391461013e5780630553701a146101d75780631af60f72146101f857806323eee3e6146102355780632eb4b2a51461027a5780633e34e129146102945780633f4ba83a1461035d5780635c975abb146103725780636209a63314610387578063663b3e22146103bd578063715018a6146103d55780638456cb59146103ea5780638997d27a146103ff5780638da5cb5b1461043957806393d767421461044e578063e7bcef44146104b7578063f2fde38b146104de578063fa52c7d8146104ff575b600080fd5b34801561011557600080fd5b5061012a600160a060020a0360043516610520565b604080519115158252519081900360200190f35b34801561014a57600080fd5b50610162600160a060020a0360043516602435610564565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561019c578181015183820152602001610184565b50505050905090810190601f1680156101c95780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156101e357600080fd5b5061012a600160a060020a0360043516610618565b34801561020457600080fd5b50610219600160a060020a0360043516610670565b60408051600160a060020a039092168252519081900360200190f35b34801561024157600080fd5b50610256600160a060020a0360043516610706565b6040518082600481111561026657fe5b60ff16815260200191505060405180910390f35b34801561028657600080fd5b50610292600435610766565b005b3480156102a057600080fd5b506102ac600435610a48565b6040518085600160a060020a0316600160a060020a0316815260200184600160a060020a0316600160a060020a0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561031f578181015183820152602001610307565b50505050905090810190601f16801561034c5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561036957600080fd5b50610292610b1a565b34801561037e57600080fd5b5061012a610b90565b34801561039357600080fd5b506103ab600160a060020a0360043516602435610ba0565b60408051918252519081900360200190f35b3480156103c957600080fd5b506102ac600435610bc8565b3480156103e157600080fd5b50610292610c87565b3480156103f657600080fd5b50610292610cf3565b34801561040b57600080fd5b50610420600160a060020a0360043516610d6e565b60408051600092830b90920b8252519081900360200190f35b34801561044557600080fd5b50610219610d8b565b34801561045a57600080fd5b50604080516020600460443581810135601f8101849004840285018401909552848452610292948235600160a060020a0316946024803595369594606494920191908190840183828082843750949750610d9a9650505050505050565b3480156104c357600080fd5b50610219600160a060020a036004351660243560000b6110c3565b3480156104ea57600080fd5b50610292600160a060020a0360043516611170565b34801561050b57600080fd5b50610420600160a060020a0360043516611193565b60008054600160a060020a0316331461053857600080fd5b50600160a060020a0381166000908152600260205260409020805460ff191660ff17905560015b919050565b600160a060020a038216600090815260046020908152604080832084845282529182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084526060939283018282801561060b5780601f106105e05761010080835404028352916020019161060b565b820191906000526020600020905b8154815290600101906020018083116105ee57829003601f168201915b5050505050905092915050565b60008054600160a060020a0316331461063057600080fd5b61063982610d6e565b60000b60001914151561064b57600080fd5b50600160a060020a03166000908152600260205260409020805460ff19169055600190565b600061067b33610d6e565b60000b60001914151561068d57600080fd5b60005460a060020a900460ff16156106a457600080fd5b60006106af83610d6e565b60000b136106bc57600080fd5b600160a060020a038216600081815260026020526040808220805460ff19169055517fa7a579573d398d7b67cd7450121bb250bbd060b29eabafdebc3ce0918658635c9190a25090565b60008061071583610579610564565b5111156107245750600461055f565b600061073283610515610564565b5111156107415750600361055f565b600061074f836104b1610564565b51111561075e5750600261055f565b50600161055f565b61076e611224565b60005460a060020a900460ff161561078557600080fd5b60008281526003602081815260409283902083516080810185528154600160a060020a0390811682526001808401549091168285015260028084015483880152948301805487516101009382161593909302600019011695909504601f8101859004850282018501909652858152909491936060860193919290918301828280156108515780601f1061082657610100808354040283529160200191610851565b820191906000526020600020905b81548152906001019060200180831161083457829003601f168201915b505050505081525050905033600160a060020a03168160200151600160a060020a0316148061088957508051600160a060020a031633145b806108a0575061089833610d6e565b60000b600019145b15156108ab57600080fd5b604051606082015180517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4709290819060208401908083835b602083106109025780518252601f1990920191602091820191016108e3565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020600019161415151561094057600080fd5b60208082018051600160a060020a03908116600090815260058085526040808320818801805185529087528184205486518616855283885282852082518652885282852060001990910190559451909316825284528181209251815291909252205415156109e957604080516020818101808452600080845285830151600160a060020a031681526004835284812086860151825290925292902090516109e7929061124a565b505b6040805160208181018084526000808452868152600392839052939093209151610a189392909101919061124a565b5060405182907f9a100d2018161ede6ca34c8007992b09bbffc636a636014a922e4c875041262890600090a25050565b6000818152600360208181526040808420805460018083015460028085015494909701805486516101009482161594909402600019011697909704601f810187900487028301870190955284825287968796606096600160a060020a039586169695909316949391928391830182828015610b045780601f10610ad957610100808354040283529160200191610b04565b820191906000526020600020905b815481529060010190602001808311610ae757829003601f168201915b5050505050905093509350935093509193509193565b600054600160a060020a03163314610b3157600080fd5b60005460a060020a900460ff161515610b4957600080fd5b6000805474ff0000000000000000000000000000000000000000191681556040517f7805862f689e2f13df9f062ff482ad3ad112aca9e0847911ed832e158c525b339190a1565b60005460a060020a900460ff1681565b600160a060020a03919091166000908152600560209081526040808320938352929052205490565b6003602081815260009283526040928390208054600180830154600280850154968501805489516101009582161595909502600019011691909104601f8101879004870284018701909852878352600160a060020a039384169793909116959491929091830182828015610c7d5780601f10610c5257610100808354040283529160200191610c7d565b820191906000526020600020905b815481529060010190602001808311610c6057829003601f168201915b5050505050905084565b600054600160a060020a03163314610c9e57600080fd5b60008054604051600160a060020a03909116917ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482091a26000805473ffffffffffffffffffffffffffffffffffffffff19169055565b600054600160a060020a03163314610d0a57600080fd5b60005460a060020a900460ff1615610d2157600080fd5b6000805474ff0000000000000000000000000000000000000000191660a060020a1781556040517f6985a02210a168e66602d3235cb6db0e70f92b3ba4d376a33c0f3d9434bff6259190a1565b600160a060020a0316600090815260026020526040812054900b90565b600054600160a060020a031681565b60008054819060a060020a900460ff1615610db457600080fd5b61044c8410610de857600a60648504069150610dcf33610d6e565b60000b8260000b13151515610de357600080fd5b610dfd565b600160a060020a0385163314610dfd57600080fd5b60405183517fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470918591819060208401908083835b60208310610e505780518252601f199092019160209182019101610e31565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206000191614151515610e8e57600080fd5b5060026103e884041480610fd457600160a060020a03851660009081526005602090815260408083208784529091529020541515610efd57600160a060020a038516600090815260046020908152604080832087845282529091208451610ef79286019061124a565b50610fd4565b826040518082805190602001908083835b60208310610f2d5780518252601f199092019160209182019101610f0e565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916610f688686610564565b6040518082805190602001908083835b60208310610f975780518252601f199092019160209182019101610f78565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916141515610fd457600080fd5b600160a060020a0380861660008181526005602090815260408083208984528252808320805460019081019091558054810180825582516080810184523381528085019687528084018c8152606082018c815292875260038087529490962081518154908a1673ffffffffffffffffffffffffffffffffffffffff19918216178255975193810180549490991693909716929092179096559251600285015593518051929461108b9390850192919091019061124a565b50506001546040519091507fb9bb1df26fde5c1295a7ccd167330e5d6cb9df14fe4c3884669a64433cc9e76090600090a25050505050565b60006110ce33610d6e565b60000b6000191415156110e057600080fd5b60005460a060020a900460ff16156110f757600080fd5b600082810b1361110657600080fd5b61110f83610d6e565b60000b1561111c57600080fd5b600160a060020a038316600081815260026020526040808220805460ff191660ff87850b16179055517f02db26aafd16e8ecd93c4fa202917d50b1693f30b1594e57f7a432ede944eefc9190a25090919050565b600054600160a060020a0316331461118757600080fd5b611190816111a7565b50565b600260205260009081526040812054900b81565b600160a060020a03811615156111bc57600080fd5b60008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b604080516080810182526000808252602082018190529181019190915260608082015290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061128b57805160ff19168380011785556112b8565b828001600101855582156112b8579182015b828111156112b857825182559160200191906001019061129d565b506112c49291506112c8565b5090565b6112e291905b808211156112c457600081556001016112ce565b905600a165627a7a7230582062063412dc64c0ee657ce05f8e88f1f13a7c8937a61cd4f42db5d324754e10750029",
-  "sourceMap": "150:4701:11:-;;;268:5:14;247:26;;-1:-1:-1;;;;;;247:26:14;;;;765:29:11;1045:94;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;-1:-1:-1;;;;;;567:18:16;;;575:10;567:18;;;1076::11;;;;;;;1104:22;;:10;:22;;;;;:28;;-1:-1:-1;;1104:28:11;;;;;150:4701;;;;;;",
-  "deployedSourceMap": "150:4701:11:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4501:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4501:143:11;-1:-1:-1;;;;;4501:143:11;;;;;;;;;;;;;;;;;;;;;;;3719:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3719:141:11;-1:-1:-1;;;;;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4650:199;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4650:199:11;-1:-1:-1;;;;;4650:199:11;;;;;1454:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1454:258:11;-1:-1:-1;;;;;1454:258:11;;;;;;;;;-1:-1:-1;;;;;1454:258:11;;;;;;;;;;;;;;4015:480;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4015:480:11;-1:-1:-1;;;;;4015:480:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2890:597;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2890:597:11;;;;;;;3493:220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3493:220:11;;;;;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:14;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:14;;;;3866:143:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3866:143:11;-1:-1:-1;;;;;3866:143:11;;;;;;;;;;;;;;;;;;;;;;;850:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;850:51:11;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;666:90:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:14;;;;1718:120:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1718:120:11;-1:-1:-1;;;;;1718:120:11;;;;;;;;;;;;;;;;;;;;;;;;;;;238:20:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;1844:1040:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1844:1040:11;;-1:-1:-1;1844:1040:11;;-1:-1:-1;;;;;;;1844:1040:11;1145:303;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1145:303:11;-1:-1:-1;;;;;1145:303:11;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;801:42:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;801:42:11;-1:-1:-1;;;;;801:42:11;;;;;4501:143;4573:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;;4589:22:11;;;;;;:10;:22;;;;;:27;;-1:-1:-1;;4589:27:11;;;;;;731:1:16;4501:143:11;;;:::o;3719:141::-;-1:-1:-1;;;;;3822:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;3815:38;;;;;;-1:-1:-1;;3815:38:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3798:5;;3815:38;;;3822:31;3815:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3719:141;;;;:::o;4650:199::-;4725:4;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;4749:29:11;4767:10;4749:17;:29::i;:::-;:35;;-1:-1:-1;;4749:35:11;4741:44;;;;;;;;-1:-1:-1;;;;;;4795:22:11;4820:1;4795:22;;;:10;:22;;;;;:26;;-1:-1:-1;;4795:26:11;;;-1:-1:-1;;4650:199:11:o;1454:258::-;1538:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1597:1:11;1565:29;1583:10;1565:17;:29::i;:::-;:33;;;1557:42;;;;;;-1:-1:-1;;;;;1609:22:11;;1634:1;1609:22;;;:10;:22;;;;;;:26;;-1:-1:-1;;1609:26:11;;;1650:28;;;1634:1;1650:28;-1:-1:-1;1695:10:11;1454:258::o;4015:480::-;4077:13;4147:1;4106:31;4124:6;4132:4;4106:17;:31::i;:::-;:38;:42;4102:387;;;-1:-1:-1;4171:26:11;4164:33;;4102:387;4259:1;4218:31;4236:6;4244:4;4218:17;:31::i;:::-;:38;:42;4214:275;;;-1:-1:-1;4283:24:11;4276:31;;4214:275;4369:1;4328:31;4346:6;4354:4;4328:17;:31::i;:::-;:38;:42;4324:165;;;-1:-1:-1;4393:24:11;4386:31;;4324:165;-1:-1:-1;4455:23:11;4448:30;;2890:597;2961:22;;:::i;:::-;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;2986:17:11;;;;:12;:17;;;;;;;;;2961:42;;;;;;;;;-1:-1:-1;;;;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;2986:17;;2961:42;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3032:10;-1:-1:-1;;;;;3022:20:11;:3;:6;;;-1:-1:-1;;;;;3022:20:11;;:46;;;-1:-1:-1;3046:8:11;;-1:-1:-1;;;;;3046:22:11;3058:10;3046:22;3022:46;:85;;;;3072:29;3090:10;3072:17;:29::i;:::-;:35;;-1:-1:-1;;3072:35:11;3022:85;3014:94;;;;;;;;3150:13;;3136:9;;;;3126:20;;3150:13;;;;;3126:20;;;;;3150:13;3126:20;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3126:20:11;;;;;;;;;;;;;;;;:37;;;;;3118:46;;;;;;;;3238:6;;;;;;-1:-1:-1;;;;;3221:24:11;;;;;;;:16;:24;;;;;;;3246:17;;;;;3221:43;;;;;;;;;3192:6;;3175:24;;;;;;;;;;3200:17;;3175:43;;;;;;;-1:-1:-1;;3221:47:11;;;3175:93;;3299:6;;3282:24;;;;;;;;;;3307:17;;3282:43;;;;;;;;:48;3278:127;;;3346:48;;;;;;;;;;-1:-1:-1;3346:48:11;;;3363:6;;;;-1:-1:-1;;;;;3346:24:11;;;:16;:24;;;;;3371:17;;;;3346:43;;;;;;;;:48;;;;;;:::i;:::-;;3278:127;3414:28;;;;;;;;;;-1:-1:-1;3414:28:11;;;:17;;;:12;:17;;;;;;;;:28;;;;:23;;;;;:28;;:::i;:::-;-1:-1:-1;3457:23:11;;3476:3;;3457:23;;;;;2890:597;;:::o;3493:220::-;3551:7;3603:17;;;:12;:17;;;;;;;;:22;;;3627:20;;;;3649:31;;;;;3682:23;;;;3595:111;;;;3603:22;3595:111;;;;;;;;-1:-1:-1;;3595:111:11;;;;;;;;;;;;;;;;;;;;;;;;3551:7;;;;3578:5;;-1:-1:-1;;;;;3603:22:11;;;;3627:20;;;;;3649:31;3682:23;;;;3595:111;;3682:23;3595:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3493:220;;;;;:::o;838:92:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;568:6:14;;-1:-1:-1;;;568:6:14;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:14;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;-1:-1:-1;;;247:26:14;;;;;:::o;3866:143:11:-;-1:-1:-1;;;;;3971:24:11;;;;3945:7;3971:24;;;:16;:24;;;;;;;;:31;;;;;;;;;3866:143::o;850:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;666:90:14:-;719:5:16;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:14;-1:-1:-1;;;720:13:14;;;744:7;;;;720:6;744:7;666:90::o;1718:120:11:-;-1:-1:-1;;;;;1809:22:11;1786:4;1809:22;;;:10;:22;;;;;;;;;1718:120::o;238:20:16:-;;;-1:-1:-1;;;;;238:20:16;;:::o;1844:1040:11:-;2012:19;416:6:14;;2012:19:11;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1992:4:11;1983:13;;1979:218;;2053:2;2047:3;2039:11;;:16;2012:44;;2096:29;2114:10;2096:17;:29::i;:::-;2078:47;;:14;:47;;;;2070:56;;;;;;;;1979:218;;;-1:-1:-1;;;;;2165:20:11;;2175:10;2165:20;2157:29;;;;;;2265:13;;2244:17;;2265:13;;2254:6;;2265:13;;2244:17;;;;;2265:13;2244:17;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2244:17:11;;;;;;;;;;;;;;;;:34;;;;;2236:43;;;;;;;;-1:-1:-1;2324:1:11;2316:4;2308:12;;:17;;2335:268;;-1:-1:-1;;;;;2370:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;:36;2366:227;;;-1:-1:-1;;;;;2426:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;:40;;;;;;;;:::i;:::-;;2366:227;;;2570:6;2560:17;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2560:17:11;;;;;;;;;;;;;;;;2513:64;;;2523:32;2541:6;2549:5;2523:17;:32::i;:::-;2513:43;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2513:43:11;;;;;;;;;;;;;;;;:64;;;;2505:73;;;;;;;;-1:-1:-1;;;;;2647:24:11;;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;;2681:1;2647:35;;;2613:69;;;2713:17;;:21;;2693:41;;;2778:46;;;;;;;2790:10;2778:46;;;;;;;;;;;;;;;;;;;;2744:31;;;:12;:31;;;;;;;:80;;;;;;;-1:-1:-1;;2744:80:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2778:46;;2744:80;;;;;;;;;;;;:::i;:::-;-1:-1:-1;;2859:17:11;;2840:37;;2859:17;;-1:-1:-1;2840:37:11;;;;;1844:1040;;;;;:::o;1145:303::-;1239:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:14;;-1:-1:-1;;;416:6:14;;;;415:7;407:16;;;;;;1275:1:11;1266:10;;;;1258:19;;;;;;1295:29;1313:10;1295:17;:29::i;:::-;:34;;;1287:43;;;;;;-1:-1:-1;;;;;1340:22:11;;;;;;:10;:22;;;;;;:31;;-1:-1:-1;;1340:31:11;;;;;;;;;1386:28;;;1340:22;1386:28;-1:-1:-1;1431:10:11;;1145:303;-1:-1:-1;1145:303:11:o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;801:42:11:-;;;;;;;;;;;;;;;:::o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o;150:4701:11:-;;;;;;;;;-1:-1:-1;150:4701:11;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;150:4701:11;;;-1:-1:-1;150:4701:11;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o",
+  "sourceMap": "150:4701:11:-;;;268:5:13;247:26;;-1:-1:-1;;;;;;247:26:13;;;;765:29:11;1045:94;5:2:-1;;;;30:1;27;20:12;5:2;-1:-1;567:5:15;:18;;-1:-1:-1;;;;;;567:18:15;;;575:10;567:18;;;1076::11;;;;;;;1104:22;;:10;:22;;;;;:28;;-1:-1:-1;;1104:28:11;;;;;150:4701;;;;;;",
+  "deployedSourceMap": "150:4701:11:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4501:143;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4501:143:11;-1:-1:-1;;;;;4501:143:11;;;;;;;;;;;;;;;;;;;;;;;3719:141;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3719:141:11;-1:-1:-1;;;;;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3719:141:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4650:199;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4650:199:11;-1:-1:-1;;;;;4650:199:11;;;;;1454:258;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1454:258:11;-1:-1:-1;;;;;1454:258:11;;;;;;;;;-1:-1:-1;;;;;1454:258:11;;;;;;;;;;;;;;4015:480;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4015:480:11;-1:-1:-1;;;;;4015:480:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2890:597;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2890:597:11;;;;;;;3493:220;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3493:220:11;;;;;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;-1:-1:-1;;;;;3493:220:11;-1:-1:-1;;;;;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3493:220:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;838:92:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;838:92:13;;;;247:26;;8:9:-1;5:2;;;30:1;27;20:12;5:2;247:26:13;;;;3866:143:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3866:143:11;-1:-1:-1;;;;;3866:143:11;;;;;;;;;;;;;;;;;;;;;;;850:51;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;850:51:11;;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;666:90:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:90:13;;;;1718:120:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1718:120:11;-1:-1:-1;;;;;1718:120:11;;;;;;;;;;;;;;;;;;;;;;;;;;;238:20:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;1844:1040:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;1844:1040:11;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1844:1040:11;;-1:-1:-1;1844:1040:11;;-1:-1:-1;;;;;;;1844:1040:11;1145:303;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1145:303:11;-1:-1:-1;;;;;1145:303:11;;;;;;;;;1274:103:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;801:42:11;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;801:42:11;-1:-1:-1;;;;;801:42:11;;;;;4501:143;4573:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;-1:-1:-1;;;;;;4589:22:11;;;;;;:10;:22;;;;;:27;;-1:-1:-1;;4589:27:11;;;;;;731:1:15;4501:143:11;;;:::o;3719:141::-;-1:-1:-1;;;;;3822:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;3815:38;;;;;;-1:-1:-1;;3815:38:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3798:5;;3815:38;;;3822:31;3815:38;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3719:141;;;;:::o;4650:199::-;4725:4;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;4749:29:11;4767:10;4749:17;:29::i;:::-;:35;;-1:-1:-1;;4749:35:11;4741:44;;;;;;;;-1:-1:-1;;;;;;4795:22:11;4820:1;4795:22;;;:10;:22;;;;;:26;;-1:-1:-1;;4795:26:11;;;-1:-1:-1;;4650:199:11:o;1454:258::-;1538:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;1597:1:11;1565:29;1583:10;1565:17;:29::i;:::-;:33;;;1557:42;;;;;;-1:-1:-1;;;;;1609:22:11;;1634:1;1609:22;;;:10;:22;;;;;;:26;;-1:-1:-1;;1609:26:11;;;1650:28;;;1634:1;1650:28;-1:-1:-1;1695:10:11;1454:258::o;4015:480::-;4077:13;4147:1;4106:31;4124:6;4132:4;4106:17;:31::i;:::-;:38;:42;4102:387;;;-1:-1:-1;4171:26:11;4164:33;;4102:387;4259:1;4218:31;4236:6;4244:4;4218:17;:31::i;:::-;:38;:42;4214:275;;;-1:-1:-1;4283:24:11;4276:31;;4214:275;4369:1;4328:31;4346:6;4354:4;4328:17;:31::i;:::-;:38;:42;4324:165;;;-1:-1:-1;4393:24:11;4386:31;;4324:165;-1:-1:-1;4455:23:11;4448:30;;2890:597;2961:22;;:::i;:::-;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;2986:17:11;;;;:12;:17;;;;;;;;;2961:42;;;;;;;;;-1:-1:-1;;;;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2961:42:11;;;;;;;;;;;;;;;;;;;;;;;;;;2986:17;;2961:42;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3032:10;-1:-1:-1;;;;;3022:20:11;:3;:6;;;-1:-1:-1;;;;;3022:20:11;;:46;;;-1:-1:-1;3046:8:11;;-1:-1:-1;;;;;3046:22:11;3058:10;3046:22;3022:46;:85;;;;3072:29;3090:10;3072:17;:29::i;:::-;:35;;-1:-1:-1;;3072:35:11;3022:85;3014:94;;;;;;;;3150:13;;3136:9;;;;3126:20;;3150:13;;;;;3126:20;;;;;3150:13;3126:20;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3126:20:11;;;;;;;;;;;;;;;;:37;;;;;3118:46;;;;;;;;3238:6;;;;;;-1:-1:-1;;;;;3221:24:11;;;;;;;:16;:24;;;;;;;3246:17;;;;;3221:43;;;;;;;;;3192:6;;3175:24;;;;;;;;;;3200:17;;3175:43;;;;;;;-1:-1:-1;;3221:47:11;;;3175:93;;3299:6;;3282:24;;;;;;;;;;3307:17;;3282:43;;;;;;;;:48;3278:127;;;3346:48;;;;;;;;;;-1:-1:-1;3346:48:11;;;3363:6;;;;-1:-1:-1;;;;;3346:24:11;;;:16;:24;;;;;3371:17;;;;3346:43;;;;;;;;:48;;;;;;:::i;:::-;;3278:127;3414:28;;;;;;;;;;-1:-1:-1;3414:28:11;;;:17;;;:12;:17;;;;;;;;:28;;;;:23;;;;;:28;;:::i;:::-;-1:-1:-1;3457:23:11;;3476:3;;3457:23;;;;;2890:597;;:::o;3493:220::-;3551:7;3603:17;;;:12;:17;;;;;;;;:22;;;3627:20;;;;3649:31;;;;;3682:23;;;;3595:111;;;;3603:22;3595:111;;;;;;;;-1:-1:-1;;3595:111:11;;;;;;;;;;;;;;;;;;;;;;;;3551:7;;;;3578:5;;-1:-1:-1;;;;;3603:22:11;;;;3627:20;;;;;3649:31;3682:23;;;;3595:111;;3682:23;3595:111;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3493:220;;;;;:::o;838:92:13:-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;568:6:13;;-1:-1:-1;;;568:6:13;;;;560:15;;;;;;;;900:5;891:14;;-1:-1:-1;;891:14:13;;;916:9;;;;900:5;916:9;838:92::o;247:26::-;;;-1:-1:-1;;;247:26:13;;;;;:::o;3866:143:11:-;-1:-1:-1;;;;;3971:24:11;;;;3945:7;3971:24;;;:16;:24;;;;;;;;:31;;;;;;;;;3866:143::o;850:51::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;850:51:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;;1105:1;1089:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;666:90:13:-;719:5:15;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;720:6;:13;;-1:-1:-1;;720:13:13;-1:-1:-1;;;720:13:13;;;744:7;;;;720:6;744:7;666:90::o;1718:120:11:-;-1:-1:-1;;;;;1809:22:11;1786:4;1809:22;;;:10;:22;;;;;;;;;1718:120::o;238:20:15:-;;;-1:-1:-1;;;;;238:20:15;;:::o;1844:1040:11:-;2012:19;416:6:13;;2012:19:11;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;1992:4:11;1983:13;;1979:218;;2053:2;2047:3;2039:11;;:16;2012:44;;2096:29;2114:10;2096:17;:29::i;:::-;2078:47;;:14;:47;;;;2070:56;;;;;;;;1979:218;;;-1:-1:-1;;;;;2165:20:11;;2175:10;2165:20;2157:29;;;;;;2265:13;;2244:17;;2265:13;;2254:6;;2265:13;;2244:17;;;;;2265:13;2244:17;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2244:17:11;;;;;;;;;;;;;;;;:34;;;;;2236:43;;;;;;;;-1:-1:-1;2324:1:11;2316:4;2308:12;;:17;;2335:268;;-1:-1:-1;;;;;2370:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;:36;2366:227;;;-1:-1:-1;;;;;2426:24:11;;;;;;:16;:24;;;;;;;;:31;;;;;;;;:40;;;;;;;;:::i;:::-;;2366:227;;;2570:6;2560:17;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2560:17:11;;;;;;;;;;;;;;;;2513:64;;;2523:32;2541:6;2549:5;2523:17;:32::i;:::-;2513:43;;;;;;;;;;;;;36:153:-1;66:2;58:11;;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2513:43:11;;;;;;;;;;;;;;;;:64;;;;2505:73;;;;;;;;-1:-1:-1;;;;;2647:24:11;;;;;;;:16;:24;;;;;;;;:31;;;;;;;;;;2681:1;2647:35;;;2613:69;;;2713:17;;:21;;2693:41;;;2778:46;;;;;;;2790:10;2778:46;;;;;;;;;;;;;;;;;;;;2744:31;;;:12;:31;;;;;;;:80;;;;;;;-1:-1:-1;;2744:80:11;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2778:46;;2744:80;;;;;;;;;;;;:::i;:::-;-1:-1:-1;;2859:17:11;;2840:37;;2859:17;;-1:-1:-1;2840:37:11;;;;;1844:1040;;;;;:::o;1145:303::-;1239:7;241:29;259:10;241:17;:29::i;:::-;:36;;-1:-1:-1;;241:36:11;233:45;;;;;;;;416:6:13;;-1:-1:-1;;;416:6:13;;;;415:7;407:16;;;;;;1275:1:11;1266:10;;;;1258:19;;;;;;1295:29;1313:10;1295:17;:29::i;:::-;:34;;;1287:43;;;;;;-1:-1:-1;;;;;1340:22:11;;;;;;:10;:22;;;;;;:31;;-1:-1:-1;;1340:31:11;;;;;;;;;1386:28;;;1340:22;1386:28;-1:-1:-1;1431:10:11;;1145:303;-1:-1:-1;1145:303:11:o;1274:103:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;801:42:11:-;;;;;;;;;;;;;;;:::o;1512:171:15:-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;;1617:38;;;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o;150:4701:11:-;;;;;;;;;-1:-1:-1;150:4701:11;;;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;150:4701:11;;;-1:-1:-1;150:4701:11;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\nimport \"zeppelin-solidity/contracts/lifecycle/Pausable.sol\";\n\n\ncontract ProfileRegistry is Ownable, Pausable {\n\n    modifier onlySonm() {\n        require(GetValidatorLevel(msg.sender) == - 1);\n        _;\n    }\n\n    enum IdentityLevel {\n        UNKNOWN,\n        ANONYMOUS,\n        REGISTERED,\n        IDENTIFIED,\n        PROFESSIONAL\n    }\n\n    struct Certificate {\n        address from;\n\n        address to;\n\n        uint attributeType;\n\n        bytes value;\n    }\n\n    event ValidatorCreated(address indexed validator);\n\n    event ValidatorDeleted(address indexed validator);\n\n    event CertificateCreated(uint indexed id);\n\n    event CertificateUpdated(uint indexed id);\n\n    uint256 certificatesCount = 0;\n\n    mapping(address => int8) public validators;\n\n    mapping(uint256 => Certificate) public certificates;\n\n    mapping(address => mapping(uint256 => bytes)) certificateValue;\n\n    mapping(address => mapping(uint256 => uint)) certificateCount;\n\n    constructor() public {\n        owner = msg.sender;\n        validators[msg.sender] = - 1;\n    }\n\n    function AddValidator(address _validator, int8 _level) public onlySonm whenNotPaused returns (address) {\n        require(_level > 0);\n        require(GetValidatorLevel(_validator) == 0);\n        validators[_validator] = _level;\n        emit ValidatorCreated(_validator);\n        return _validator;\n    }\n\n    function RemoveValidator(address _validator) public onlySonm whenNotPaused returns (address) {\n        require(GetValidatorLevel(_validator) > 0);\n        validators[_validator] = 0;\n        emit ValidatorDeleted(_validator);\n        return _validator;\n    }\n\n    function GetValidatorLevel(address _validator) public view returns (int8) {\n        return validators[_validator];\n    }\n\n    function CreateCertificate(address _owner, uint256 _type, bytes _value) public whenNotPaused {\n        //Check validator level\n        if (_type >= 1100) {\n            int8 attributeLevel = int8(_type / 100 % 10);\n            require(attributeLevel <= GetValidatorLevel(msg.sender));\n        } else {\n            require(_owner == msg.sender);\n        }\n\n        // Check empty value\n        require(keccak256(_value) != keccak256(\"\"));\n\n        bool isMultiple = _type / 1000 == 2;\n        if (!isMultiple) {\n            if (certificateCount[_owner][_type] == 0) {\n                certificateValue[_owner][_type] = _value;\n            } else {\n                require(keccak256(GetAttributeValue(_owner, _type)) == keccak256(_value));\n            }\n        }\n\n        certificateCount[_owner][_type] = certificateCount[_owner][_type] + 1;\n\n        certificatesCount = certificatesCount + 1;\n        certificates[certificatesCount] = Certificate(msg.sender, _owner, _type, _value);\n\n        emit CertificateCreated(certificatesCount);\n    }\n\n    function RemoveCertificate(uint256 _id) public whenNotPaused {\n        Certificate memory crt = certificates[_id];\n\n        require(crt.to == msg.sender || crt.from == msg.sender || GetValidatorLevel(msg.sender) == -1);\n        require(keccak256(crt.value) != keccak256(\"\"));\n\n        certificateCount[crt.to][crt.attributeType] = certificateCount[crt.to][crt.attributeType] - 1;\n        if (certificateCount[crt.to][crt.attributeType] == 0) {\n            certificateValue[crt.to][crt.attributeType] = \"\";\n        }\n        certificates[_id].value = \"\";\n        emit CertificateUpdated(_id);\n    }\n\n    function GetCertificate(uint256 _id) public view returns (address, address, uint256, bytes) {\n        return (certificates[_id].from, certificates[_id].to, certificates[_id].attributeType, certificates[_id].value);\n    }\n\n    function GetAttributeValue(address _owner, uint256 _type) public view returns (bytes) {\n        return certificateValue[_owner][_type];\n    }\n\n    function GetAttributeCount(address _owner, uint256 _type) public view returns (uint256) {\n        return certificateCount[_owner][_type];\n    }\n\n    function GetProfileLevel(address _owner) public view returns (IdentityLevel) {\n        if (GetAttributeValue(_owner, 1401).length > 0) {\n            return IdentityLevel.PROFESSIONAL;\n        } else if (GetAttributeValue(_owner, 1301).length > 0) {\n            return IdentityLevel.IDENTIFIED;\n        } else if (GetAttributeValue(_owner, 1201).length > 0) {\n            return IdentityLevel.REGISTERED;\n        } else {\n            return IdentityLevel.ANONYMOUS;\n        }\n    }\n\n    function AddSonmValidator(address _validator) public onlyOwner returns (bool) {\n        validators[_validator] = -1;\n        return true;\n    }\n\n    function RemoveSonmValidator(address _validator) public onlyOwner returns (bool) {\n        require(GetValidatorLevel(_validator) == -1);\n        validators[_validator] = 0;\n        return true;\n    }\n}\n",
   "sourcePath": "contracts/ProfileRegistry.sol",
   "ast": {
     "absolutePath": "contracts/ProfileRegistry.sol",
     "exportedSymbols": {
       "ProfileRegistry": [
-        10035
+        10881
       ]
     },
-    "id": 10036,
+    "id": 10882,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 9471,
+        "id": 10317,
         "literals": [
           "solidity",
           "^",
@@ -477,10 +477,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 9472,
+        "id": 10318,
         "nodeType": "ImportDirective",
-        "scope": 10036,
-        "sourceUnit": 10883,
+        "scope": 10882,
+        "sourceUnit": 11167,
         "src": "27:59:11",
         "symbolAliases": [],
         "unitAlias": ""
@@ -488,10 +488,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 9473,
+        "id": 10319,
         "nodeType": "ImportDirective",
-        "scope": 10036,
-        "sourceUnit": 10703,
+        "scope": 10882,
+        "sourceUnit": 10987,
         "src": "87:60:11",
         "symbolAliases": [],
         "unitAlias": ""
@@ -502,17 +502,17 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 9474,
+              "id": 10320,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "178:7:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 9475,
+            "id": 10321,
             "nodeType": "InheritanceSpecifier",
             "src": "178:7:11"
           },
@@ -520,40 +520,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 9476,
+              "id": 10322,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10702,
+              "referencedDeclaration": 10986,
               "src": "187:8:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$10702",
+                "typeIdentifier": "t_contract$_Pausable_$10986",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 9477,
+            "id": 10323,
             "nodeType": "InheritanceSpecifier",
             "src": "187:8:11"
           }
         ],
         "contractDependencies": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 10035,
+        "id": 10881,
         "linearizedBaseContracts": [
-          10035,
-          10702,
-          10882
+          10881,
+          10986,
+          11166
         ],
         "name": "ProfileRegistry",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 9490,
+              "id": 10336,
               "nodeType": "Block",
               "src": "223:73:11",
               "statements": [
@@ -567,7 +567,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9486,
+                        "id": 10332,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -579,18 +579,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9481,
+                                "id": 10327,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "259:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9482,
+                              "id": 10328,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -612,18 +612,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9480,
+                            "id": 10326,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "241:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9483,
+                          "id": 10329,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -641,7 +641,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 9485,
+                          "id": 10331,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -653,7 +653,7 @@
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 9484,
+                            "id": 10330,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -687,21 +687,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9479,
+                      "id": 10325,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "233:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9487,
+                    "id": 10333,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -715,23 +715,23 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9488,
+                  "id": 10334,
                   "nodeType": "ExpressionStatement",
                   "src": "233:45:11"
                 },
                 {
-                  "id": 9489,
+                  "id": 10335,
                   "nodeType": "PlaceholderStatement",
                   "src": "288:1:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9491,
+            "id": 10337,
             "name": "onlySonm",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 9478,
+              "id": 10324,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "220:2:11"
@@ -741,34 +741,34 @@
           },
           {
             "canonicalName": "ProfileRegistry.IdentityLevel",
-            "id": 9497,
+            "id": 10343,
             "members": [
               {
-                "id": 9492,
+                "id": 10338,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
                 "src": "331:7:11"
               },
               {
-                "id": 9493,
+                "id": 10339,
                 "name": "ANONYMOUS",
                 "nodeType": "EnumValue",
                 "src": "348:9:11"
               },
               {
-                "id": 9494,
+                "id": 10340,
                 "name": "REGISTERED",
                 "nodeType": "EnumValue",
                 "src": "367:10:11"
               },
               {
-                "id": 9495,
+                "id": 10341,
                 "name": "IDENTIFIED",
                 "nodeType": "EnumValue",
                 "src": "387:10:11"
               },
               {
-                "id": 9496,
+                "id": 10342,
                 "name": "PROFESSIONAL",
                 "nodeType": "EnumValue",
                 "src": "407:12:11"
@@ -780,14 +780,14 @@
           },
           {
             "canonicalName": "ProfileRegistry.Certificate",
-            "id": 9506,
+            "id": 10352,
             "members": [
               {
                 "constant": false,
-                "id": 9499,
+                "id": 10345,
                 "name": "from",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "460:12:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -796,7 +796,7 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 9498,
+                  "id": 10344,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "460:7:11",
@@ -810,10 +810,10 @@
               },
               {
                 "constant": false,
-                "id": 9501,
+                "id": 10347,
                 "name": "to",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "483:10:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -822,7 +822,7 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 9500,
+                  "id": 10346,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "483:7:11",
@@ -836,10 +836,10 @@
               },
               {
                 "constant": false,
-                "id": 9503,
+                "id": 10349,
                 "name": "attributeType",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "504:18:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -848,7 +848,7 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 9502,
+                  "id": 10348,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "504:4:11",
@@ -862,10 +862,10 @@
               },
               {
                 "constant": false,
-                "id": 9505,
+                "id": 10351,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "533:11:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -874,7 +874,7 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 9504,
+                  "id": 10350,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
                   "src": "533:5:11",
@@ -889,27 +889,27 @@
             ],
             "name": "Certificate",
             "nodeType": "StructDefinition",
-            "scope": 10035,
+            "scope": 10881,
             "src": "431:120:11",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9510,
+            "id": 10356,
             "name": "ValidatorCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9509,
+              "id": 10355,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9508,
+                  "id": 10354,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9510,
+                  "scope": 10356,
                   "src": "580:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -918,7 +918,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9507,
+                    "id": 10353,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "580:7:11",
@@ -938,20 +938,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9514,
+            "id": 10360,
             "name": "ValidatorDeleted",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9513,
+              "id": 10359,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9512,
+                  "id": 10358,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9514,
+                  "scope": 10360,
                   "src": "636:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -960,7 +960,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9511,
+                    "id": 10357,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "636:7:11",
@@ -980,20 +980,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9518,
+            "id": 10364,
             "name": "CertificateCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9517,
+              "id": 10363,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9516,
+                  "id": 10362,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9518,
+                  "scope": 10364,
                   "src": "694:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1002,7 +1002,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9515,
+                    "id": 10361,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "694:4:11",
@@ -1022,20 +1022,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9522,
+            "id": 10368,
             "name": "CertificateUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9521,
+              "id": 10367,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9520,
+                  "id": 10366,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9522,
+                  "scope": 10368,
                   "src": "742:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1044,7 +1044,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9519,
+                    "id": 10365,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "742:4:11",
@@ -1063,10 +1063,10 @@
           },
           {
             "constant": false,
-            "id": 9525,
+            "id": 10371,
             "name": "certificatesCount",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "765:29:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1075,7 +1075,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 9523,
+              "id": 10369,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
               "src": "765:7:11",
@@ -1087,7 +1087,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 9524,
+              "id": 10370,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -1106,10 +1106,10 @@
           },
           {
             "constant": false,
-            "id": 9529,
+            "id": 10375,
             "name": "validators",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "801:42:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1118,9 +1118,9 @@
               "typeString": "mapping(address => int8)"
             },
             "typeName": {
-              "id": 9528,
+              "id": 10374,
               "keyType": {
-                "id": 9526,
+                "id": 10372,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "809:7:11",
@@ -1136,7 +1136,7 @@
                 "typeString": "mapping(address => int8)"
               },
               "valueType": {
-                "id": 9527,
+                "id": 10373,
                 "name": "int8",
                 "nodeType": "ElementaryTypeName",
                 "src": "820:4:11",
@@ -1151,21 +1151,21 @@
           },
           {
             "constant": false,
-            "id": 9533,
+            "id": 10379,
             "name": "certificates",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "850:51:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
             },
             "typeName": {
-              "id": 9532,
+              "id": 10378,
               "keyType": {
-                "id": 9530,
+                "id": 10376,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
                 "src": "858:7:11",
@@ -1177,18 +1177,18 @@
               "nodeType": "Mapping",
               "src": "850:31:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                 "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 9531,
+                "id": 10377,
                 "name": "Certificate",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 9506,
+                "referencedDeclaration": 10352,
                 "src": "869:11:11",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
+                  "typeIdentifier": "t_struct$_Certificate_$10352_storage_ptr",
                   "typeString": "struct ProfileRegistry.Certificate"
                 }
               }
@@ -1198,10 +1198,10 @@
           },
           {
             "constant": false,
-            "id": 9539,
+            "id": 10385,
             "name": "certificateValue",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "908:62:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1210,9 +1210,9 @@
               "typeString": "mapping(address => mapping(uint256 => bytes))"
             },
             "typeName": {
-              "id": 9538,
+              "id": 10384,
               "keyType": {
-                "id": 9534,
+                "id": 10380,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "916:7:11",
@@ -1228,9 +1228,9 @@
                 "typeString": "mapping(address => mapping(uint256 => bytes))"
               },
               "valueType": {
-                "id": 9537,
+                "id": 10383,
                 "keyType": {
-                  "id": 9535,
+                  "id": 10381,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
                   "src": "935:7:11",
@@ -1246,7 +1246,7 @@
                   "typeString": "mapping(uint256 => bytes)"
                 },
                 "valueType": {
-                  "id": 9536,
+                  "id": 10382,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
                   "src": "946:5:11",
@@ -1262,10 +1262,10 @@
           },
           {
             "constant": false,
-            "id": 9545,
+            "id": 10391,
             "name": "certificateCount",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "977:61:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1274,9 +1274,9 @@
               "typeString": "mapping(address => mapping(uint256 => uint256))"
             },
             "typeName": {
-              "id": 9544,
+              "id": 10390,
               "keyType": {
-                "id": 9540,
+                "id": 10386,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "985:7:11",
@@ -1292,9 +1292,9 @@
                 "typeString": "mapping(address => mapping(uint256 => uint256))"
               },
               "valueType": {
-                "id": 9543,
+                "id": 10389,
                 "keyType": {
-                  "id": 9541,
+                  "id": 10387,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
                   "src": "1004:7:11",
@@ -1310,7 +1310,7 @@
                   "typeString": "mapping(uint256 => uint256)"
                 },
                 "valueType": {
-                  "id": 9542,
+                  "id": 10388,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "1015:4:11",
@@ -1326,25 +1326,25 @@
           },
           {
             "body": {
-              "id": 9561,
+              "id": 10407,
               "nodeType": "Block",
               "src": "1066:73:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9551,
+                    "id": 10397,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 9548,
+                      "id": 10394,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "1076:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -1357,18 +1357,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 9549,
+                        "id": 10395,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "1084:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 9550,
+                      "id": 10396,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1388,14 +1388,14 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 9552,
+                  "id": 10398,
                   "nodeType": "ExpressionStatement",
                   "src": "1076:18:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9559,
+                    "id": 10405,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1404,34 +1404,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9553,
+                        "id": 10399,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1104:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9556,
+                      "id": 10402,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9554,
+                          "id": 10400,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
+                          "referencedDeclaration": 11599,
                           "src": "1115:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 9555,
+                        "id": 10401,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1460,7 +1460,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 9558,
+                      "id": 10404,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1472,7 +1472,7 @@
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9557,
+                        "id": 10403,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1498,14 +1498,14 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9560,
+                  "id": 10406,
                   "nodeType": "ExpressionStatement",
                   "src": "1104:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9562,
+            "id": 10408,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1513,19 +1513,19 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9546,
+              "id": 10392,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1056:2:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 9547,
+              "id": 10393,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1066:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1045:94:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -1533,7 +1533,7 @@
           },
           {
             "body": {
-              "id": 9601,
+              "id": 10447,
               "nodeType": "Block",
               "src": "1248:200:11",
               "statements": [
@@ -1547,18 +1547,18 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9578,
+                        "id": 10424,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 9576,
+                          "id": 10422,
                           "name": "_level",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9566,
+                          "referencedDeclaration": 10412,
                           "src": "1266:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
@@ -1570,7 +1570,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9577,
+                          "id": 10423,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1599,21 +1599,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9575,
+                      "id": 10421,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1258:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9579,
+                    "id": 10425,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1627,7 +1627,7 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9580,
+                  "id": 10426,
                   "nodeType": "ExpressionStatement",
                   "src": "1258:19:11"
                 },
@@ -1641,7 +1641,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9586,
+                        "id": 10432,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1651,11 +1651,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9583,
+                              "id": 10429,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9564,
+                              "referencedDeclaration": 10410,
                               "src": "1313:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -1670,18 +1670,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9582,
+                            "id": 10428,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "1295:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9584,
+                          "id": 10430,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1700,7 +1700,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9585,
+                          "id": 10431,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1729,21 +1729,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9581,
+                      "id": 10427,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1287:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9587,
+                    "id": 10433,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1757,14 +1757,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9588,
+                  "id": 10434,
                   "nodeType": "ExpressionStatement",
                   "src": "1287:43:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9593,
+                    "id": 10439,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1773,25 +1773,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9589,
+                        "id": 10435,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1340:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9591,
+                      "id": 10437,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9590,
+                        "id": 10436,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9564,
+                        "referencedDeclaration": 10410,
                         "src": "1351:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -1813,11 +1813,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 9592,
+                      "id": 10438,
                       "name": "_level",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9566,
+                      "referencedDeclaration": 10412,
                       "src": "1365:6:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
@@ -1830,7 +1830,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9594,
+                  "id": 10440,
                   "nodeType": "ExpressionStatement",
                   "src": "1340:31:11"
                 },
@@ -1840,11 +1840,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9596,
+                        "id": 10442,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9564,
+                        "referencedDeclaration": 10410,
                         "src": "1403:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -1859,18 +1859,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 9595,
+                      "id": 10441,
                       "name": "ValidatorCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9510,
+                      "referencedDeclaration": 10356,
                       "src": "1386:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 9597,
+                    "id": 10443,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1884,47 +1884,47 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9598,
+                  "id": 10444,
                   "nodeType": "EmitStatement",
                   "src": "1381:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9599,
+                    "id": 10445,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 9564,
+                    "referencedDeclaration": 10410,
                     "src": "1431:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 9574,
-                  "id": 9600,
+                  "functionReturnParameters": 10420,
+                  "id": 10446,
                   "nodeType": "Return",
                   "src": "1424:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9602,
+            "id": 10448,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9569,
+                "id": 10415,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9568,
+                  "id": 10414,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 9491,
+                  "referencedDeclaration": 10337,
                   "src": "1207:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -1936,14 +1936,14 @@
               },
               {
                 "arguments": null,
-                "id": 9571,
+                "id": 10417,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9570,
+                  "id": 10416,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1216:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -1957,15 +1957,15 @@
             "name": "AddValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9567,
+              "id": 10413,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9564,
+                  "id": 10410,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1167:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -1974,7 +1974,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9563,
+                    "id": 10409,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1167:7:11",
@@ -1988,10 +1988,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9566,
+                  "id": 10412,
                   "name": "_level",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1187:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2000,7 +2000,7 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 9565,
+                    "id": 10411,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
                     "src": "1187:4:11",
@@ -2017,15 +2017,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9574,
+              "id": 10420,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9573,
+                  "id": 10419,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1239:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2034,7 +2034,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9572,
+                    "id": 10418,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1239:7:11",
@@ -2049,7 +2049,7 @@
               ],
               "src": "1238:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1145:303:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -2057,7 +2057,7 @@
           },
           {
             "body": {
-              "id": 9633,
+              "id": 10479,
               "nodeType": "Block",
               "src": "1547:165:11",
               "statements": [
@@ -2071,7 +2071,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9618,
+                        "id": 10464,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2081,11 +2081,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9615,
+                              "id": 10461,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9604,
+                              "referencedDeclaration": 10450,
                               "src": "1583:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -2100,18 +2100,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9614,
+                            "id": 10460,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "1565:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9616,
+                          "id": 10462,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2130,7 +2130,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9617,
+                          "id": 10463,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -2159,21 +2159,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9613,
+                      "id": 10459,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1557:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9619,
+                    "id": 10465,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2187,14 +2187,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9620,
+                  "id": 10466,
                   "nodeType": "ExpressionStatement",
                   "src": "1557:42:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9625,
+                    "id": 10471,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2203,25 +2203,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9621,
+                        "id": 10467,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1609:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9623,
+                      "id": 10469,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9622,
+                        "id": 10468,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9604,
+                        "referencedDeclaration": 10450,
                         "src": "1620:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -2244,7 +2244,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9624,
+                      "id": 10470,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -2265,7 +2265,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9626,
+                  "id": 10472,
                   "nodeType": "ExpressionStatement",
                   "src": "1609:26:11"
                 },
@@ -2275,11 +2275,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9628,
+                        "id": 10474,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9604,
+                        "referencedDeclaration": 10450,
                         "src": "1667:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -2294,18 +2294,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 9627,
+                      "id": 10473,
                       "name": "ValidatorDeleted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9514,
+                      "referencedDeclaration": 10360,
                       "src": "1650:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 9629,
+                    "id": 10475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2319,47 +2319,47 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9630,
+                  "id": 10476,
                   "nodeType": "EmitStatement",
                   "src": "1645:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9631,
+                    "id": 10477,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 9604,
+                    "referencedDeclaration": 10450,
                     "src": "1695:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 9612,
-                  "id": 9632,
+                  "functionReturnParameters": 10458,
+                  "id": 10478,
                   "nodeType": "Return",
                   "src": "1688:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9634,
+            "id": 10480,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9607,
+                "id": 10453,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9606,
+                  "id": 10452,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 9491,
+                  "referencedDeclaration": 10337,
                   "src": "1506:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -2371,14 +2371,14 @@
               },
               {
                 "arguments": null,
-                "id": 9609,
+                "id": 10455,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9608,
+                  "id": 10454,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1515:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -2392,15 +2392,15 @@
             "name": "RemoveValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9605,
+              "id": 10451,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9604,
+                  "id": 10450,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9634,
+                  "scope": 10480,
                   "src": "1479:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2409,7 +2409,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9603,
+                    "id": 10449,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1479:7:11",
@@ -2426,15 +2426,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9612,
+              "id": 10458,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9611,
+                  "id": 10457,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9634,
+                  "scope": 10480,
                   "src": "1538:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2443,7 +2443,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9610,
+                    "id": 10456,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1538:7:11",
@@ -2458,7 +2458,7 @@
               ],
               "src": "1537:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1454:258:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -2466,7 +2466,7 @@
           },
           {
             "body": {
-              "id": 9645,
+              "id": 10491,
               "nodeType": "Block",
               "src": "1792:46:11",
               "statements": [
@@ -2475,25 +2475,25 @@
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 9641,
+                      "id": 10487,
                       "name": "validators",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9529,
+                      "referencedDeclaration": 10375,
                       "src": "1809:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                         "typeString": "mapping(address => int8)"
                       }
                     },
-                    "id": 9643,
+                    "id": 10489,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9642,
+                      "id": 10488,
                       "name": "_validator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9636,
+                      "referencedDeclaration": 10482,
                       "src": "1820:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -2511,15 +2511,15 @@
                       "typeString": "int8"
                     }
                   },
-                  "functionReturnParameters": 9640,
-                  "id": 9644,
+                  "functionReturnParameters": 10486,
+                  "id": 10490,
                   "nodeType": "Return",
                   "src": "1802:29:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9646,
+            "id": 10492,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2527,15 +2527,15 @@
             "name": "GetValidatorLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9637,
+              "id": 10483,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9636,
+                  "id": 10482,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9646,
+                  "scope": 10492,
                   "src": "1745:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2544,7 +2544,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9635,
+                    "id": 10481,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1745:7:11",
@@ -2561,15 +2561,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9640,
+              "id": 10486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9639,
+                  "id": 10485,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9646,
+                  "scope": 10492,
                   "src": "1786:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -2578,7 +2578,7 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 9638,
+                    "id": 10484,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
                     "src": "1786:4:11",
@@ -2593,7 +2593,7 @@
               ],
               "src": "1785:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1718:120:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -2601,7 +2601,7 @@
           },
           {
             "body": {
-              "id": 9778,
+              "id": 10624,
               "nodeType": "Block",
               "src": "1937:947:11",
               "statements": [
@@ -2612,18 +2612,18 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9659,
+                    "id": 10505,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 9657,
+                      "id": 10503,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9650,
+                      "referencedDeclaration": 10496,
                       "src": "1983:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -2635,7 +2635,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31313030",
-                      "id": 9658,
+                      "id": 10504,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -2657,7 +2657,7 @@
                     }
                   },
                   "falseBody": {
-                    "id": 9687,
+                    "id": 10533,
                     "nodeType": "Block",
                     "src": "2143:54:11",
                     "statements": [
@@ -2671,18 +2671,18 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 9684,
+                              "id": 10530,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 9681,
+                                "id": 10527,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9648,
+                                "referencedDeclaration": 10494,
                                 "src": "2165:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -2695,18 +2695,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9682,
+                                  "id": 10528,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
+                                  "referencedDeclaration": 11599,
                                   "src": "2175:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 9683,
+                                "id": 10529,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -2734,21 +2734,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 9680,
+                            "id": 10526,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
+                            "referencedDeclaration": 11602,
                             "src": "2157:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 9685,
+                          "id": 10531,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2762,31 +2762,31 @@
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 9686,
+                        "id": 10532,
                         "nodeType": "ExpressionStatement",
                         "src": "2157:29:11"
                       }
                     ]
                   },
-                  "id": 9688,
+                  "id": 10534,
                   "nodeType": "IfStatement",
                   "src": "1979:218:11",
                   "trueBody": {
-                    "id": 9679,
+                    "id": 10525,
                     "nodeType": "Block",
                     "src": "1998:139:11",
                     "statements": [
                       {
                         "assignments": [
-                          9661
+                          10507
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 9661,
+                            "id": 10507,
                             "name": "attributeLevel",
                             "nodeType": "VariableDeclaration",
-                            "scope": 9779,
+                            "scope": 10625,
                             "src": "2012:19:11",
                             "stateVariable": false,
                             "storageLocation": "default",
@@ -2795,7 +2795,7 @@
                               "typeString": "int8"
                             },
                             "typeName": {
-                              "id": 9660,
+                              "id": 10506,
                               "name": "int8",
                               "nodeType": "ElementaryTypeName",
                               "src": "2012:4:11",
@@ -2808,7 +2808,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 9669,
+                        "id": 10515,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -2818,7 +2818,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 9667,
+                              "id": 10513,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -2829,18 +2829,18 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 9665,
+                                "id": 10511,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "argumentTypes": null,
-                                  "id": 9663,
+                                  "id": 10509,
                                   "name": "_type",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9650,
+                                  "referencedDeclaration": 10496,
                                   "src": "2039:5:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
@@ -2852,7 +2852,7 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "313030",
-                                  "id": 9664,
+                                  "id": 10510,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -2878,7 +2878,7 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "3130",
-                                "id": 9666,
+                                "id": 10512,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -2907,7 +2907,7 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 9662,
+                            "id": 10508,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -2920,7 +2920,7 @@
                             },
                             "typeName": "int8"
                           },
-                          "id": 9668,
+                          "id": 10514,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2947,18 +2947,18 @@
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
                               },
-                              "id": 9676,
+                              "id": 10522,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 9671,
+                                "id": 10517,
                                 "name": "attributeLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9661,
+                                "referencedDeclaration": 10507,
                                 "src": "2078:14:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
@@ -2974,18 +2974,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 9673,
+                                      "id": 10519,
                                       "name": "msg",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 11315,
+                                      "referencedDeclaration": 11599,
                                       "src": "2114:3:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_magic_message",
                                         "typeString": "msg"
                                       }
                                     },
-                                    "id": 9674,
+                                    "id": 10520,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -3007,18 +3007,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 9672,
+                                  "id": 10518,
                                   "name": "GetValidatorLevel",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9646,
+                                  "referencedDeclaration": 10492,
                                   "src": "2096:17:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                     "typeString": "function (address) view returns (int8)"
                                   }
                                 },
-                                "id": 9675,
+                                "id": 10521,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3046,21 +3046,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 9670,
+                            "id": 10516,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
+                            "referencedDeclaration": 11602,
                             "src": "2070:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 9677,
+                          "id": 10523,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3074,7 +3074,7 @@
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 9678,
+                        "id": 10524,
                         "nodeType": "ExpressionStatement",
                         "src": "2070:56:11"
                       }
@@ -3091,7 +3091,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 9696,
+                        "id": 10542,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3101,11 +3101,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9691,
+                              "id": 10537,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9652,
+                              "referencedDeclaration": 10498,
                               "src": "2254:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
@@ -3120,18 +3120,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 9690,
+                            "id": 10536,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "2244:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9692,
+                          "id": 10538,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3153,7 +3153,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 9694,
+                              "id": 10540,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -3176,18 +3176,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 9693,
+                            "id": 10539,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "2265:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9695,
+                          "id": 10541,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -3215,21 +3215,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9689,
+                      "id": 10535,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "2236:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9697,
+                    "id": 10543,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3243,21 +3243,21 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9698,
+                  "id": 10544,
                   "nodeType": "ExpressionStatement",
                   "src": "2236:43:11"
                 },
                 {
                   "assignments": [
-                    9700
+                    10546
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 9700,
+                      "id": 10546,
                       "name": "isMultiple",
                       "nodeType": "VariableDeclaration",
-                      "scope": 9779,
+                      "scope": 10625,
                       "src": "2290:15:11",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -3266,7 +3266,7 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 9699,
+                        "id": 10545,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
                         "src": "2290:4:11",
@@ -3279,14 +3279,14 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 9706,
+                  "id": 10552,
                   "initialValue": {
                     "argumentTypes": null,
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9705,
+                    "id": 10551,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3297,18 +3297,18 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9703,
+                      "id": 10549,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 9701,
+                        "id": 10547,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9650,
+                        "referencedDeclaration": 10496,
                         "src": "2308:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -3320,7 +3320,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31303030",
-                        "id": 9702,
+                        "id": 10548,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -3346,7 +3346,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "32",
-                      "id": 9704,
+                      "id": 10550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -3373,7 +3373,7 @@
                 {
                   "condition": {
                     "argumentTypes": null,
-                    "id": 9708,
+                    "id": 10554,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3384,11 +3384,11 @@
                     "src": "2339:11:11",
                     "subExpression": {
                       "argumentTypes": null,
-                      "id": 9707,
+                      "id": 10553,
                       "name": "isMultiple",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9700,
+                      "referencedDeclaration": 10546,
                       "src": "2340:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -3401,11 +3401,11 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 9741,
+                  "id": 10587,
                   "nodeType": "IfStatement",
                   "src": "2335:268:11",
                   "trueBody": {
-                    "id": 9740,
+                    "id": 10586,
                     "nodeType": "Block",
                     "src": "2352:251:11",
                     "statements": [
@@ -3416,7 +3416,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 9715,
+                          "id": 10561,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3427,25 +3427,25 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 9709,
+                                "id": 10555,
                                 "name": "certificateCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9545,
+                                "referencedDeclaration": 10391,
                                 "src": "2370:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => uint256))"
                                 }
                               },
-                              "id": 9711,
+                              "id": 10557,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 9710,
+                                "id": 10556,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9648,
+                                "referencedDeclaration": 10494,
                                 "src": "2387:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -3463,14 +3463,14 @@
                                 "typeString": "mapping(uint256 => uint256)"
                               }
                             },
-                            "id": 9713,
+                            "id": 10559,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 9712,
+                              "id": 10558,
                               "name": "_type",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9650,
+                              "referencedDeclaration": 10496,
                               "src": "2395:5:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -3493,7 +3493,7 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 9714,
+                            "id": 10560,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -3515,7 +3515,7 @@
                           }
                         },
                         "falseBody": {
-                          "id": 9738,
+                          "id": 10584,
                           "nodeType": "Block",
                           "src": "2487:106:11",
                           "statements": [
@@ -3529,7 +3529,7 @@
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
                                     },
-                                    "id": 9735,
+                                    "id": 10581,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -3542,11 +3542,11 @@
                                           "arguments": [
                                             {
                                               "argumentTypes": null,
-                                              "id": 9728,
+                                              "id": 10574,
                                               "name": "_owner",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 9648,
+                                              "referencedDeclaration": 10494,
                                               "src": "2541:6:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
@@ -3555,11 +3555,11 @@
                                             },
                                             {
                                               "argumentTypes": null,
-                                              "id": 9729,
+                                              "id": 10575,
                                               "name": "_type",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 9650,
+                                              "referencedDeclaration": 10496,
                                               "src": "2549:5:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_uint256",
@@ -3578,18 +3578,18 @@
                                                 "typeString": "uint256"
                                               }
                                             ],
-                                            "id": 9727,
+                                            "id": 10573,
                                             "name": "GetAttributeValue",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 9924,
+                                            "referencedDeclaration": 10770,
                                             "src": "2523:17:11",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                               "typeString": "function (address,uint256) view returns (bytes memory)"
                                             }
                                           },
-                                          "id": 9730,
+                                          "id": 10576,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -3611,18 +3611,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 9726,
+                                        "id": 10572,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11309,
+                                        "referencedDeclaration": 11593,
                                         "src": "2513:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 9731,
+                                      "id": 10577,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -3643,11 +3643,11 @@
                                       "arguments": [
                                         {
                                           "argumentTypes": null,
-                                          "id": 9733,
+                                          "id": 10579,
                                           "name": "_value",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 9652,
+                                          "referencedDeclaration": 10498,
                                           "src": "2570:6:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -3662,18 +3662,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 9732,
+                                        "id": 10578,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11309,
+                                        "referencedDeclaration": 11593,
                                         "src": "2560:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 9734,
+                                      "id": 10580,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -3701,21 +3701,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 9725,
+                                  "id": 10571,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
+                                  "referencedDeclaration": 11602,
                                   "src": "2505:7:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 9736,
+                                "id": 10582,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3729,24 +3729,24 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 9737,
+                              "id": 10583,
                               "nodeType": "ExpressionStatement",
                               "src": "2505:73:11"
                             }
                           ]
                         },
-                        "id": 9739,
+                        "id": 10585,
                         "nodeType": "IfStatement",
                         "src": "2366:227:11",
                         "trueBody": {
-                          "id": 9724,
+                          "id": 10570,
                           "nodeType": "Block",
                           "src": "2408:73:11",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9722,
+                                "id": 10568,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3757,25 +3757,25 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 9716,
+                                      "id": 10562,
                                       "name": "certificateValue",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 9539,
+                                      "referencedDeclaration": 10385,
                                       "src": "2426:16:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                         "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                       }
                                     },
-                                    "id": 9719,
+                                    "id": 10565,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 9717,
+                                      "id": 10563,
                                       "name": "_owner",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 9648,
+                                      "referencedDeclaration": 10494,
                                       "src": "2443:6:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
@@ -3793,14 +3793,14 @@
                                       "typeString": "mapping(uint256 => bytes storage ref)"
                                     }
                                   },
-                                  "id": 9720,
+                                  "id": 10566,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 9718,
+                                    "id": 10564,
                                     "name": "_type",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 9650,
+                                    "referencedDeclaration": 10496,
                                     "src": "2451:5:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -3822,11 +3822,11 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 9721,
+                                  "id": 10567,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9652,
+                                  "referencedDeclaration": 10498,
                                   "src": "2460:6:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_memory_ptr",
@@ -3839,7 +3839,7 @@
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 9723,
+                              "id": 10569,
                               "nodeType": "ExpressionStatement",
                               "src": "2426:40:11"
                             }
@@ -3852,7 +3852,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9754,
+                    "id": 10600,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3863,25 +3863,25 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9742,
+                          "id": 10588,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "2613:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9745,
+                        "id": 10591,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9743,
+                          "id": 10589,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9648,
+                          "referencedDeclaration": 10494,
                           "src": "2630:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -3899,14 +3899,14 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9746,
+                      "id": 10592,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9744,
+                        "id": 10590,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9650,
+                        "referencedDeclaration": 10496,
                         "src": "2638:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -3932,7 +3932,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9753,
+                      "id": 10599,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -3943,25 +3943,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9747,
+                            "id": 10593,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9545,
+                            "referencedDeclaration": 10391,
                             "src": "2647:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 9749,
+                          "id": 10595,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9748,
+                            "id": 10594,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9648,
+                            "referencedDeclaration": 10494,
                             "src": "2664:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -3979,14 +3979,14 @@
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 9751,
+                        "id": 10597,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9750,
+                          "id": 10596,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9650,
+                          "referencedDeclaration": 10496,
                           "src": "2672:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -4009,7 +4009,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9752,
+                        "id": 10598,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -4036,25 +4036,25 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9755,
+                  "id": 10601,
                   "nodeType": "ExpressionStatement",
                   "src": "2613:69:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9760,
+                    "id": 10606,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 9756,
+                      "id": 10602,
                       "name": "certificatesCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9525,
+                      "referencedDeclaration": 10371,
                       "src": "2693:17:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -4069,18 +4069,18 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9759,
+                      "id": 10605,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 9757,
+                        "id": 10603,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2713:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -4092,7 +4092,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9758,
+                        "id": 10604,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -4119,14 +4119,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9761,
+                  "id": 10607,
                   "nodeType": "ExpressionStatement",
                   "src": "2693:41:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9772,
+                    "id": 10618,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4135,25 +4135,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9762,
+                        "id": 10608,
                         "name": "certificates",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9533,
+                        "referencedDeclaration": 10379,
                         "src": "2744:12:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                           "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                         }
                       },
-                      "id": 9764,
+                      "id": 10610,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9763,
+                        "id": 10609,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2757:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -4167,7 +4167,7 @@
                       "nodeType": "IndexAccess",
                       "src": "2744:31:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                         "typeString": "struct ProfileRegistry.Certificate storage ref"
                       }
                     },
@@ -4180,18 +4180,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9766,
+                            "id": 10612,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "2790:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 9767,
+                          "id": 10613,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4207,11 +4207,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9768,
+                          "id": 10614,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9648,
+                          "referencedDeclaration": 10494,
                           "src": "2802:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -4220,11 +4220,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9769,
+                          "id": 10615,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9650,
+                          "referencedDeclaration": 10496,
                           "src": "2810:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -4233,11 +4233,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9770,
+                          "id": 10616,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9652,
+                          "referencedDeclaration": 10498,
                           "src": "2817:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -4264,18 +4264,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 9765,
+                        "id": 10611,
                         "name": "Certificate",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9506,
+                        "referencedDeclaration": 10352,
                         "src": "2778:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Certificate_$9506_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Certificate_$10352_storage_ptr_$",
                           "typeString": "type(struct ProfileRegistry.Certificate storage pointer)"
                         }
                       },
-                      "id": 9771,
+                      "id": 10617,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4285,17 +4285,17 @@
                       "nodeType": "FunctionCall",
                       "src": "2778:46:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_memory",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_memory",
                         "typeString": "struct ProfileRegistry.Certificate memory"
                       }
                     },
                     "src": "2744:80:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
-                  "id": 9773,
+                  "id": 10619,
                   "nodeType": "ExpressionStatement",
                   "src": "2744:80:11"
                 },
@@ -4305,11 +4305,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9775,
+                        "id": 10621,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2859:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -4324,18 +4324,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 9774,
+                      "id": 10620,
                       "name": "CertificateCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9518,
+                      "referencedDeclaration": 10364,
                       "src": "2840:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 9776,
+                    "id": 10622,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4349,28 +4349,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9777,
+                  "id": 10623,
                   "nodeType": "EmitStatement",
                   "src": "2835:42:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9779,
+            "id": 10625,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9655,
+                "id": 10501,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9654,
+                  "id": 10500,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1923:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -4384,15 +4384,15 @@
             "name": "CreateCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9653,
+              "id": 10499,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9648,
+                  "id": 10494,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1871:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -4401,7 +4401,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9647,
+                    "id": 10493,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1871:7:11",
@@ -4415,10 +4415,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9650,
+                  "id": 10496,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1887:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -4427,7 +4427,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9649,
+                    "id": 10495,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "1887:7:11",
@@ -4441,10 +4441,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9652,
+                  "id": 10498,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1902:12:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -4453,7 +4453,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9651,
+                    "id": 10497,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "1902:5:11",
@@ -4470,12 +4470,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9656,
+              "id": 10502,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1937:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1844:1040:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -4483,37 +4483,37 @@
           },
           {
             "body": {
-              "id": 9875,
+              "id": 10721,
               "nodeType": "Block",
               "src": "2951:536:11",
               "statements": [
                 {
                   "assignments": [
-                    9787
+                    10633
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 9787,
+                      "id": 10633,
                       "name": "crt",
                       "nodeType": "VariableDeclaration",
-                      "scope": 9876,
+                      "scope": 10722,
                       "src": "2961:22:11",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                         "typeString": "struct ProfileRegistry.Certificate"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 9786,
+                        "id": 10632,
                         "name": "Certificate",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 9506,
+                        "referencedDeclaration": 10352,
                         "src": "2961:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
+                          "typeIdentifier": "t_struct$_Certificate_$10352_storage_ptr",
                           "typeString": "struct ProfileRegistry.Certificate"
                         }
                       },
@@ -4521,30 +4521,30 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 9791,
+                  "id": 10637,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 9788,
+                      "id": 10634,
                       "name": "certificates",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9533,
+                      "referencedDeclaration": 10379,
                       "src": "2986:12:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                         "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                       }
                     },
-                    "id": 9790,
+                    "id": 10636,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9789,
+                      "id": 10635,
                       "name": "_id",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9781,
+                      "referencedDeclaration": 10627,
                       "src": "2999:3:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -4558,7 +4558,7 @@
                     "nodeType": "IndexAccess",
                     "src": "2986:17:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
@@ -4575,7 +4575,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 9811,
+                        "id": 10657,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4586,7 +4586,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 9803,
+                          "id": 10649,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4597,7 +4597,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 9797,
+                            "id": 10643,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4606,25 +4606,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9793,
+                                "id": 10639,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3022:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9794,
+                              "id": 10640,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "to",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9501,
+                              "referencedDeclaration": 10347,
                               "src": "3022:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -4637,18 +4637,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9795,
+                                "id": 10641,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "3032:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9796,
+                              "id": 10642,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4676,7 +4676,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 9802,
+                            "id": 10648,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4685,25 +4685,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9798,
+                                "id": 10644,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3046:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9799,
+                              "id": 10645,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "from",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9499,
+                              "referencedDeclaration": 10345,
                               "src": "3046:8:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -4716,18 +4716,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9800,
+                                "id": 10646,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "3058:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9801,
+                              "id": 10647,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -4761,7 +4761,7 @@
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           },
-                          "id": 9810,
+                          "id": 10656,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4773,18 +4773,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9805,
+                                  "id": 10651,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
+                                  "referencedDeclaration": 11599,
                                   "src": "3090:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 9806,
+                                "id": 10652,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -4806,18 +4806,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 9804,
+                              "id": 10650,
                               "name": "GetValidatorLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9646,
+                              "referencedDeclaration": 10492,
                               "src": "3072:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                 "typeString": "function (address) view returns (int8)"
                               }
                             },
-                            "id": 9807,
+                            "id": 10653,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4835,7 +4835,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 9809,
+                            "id": 10655,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -4847,7 +4847,7 @@
                             "subExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 9808,
+                              "id": 10654,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -4887,21 +4887,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9792,
+                      "id": 10638,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "3014:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9812,
+                    "id": 10658,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4915,7 +4915,7 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9813,
+                  "id": 10659,
                   "nodeType": "ExpressionStatement",
                   "src": "3014:94:11"
                 },
@@ -4929,7 +4929,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 9822,
+                        "id": 10668,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4941,25 +4941,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9816,
+                                "id": 10662,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3136:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9817,
+                              "id": 10663,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9505,
+                              "referencedDeclaration": 10351,
                               "src": "3136:9:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory",
@@ -4974,18 +4974,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 9815,
+                            "id": 10661,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "3126:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9818,
+                          "id": 10664,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5007,7 +5007,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 9820,
+                              "id": 10666,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -5030,18 +5030,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 9819,
+                            "id": 10665,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "3150:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9821,
+                          "id": 10667,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -5069,21 +5069,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9814,
+                      "id": 10660,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "3118:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9823,
+                    "id": 10669,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5097,14 +5097,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9824,
+                  "id": 10670,
                   "nodeType": "ExpressionStatement",
                   "src": "3118:46:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9841,
+                    "id": 10687,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5115,41 +5115,41 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9825,
+                          "id": 10671,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "3175:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9830,
+                        "id": 10676,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9826,
+                            "id": 10672,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3192:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9827,
+                          "id": 10673,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9501,
+                          "referencedDeclaration": 10347,
                           "src": "3192:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -5167,30 +5167,30 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9831,
+                      "id": 10677,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9828,
+                          "id": 10674,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9787,
+                          "referencedDeclaration": 10633,
                           "src": "3200:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 9829,
+                        "id": 10675,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3200:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -5216,7 +5216,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9840,
+                      "id": 10686,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -5227,41 +5227,41 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9832,
+                            "id": 10678,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9545,
+                            "referencedDeclaration": 10391,
                             "src": "3221:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 9835,
+                          "id": 10681,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 9833,
+                              "id": 10679,
                               "name": "crt",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9787,
+                              "referencedDeclaration": 10633,
                               "src": "3238:3:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                 "typeString": "struct ProfileRegistry.Certificate memory"
                               }
                             },
-                            "id": 9834,
+                            "id": 10680,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "to",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9501,
+                            "referencedDeclaration": 10347,
                             "src": "3238:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -5279,30 +5279,30 @@
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 9838,
+                        "id": 10684,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9836,
+                            "id": 10682,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3246:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9837,
+                          "id": 10683,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "attributeType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9503,
+                          "referencedDeclaration": 10349,
                           "src": "3246:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -5325,7 +5325,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9839,
+                        "id": 10685,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -5352,7 +5352,7 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9842,
+                  "id": 10688,
                   "nodeType": "ExpressionStatement",
                   "src": "3175:93:11"
                 },
@@ -5363,7 +5363,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9851,
+                    "id": 10697,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5374,41 +5374,41 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9843,
+                          "id": 10689,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "3282:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9846,
+                        "id": 10692,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9844,
+                            "id": 10690,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3299:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9845,
+                          "id": 10691,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9501,
+                          "referencedDeclaration": 10347,
                           "src": "3299:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -5426,30 +5426,30 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9849,
+                      "id": 10695,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9847,
+                          "id": 10693,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9787,
+                          "referencedDeclaration": 10633,
                           "src": "3307:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 9848,
+                        "id": 10694,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3307:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -5472,7 +5472,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9850,
+                      "id": 10696,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5494,18 +5494,18 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 9863,
+                  "id": 10709,
                   "nodeType": "IfStatement",
                   "src": "3278:127:11",
                   "trueBody": {
-                    "id": 9862,
+                    "id": 10708,
                     "nodeType": "Block",
                     "src": "3332:73:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9860,
+                          "id": 10706,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5516,41 +5516,41 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 9852,
+                                "id": 10698,
                                 "name": "certificateValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9539,
+                                "referencedDeclaration": 10385,
                                 "src": "3346:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                 }
                               },
-                              "id": 9857,
+                              "id": 10703,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9853,
+                                  "id": 10699,
                                   "name": "crt",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9787,
+                                  "referencedDeclaration": 10633,
                                   "src": "3363:3:11",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                     "typeString": "struct ProfileRegistry.Certificate memory"
                                   }
                                 },
-                                "id": 9854,
+                                "id": 10700,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "to",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 9501,
+                                "referencedDeclaration": 10347,
                                 "src": "3363:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -5568,30 +5568,30 @@
                                 "typeString": "mapping(uint256 => bytes storage ref)"
                               }
                             },
-                            "id": 9858,
+                            "id": 10704,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9855,
+                                "id": 10701,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3371:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9856,
+                              "id": 10702,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "attributeType",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9503,
+                              "referencedDeclaration": 10349,
                               "src": "3371:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -5614,7 +5614,7 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "",
-                            "id": 9859,
+                            "id": 10705,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -5635,7 +5635,7 @@
                             "typeString": "bytes storage ref"
                           }
                         },
-                        "id": 9861,
+                        "id": 10707,
                         "nodeType": "ExpressionStatement",
                         "src": "3346:48:11"
                       }
@@ -5645,7 +5645,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9869,
+                    "id": 10715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5656,25 +5656,25 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9864,
+                          "id": 10710,
                           "name": "certificates",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9533,
+                          "referencedDeclaration": 10379,
                           "src": "3414:12:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                             "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                           }
                         },
-                        "id": 9866,
+                        "id": 10712,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9865,
+                          "id": 10711,
                           "name": "_id",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9781,
+                          "referencedDeclaration": 10627,
                           "src": "3427:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -5688,18 +5688,18 @@
                         "nodeType": "IndexAccess",
                         "src": "3414:17:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                          "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                           "typeString": "struct ProfileRegistry.Certificate storage ref"
                         }
                       },
-                      "id": 9867,
+                      "id": 10713,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "value",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 9505,
+                      "referencedDeclaration": 10351,
                       "src": "3414:23:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes_storage",
@@ -5711,7 +5711,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "",
-                      "id": 9868,
+                      "id": 10714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -5732,7 +5732,7 @@
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "id": 9870,
+                  "id": 10716,
                   "nodeType": "ExpressionStatement",
                   "src": "3414:28:11"
                 },
@@ -5742,11 +5742,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9872,
+                        "id": 10718,
                         "name": "_id",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9781,
+                        "referencedDeclaration": 10627,
                         "src": "3476:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -5761,18 +5761,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 9871,
+                      "id": 10717,
                       "name": "CertificateUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9522,
+                      "referencedDeclaration": 10368,
                       "src": "3457:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 9873,
+                    "id": 10719,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5786,28 +5786,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9874,
+                  "id": 10720,
                   "nodeType": "EmitStatement",
                   "src": "3452:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9876,
+            "id": 10722,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9784,
+                "id": 10630,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9783,
+                  "id": 10629,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "2937:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -5821,15 +5821,15 @@
             "name": "RemoveCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9782,
+              "id": 10628,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9781,
+                  "id": 10627,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9876,
+                  "scope": 10722,
                   "src": "2917:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -5838,7 +5838,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9780,
+                    "id": 10626,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2917:7:11",
@@ -5855,12 +5855,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9785,
+              "id": 10631,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "2951:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "2890:597:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -5868,7 +5868,7 @@
           },
           {
             "body": {
-              "id": 9907,
+              "id": 10753,
               "nodeType": "Block",
               "src": "3585:128:11",
               "statements": [
@@ -5882,25 +5882,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9889,
+                            "id": 10735,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3603:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9891,
+                          "id": 10737,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9890,
+                            "id": 10736,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3616:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -5914,18 +5914,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3603:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9892,
+                        "id": 10738,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "from",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9499,
+                        "referencedDeclaration": 10345,
                         "src": "3603:22:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -5938,25 +5938,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9893,
+                            "id": 10739,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3627:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9895,
+                          "id": 10741,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9894,
+                            "id": 10740,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3640:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -5970,18 +5970,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3627:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9896,
+                        "id": 10742,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "to",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9501,
+                        "referencedDeclaration": 10347,
                         "src": "3627:20:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -5994,25 +5994,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9897,
+                            "id": 10743,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3649:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9899,
+                          "id": 10745,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9898,
+                            "id": 10744,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3662:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -6026,18 +6026,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3649:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9900,
+                        "id": 10746,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3649:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -6050,25 +6050,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9901,
+                            "id": 10747,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3682:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9903,
+                          "id": 10749,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9902,
+                            "id": 10748,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3695:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -6082,18 +6082,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3682:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9904,
+                        "id": 10750,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "value",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9505,
+                        "referencedDeclaration": 10351,
                         "src": "3682:23:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage",
@@ -6101,7 +6101,7 @@
                         }
                       }
                     ],
-                    "id": 9905,
+                    "id": 10751,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
@@ -6114,15 +6114,15 @@
                       "typeString": "tuple(address,address,uint256,bytes storage ref)"
                     }
                   },
-                  "functionReturnParameters": 9888,
-                  "id": 9906,
+                  "functionReturnParameters": 10734,
+                  "id": 10752,
                   "nodeType": "Return",
                   "src": "3595:111:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9908,
+            "id": 10754,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6130,15 +6130,15 @@
             "name": "GetCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9879,
+              "id": 10725,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9878,
+                  "id": 10724,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3517:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6147,7 +6147,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9877,
+                    "id": 10723,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3517:7:11",
@@ -6164,15 +6164,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9888,
+              "id": 10734,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9881,
+                  "id": 10727,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3551:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6181,7 +6181,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9880,
+                    "id": 10726,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3551:7:11",
@@ -6195,10 +6195,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9883,
+                  "id": 10729,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3560:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6207,7 +6207,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9882,
+                    "id": 10728,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3560:7:11",
@@ -6221,10 +6221,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9885,
+                  "id": 10731,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3569:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6233,7 +6233,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9884,
+                    "id": 10730,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3569:7:11",
@@ -6247,10 +6247,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9887,
+                  "id": 10733,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3578:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6259,7 +6259,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9886,
+                    "id": 10732,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "3578:5:11",
@@ -6274,7 +6274,7 @@
               ],
               "src": "3550:34:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3493:220:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -6282,7 +6282,7 @@
           },
           {
             "body": {
-              "id": 9923,
+              "id": 10769,
               "nodeType": "Block",
               "src": "3805:55:11",
               "statements": [
@@ -6293,25 +6293,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9917,
+                        "id": 10763,
                         "name": "certificateValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9539,
+                        "referencedDeclaration": 10385,
                         "src": "3822:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                           "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                         }
                       },
-                      "id": 9919,
+                      "id": 10765,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9918,
+                        "id": 10764,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9910,
+                        "referencedDeclaration": 10756,
                         "src": "3839:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -6329,14 +6329,14 @@
                         "typeString": "mapping(uint256 => bytes storage ref)"
                       }
                     },
-                    "id": 9921,
+                    "id": 10767,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9920,
+                      "id": 10766,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9912,
+                      "referencedDeclaration": 10758,
                       "src": "3847:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -6354,15 +6354,15 @@
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "functionReturnParameters": 9916,
-                  "id": 9922,
+                  "functionReturnParameters": 10762,
+                  "id": 10768,
                   "nodeType": "Return",
                   "src": "3815:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9924,
+            "id": 10770,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6370,15 +6370,15 @@
             "name": "GetAttributeValue",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9913,
+              "id": 10759,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9910,
+                  "id": 10756,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3746:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6387,7 +6387,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9909,
+                    "id": 10755,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3746:7:11",
@@ -6401,10 +6401,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9912,
+                  "id": 10758,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3762:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6413,7 +6413,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9911,
+                    "id": 10757,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3762:7:11",
@@ -6430,15 +6430,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9916,
+              "id": 10762,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9915,
+                  "id": 10761,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3798:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6447,7 +6447,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9914,
+                    "id": 10760,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "3798:5:11",
@@ -6462,7 +6462,7 @@
               ],
               "src": "3797:7:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3719:141:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -6470,7 +6470,7 @@
           },
           {
             "body": {
-              "id": 9939,
+              "id": 10785,
               "nodeType": "Block",
               "src": "3954:55:11",
               "statements": [
@@ -6481,25 +6481,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9933,
+                        "id": 10779,
                         "name": "certificateCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9545,
+                        "referencedDeclaration": 10391,
                         "src": "3971:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(uint256 => uint256))"
                         }
                       },
-                      "id": 9935,
+                      "id": 10781,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9934,
+                        "id": 10780,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9926,
+                        "referencedDeclaration": 10772,
                         "src": "3988:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -6517,14 +6517,14 @@
                         "typeString": "mapping(uint256 => uint256)"
                       }
                     },
-                    "id": 9937,
+                    "id": 10783,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9936,
+                      "id": 10782,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9928,
+                      "referencedDeclaration": 10774,
                       "src": "3996:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -6542,15 +6542,15 @@
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 9932,
-                  "id": 9938,
+                  "functionReturnParameters": 10778,
+                  "id": 10784,
                   "nodeType": "Return",
                   "src": "3964:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9940,
+            "id": 10786,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -6558,15 +6558,15 @@
             "name": "GetAttributeCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9929,
+              "id": 10775,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9926,
+                  "id": 10772,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3893:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6575,7 +6575,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9925,
+                    "id": 10771,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3893:7:11",
@@ -6589,10 +6589,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9928,
+                  "id": 10774,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3909:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6601,7 +6601,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9927,
+                    "id": 10773,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3909:7:11",
@@ -6618,15 +6618,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9932,
+              "id": 10778,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9931,
+                  "id": 10777,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3945:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -6635,7 +6635,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9930,
+                    "id": 10776,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3945:7:11",
@@ -6650,7 +6650,7 @@
               ],
               "src": "3944:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3866:143:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -6658,7 +6658,7 @@
           },
           {
             "body": {
-              "id": 9987,
+              "id": 10833,
               "nodeType": "Block",
               "src": "4092:403:11",
               "statements": [
@@ -6669,7 +6669,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9953,
+                    "id": 10799,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6681,11 +6681,11 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 9948,
+                            "id": 10794,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9942,
+                            "referencedDeclaration": 10788,
                             "src": "4124:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -6695,7 +6695,7 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "31343031",
-                            "id": 9949,
+                            "id": 10795,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -6722,18 +6722,18 @@
                               "typeString": "int_const 1401"
                             }
                           ],
-                          "id": 9947,
+                          "id": 10793,
                           "name": "GetAttributeValue",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9924,
+                          "referencedDeclaration": 10770,
                           "src": "4106:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                             "typeString": "function (address,uint256) view returns (bytes memory)"
                           }
                         },
-                        "id": 9950,
+                        "id": 10796,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6747,7 +6747,7 @@
                           "typeString": "bytes memory"
                         }
                       },
-                      "id": 9951,
+                      "id": 10797,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6766,7 +6766,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9952,
+                      "id": 10798,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -6794,7 +6794,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9964,
+                      "id": 10810,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -6806,11 +6806,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9959,
+                              "id": 10805,
                               "name": "_owner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9942,
+                              "referencedDeclaration": 10788,
                               "src": "4236:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -6820,7 +6820,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "31333031",
-                              "id": 9960,
+                              "id": 10806,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -6847,18 +6847,18 @@
                                 "typeString": "int_const 1301"
                               }
                             ],
-                            "id": 9958,
+                            "id": 10804,
                             "name": "GetAttributeValue",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9924,
+                            "referencedDeclaration": 10770,
                             "src": "4218:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (address,uint256) view returns (bytes memory)"
                             }
                           },
-                          "id": 9961,
+                          "id": 10807,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6872,7 +6872,7 @@
                             "typeString": "bytes memory"
                           }
                         },
-                        "id": 9962,
+                        "id": 10808,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6891,7 +6891,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 9963,
+                        "id": 10809,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -6919,7 +6919,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 9975,
+                        "id": 10821,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6931,11 +6931,11 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 9970,
+                                "id": 10816,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9942,
+                                "referencedDeclaration": 10788,
                                 "src": "4346:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -6945,7 +6945,7 @@
                               {
                                 "argumentTypes": null,
                                 "hexValue": "31323031",
-                                "id": 9971,
+                                "id": 10817,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -6972,18 +6972,18 @@
                                   "typeString": "int_const 1201"
                                 }
                               ],
-                              "id": 9969,
+                              "id": 10815,
                               "name": "GetAttributeValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9924,
+                              "referencedDeclaration": 10770,
                               "src": "4328:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                 "typeString": "function (address,uint256) view returns (bytes memory)"
                               }
                             },
-                            "id": 9972,
+                            "id": 10818,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6997,7 +6997,7 @@
                               "typeString": "bytes memory"
                             }
                           },
-                          "id": 9973,
+                          "id": 10819,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7016,7 +7016,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9974,
+                          "id": 10820,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7038,7 +7038,7 @@
                         }
                       },
                       "falseBody": {
-                        "id": 9983,
+                        "id": 10829,
                         "nodeType": "Block",
                         "src": "4434:55:11",
                         "statements": [
@@ -7047,18 +7047,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9980,
+                                "id": 10826,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9497,
+                                "referencedDeclaration": 10343,
                                 "src": "4455:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 9981,
+                              "id": 10827,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7068,22 +7068,22 @@
                               "referencedDeclaration": null,
                               "src": "4455:23:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 9946,
-                            "id": 9982,
+                            "functionReturnParameters": 10792,
+                            "id": 10828,
                             "nodeType": "Return",
                             "src": "4448:30:11"
                           }
                         ]
                       },
-                      "id": 9984,
+                      "id": 10830,
                       "nodeType": "IfStatement",
                       "src": "4324:165:11",
                       "trueBody": {
-                        "id": 9979,
+                        "id": 10825,
                         "nodeType": "Block",
                         "src": "4372:56:11",
                         "statements": [
@@ -7092,18 +7092,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9976,
+                                "id": 10822,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9497,
+                                "referencedDeclaration": 10343,
                                 "src": "4393:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 9977,
+                              "id": 10823,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -7113,23 +7113,23 @@
                               "referencedDeclaration": null,
                               "src": "4393:24:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 9946,
-                            "id": 9978,
+                            "functionReturnParameters": 10792,
+                            "id": 10824,
                             "nodeType": "Return",
                             "src": "4386:31:11"
                           }
                         ]
                       }
                     },
-                    "id": 9985,
+                    "id": 10831,
                     "nodeType": "IfStatement",
                     "src": "4214:275:11",
                     "trueBody": {
-                      "id": 9968,
+                      "id": 10814,
                       "nodeType": "Block",
                       "src": "4262:56:11",
                       "statements": [
@@ -7138,18 +7138,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 9965,
+                              "id": 10811,
                               "name": "IdentityLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9497,
+                              "referencedDeclaration": 10343,
                               "src": "4283:13:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                 "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                               }
                             },
-                            "id": 9966,
+                            "id": 10812,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -7159,23 +7159,23 @@
                             "referencedDeclaration": null,
                             "src": "4283:24:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                              "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                               "typeString": "enum ProfileRegistry.IdentityLevel"
                             }
                           },
-                          "functionReturnParameters": 9946,
-                          "id": 9967,
+                          "functionReturnParameters": 10792,
+                          "id": 10813,
                           "nodeType": "Return",
                           "src": "4276:31:11"
                         }
                       ]
                     }
                   },
-                  "id": 9986,
+                  "id": 10832,
                   "nodeType": "IfStatement",
                   "src": "4102:387:11",
                   "trueBody": {
-                    "id": 9957,
+                    "id": 10803,
                     "nodeType": "Block",
                     "src": "4150:58:11",
                     "statements": [
@@ -7184,18 +7184,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9954,
+                            "id": 10800,
                             "name": "IdentityLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9497,
+                            "referencedDeclaration": 10343,
                             "src": "4171:13:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 9955,
+                          "id": 10801,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7205,12 +7205,12 @@
                           "referencedDeclaration": null,
                           "src": "4171:26:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "functionReturnParameters": 9946,
-                        "id": 9956,
+                        "functionReturnParameters": 10792,
+                        "id": 10802,
                         "nodeType": "Return",
                         "src": "4164:33:11"
                       }
@@ -7220,7 +7220,7 @@
               ]
             },
             "documentation": null,
-            "id": 9988,
+            "id": 10834,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -7228,15 +7228,15 @@
             "name": "GetProfileLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9943,
+              "id": 10789,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9942,
+                  "id": 10788,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9988,
+                  "scope": 10834,
                   "src": "4040:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7245,7 +7245,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9941,
+                    "id": 10787,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4040:7:11",
@@ -7262,31 +7262,31 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9946,
+              "id": 10792,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9945,
+                  "id": 10791,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9988,
+                  "scope": 10834,
                   "src": "4077:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 9944,
+                    "id": 10790,
                     "name": "IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
+                    "referencedDeclaration": 10343,
                     "src": "4077:13:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -7296,7 +7296,7 @@
               ],
               "src": "4076:15:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4015:480:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -7304,14 +7304,14 @@
           },
           {
             "body": {
-              "id": 10006,
+              "id": 10852,
               "nodeType": "Block",
               "src": "4579:65:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10002,
+                    "id": 10848,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7320,25 +7320,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9997,
+                        "id": 10843,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "4589:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9999,
+                      "id": 10845,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9998,
+                        "id": 10844,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9990,
+                        "referencedDeclaration": 10836,
                         "src": "4600:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -7360,7 +7360,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10001,
+                      "id": 10847,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7372,7 +7372,7 @@
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 10000,
+                        "id": 10846,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -7398,7 +7398,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 10003,
+                  "id": 10849,
                   "nodeType": "ExpressionStatement",
                   "src": "4589:27:11"
                 },
@@ -7406,7 +7406,7 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10004,
+                    "id": 10850,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -7421,29 +7421,29 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 9996,
-                  "id": 10005,
+                  "functionReturnParameters": 10842,
+                  "id": 10851,
                   "nodeType": "Return",
                   "src": "4626:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 10007,
+            "id": 10853,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9993,
+                "id": 10839,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9992,
+                  "id": 10838,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "4554:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -7457,15 +7457,15 @@
             "name": "AddSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9991,
+              "id": 10837,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9990,
+                  "id": 10836,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10007,
+                  "scope": 10853,
                   "src": "4527:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7474,7 +7474,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9989,
+                    "id": 10835,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4527:7:11",
@@ -7491,15 +7491,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9996,
+              "id": 10842,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9995,
+                  "id": 10841,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10007,
+                  "scope": 10853,
                   "src": "4573:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7508,7 +7508,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 9994,
+                    "id": 10840,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "4573:4:11",
@@ -7523,7 +7523,7 @@
               ],
               "src": "4572:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4501:143:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -7531,7 +7531,7 @@
           },
           {
             "body": {
-              "id": 10033,
+              "id": 10879,
               "nodeType": "Block",
               "src": "4731:118:11",
               "statements": [
@@ -7545,7 +7545,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 10022,
+                        "id": 10868,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -7555,11 +7555,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 10018,
+                              "id": 10864,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 10009,
+                              "referencedDeclaration": 10855,
                               "src": "4767:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -7574,18 +7574,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 10017,
+                            "id": 10863,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "4749:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 10019,
+                          "id": 10865,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -7603,7 +7603,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10021,
+                          "id": 10867,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -7615,7 +7615,7 @@
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 10020,
+                            "id": 10866,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -7649,21 +7649,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10016,
+                      "id": 10862,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "4741:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10023,
+                    "id": 10869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7677,14 +7677,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10024,
+                  "id": 10870,
                   "nodeType": "ExpressionStatement",
                   "src": "4741:44:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10029,
+                    "id": 10875,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -7693,25 +7693,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10025,
+                        "id": 10871,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "4795:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 10027,
+                      "id": 10873,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 10026,
+                        "id": 10872,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10009,
+                        "referencedDeclaration": 10855,
                         "src": "4806:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -7734,7 +7734,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 10028,
+                      "id": 10874,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -7755,7 +7755,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 10030,
+                  "id": 10876,
                   "nodeType": "ExpressionStatement",
                   "src": "4795:26:11"
                 },
@@ -7763,7 +7763,7 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10031,
+                    "id": 10877,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -7778,29 +7778,29 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 10015,
-                  "id": 10032,
+                  "functionReturnParameters": 10861,
+                  "id": 10878,
                   "nodeType": "Return",
                   "src": "4831:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 10034,
+            "id": 10880,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10012,
+                "id": 10858,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10011,
+                  "id": 10857,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "4706:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -7814,15 +7814,15 @@
             "name": "RemoveSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10010,
+              "id": 10856,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10009,
+                  "id": 10855,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10034,
+                  "scope": 10880,
                   "src": "4679:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7831,7 +7831,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10008,
+                    "id": 10854,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4679:7:11",
@@ -7848,15 +7848,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 10015,
+              "id": 10861,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10014,
+                  "id": 10860,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10034,
+                  "scope": 10880,
                   "src": "4725:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -7865,7 +7865,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 10013,
+                    "id": 10859,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "4725:4:11",
@@ -7880,14 +7880,14 @@
               ],
               "src": "4724:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4650:199:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10036,
+        "scope": 10882,
         "src": "150:4701:11"
       }
     ],
@@ -7897,14 +7897,14 @@
     "absolutePath": "contracts/ProfileRegistry.sol",
     "exportedSymbols": {
       "ProfileRegistry": [
-        10035
+        10881
       ]
     },
-    "id": 10036,
+    "id": 10882,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 9471,
+        "id": 10317,
         "literals": [
           "solidity",
           "^",
@@ -7917,10 +7917,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 9472,
+        "id": 10318,
         "nodeType": "ImportDirective",
-        "scope": 10036,
-        "sourceUnit": 10883,
+        "scope": 10882,
+        "sourceUnit": 11167,
         "src": "27:59:11",
         "symbolAliases": [],
         "unitAlias": ""
@@ -7928,10 +7928,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
         "file": "zeppelin-solidity/contracts/lifecycle/Pausable.sol",
-        "id": 9473,
+        "id": 10319,
         "nodeType": "ImportDirective",
-        "scope": 10036,
-        "sourceUnit": 10703,
+        "scope": 10882,
+        "sourceUnit": 10987,
         "src": "87:60:11",
         "symbolAliases": [],
         "unitAlias": ""
@@ -7942,17 +7942,17 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 9474,
+              "id": 10320,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "178:7:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 9475,
+            "id": 10321,
             "nodeType": "InheritanceSpecifier",
             "src": "178:7:11"
           },
@@ -7960,40 +7960,40 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 9476,
+              "id": 10322,
               "name": "Pausable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10702,
+              "referencedDeclaration": 10986,
               "src": "187:8:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Pausable_$10702",
+                "typeIdentifier": "t_contract$_Pausable_$10986",
                 "typeString": "contract Pausable"
               }
             },
-            "id": 9477,
+            "id": 10323,
             "nodeType": "InheritanceSpecifier",
             "src": "187:8:11"
           }
         ],
         "contractDependencies": [
-          10702,
-          10882
+          10986,
+          11166
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 10035,
+        "id": 10881,
         "linearizedBaseContracts": [
-          10035,
-          10702,
-          10882
+          10881,
+          10986,
+          11166
         ],
         "name": "ProfileRegistry",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 9490,
+              "id": 10336,
               "nodeType": "Block",
               "src": "223:73:11",
               "statements": [
@@ -8007,7 +8007,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9486,
+                        "id": 10332,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8019,18 +8019,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9481,
+                                "id": 10327,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "259:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9482,
+                              "id": 10328,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -8052,18 +8052,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9480,
+                            "id": 10326,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "241:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9483,
+                          "id": 10329,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -8081,7 +8081,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 9485,
+                          "id": 10331,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -8093,7 +8093,7 @@
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 9484,
+                            "id": 10330,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -8127,21 +8127,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9479,
+                      "id": 10325,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "233:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9487,
+                    "id": 10333,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8155,23 +8155,23 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9488,
+                  "id": 10334,
                   "nodeType": "ExpressionStatement",
                   "src": "233:45:11"
                 },
                 {
-                  "id": 9489,
+                  "id": 10335,
                   "nodeType": "PlaceholderStatement",
                   "src": "288:1:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9491,
+            "id": 10337,
             "name": "onlySonm",
             "nodeType": "ModifierDefinition",
             "parameters": {
-              "id": 9478,
+              "id": 10324,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "220:2:11"
@@ -8181,34 +8181,34 @@
           },
           {
             "canonicalName": "ProfileRegistry.IdentityLevel",
-            "id": 9497,
+            "id": 10343,
             "members": [
               {
-                "id": 9492,
+                "id": 10338,
                 "name": "UNKNOWN",
                 "nodeType": "EnumValue",
                 "src": "331:7:11"
               },
               {
-                "id": 9493,
+                "id": 10339,
                 "name": "ANONYMOUS",
                 "nodeType": "EnumValue",
                 "src": "348:9:11"
               },
               {
-                "id": 9494,
+                "id": 10340,
                 "name": "REGISTERED",
                 "nodeType": "EnumValue",
                 "src": "367:10:11"
               },
               {
-                "id": 9495,
+                "id": 10341,
                 "name": "IDENTIFIED",
                 "nodeType": "EnumValue",
                 "src": "387:10:11"
               },
               {
-                "id": 9496,
+                "id": 10342,
                 "name": "PROFESSIONAL",
                 "nodeType": "EnumValue",
                 "src": "407:12:11"
@@ -8220,14 +8220,14 @@
           },
           {
             "canonicalName": "ProfileRegistry.Certificate",
-            "id": 9506,
+            "id": 10352,
             "members": [
               {
                 "constant": false,
-                "id": 9499,
+                "id": 10345,
                 "name": "from",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "460:12:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -8236,7 +8236,7 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 9498,
+                  "id": 10344,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "460:7:11",
@@ -8250,10 +8250,10 @@
               },
               {
                 "constant": false,
-                "id": 9501,
+                "id": 10347,
                 "name": "to",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "483:10:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -8262,7 +8262,7 @@
                   "typeString": "address"
                 },
                 "typeName": {
-                  "id": 9500,
+                  "id": 10346,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
                   "src": "483:7:11",
@@ -8276,10 +8276,10 @@
               },
               {
                 "constant": false,
-                "id": 9503,
+                "id": 10349,
                 "name": "attributeType",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "504:18:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -8288,7 +8288,7 @@
                   "typeString": "uint256"
                 },
                 "typeName": {
-                  "id": 9502,
+                  "id": 10348,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "504:4:11",
@@ -8302,10 +8302,10 @@
               },
               {
                 "constant": false,
-                "id": 9505,
+                "id": 10351,
                 "name": "value",
                 "nodeType": "VariableDeclaration",
-                "scope": 9506,
+                "scope": 10352,
                 "src": "533:11:11",
                 "stateVariable": false,
                 "storageLocation": "default",
@@ -8314,7 +8314,7 @@
                   "typeString": "bytes"
                 },
                 "typeName": {
-                  "id": 9504,
+                  "id": 10350,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
                   "src": "533:5:11",
@@ -8329,27 +8329,27 @@
             ],
             "name": "Certificate",
             "nodeType": "StructDefinition",
-            "scope": 10035,
+            "scope": 10881,
             "src": "431:120:11",
             "visibility": "public"
           },
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9510,
+            "id": 10356,
             "name": "ValidatorCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9509,
+              "id": 10355,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9508,
+                  "id": 10354,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9510,
+                  "scope": 10356,
                   "src": "580:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8358,7 +8358,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9507,
+                    "id": 10353,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "580:7:11",
@@ -8378,20 +8378,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9514,
+            "id": 10360,
             "name": "ValidatorDeleted",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9513,
+              "id": 10359,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9512,
+                  "id": 10358,
                   "indexed": true,
                   "name": "validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9514,
+                  "scope": 10360,
                   "src": "636:25:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8400,7 +8400,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9511,
+                    "id": 10357,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "636:7:11",
@@ -8420,20 +8420,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9518,
+            "id": 10364,
             "name": "CertificateCreated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9517,
+              "id": 10363,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9516,
+                  "id": 10362,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9518,
+                  "scope": 10364,
                   "src": "694:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8442,7 +8442,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9515,
+                    "id": 10361,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "694:4:11",
@@ -8462,20 +8462,20 @@
           {
             "anonymous": false,
             "documentation": null,
-            "id": 9522,
+            "id": 10368,
             "name": "CertificateUpdated",
             "nodeType": "EventDefinition",
             "parameters": {
-              "id": 9521,
+              "id": 10367,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9520,
+                  "id": 10366,
                   "indexed": true,
                   "name": "id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9522,
+                  "scope": 10368,
                   "src": "742:15:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -8484,7 +8484,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9519,
+                    "id": 10365,
                     "name": "uint",
                     "nodeType": "ElementaryTypeName",
                     "src": "742:4:11",
@@ -8503,10 +8503,10 @@
           },
           {
             "constant": false,
-            "id": 9525,
+            "id": 10371,
             "name": "certificatesCount",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "765:29:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -8515,7 +8515,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 9523,
+              "id": 10369,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
               "src": "765:7:11",
@@ -8527,7 +8527,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "30",
-              "id": 9524,
+              "id": 10370,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -8546,10 +8546,10 @@
           },
           {
             "constant": false,
-            "id": 9529,
+            "id": 10375,
             "name": "validators",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "801:42:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -8558,9 +8558,9 @@
               "typeString": "mapping(address => int8)"
             },
             "typeName": {
-              "id": 9528,
+              "id": 10374,
               "keyType": {
-                "id": 9526,
+                "id": 10372,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "809:7:11",
@@ -8576,7 +8576,7 @@
                 "typeString": "mapping(address => int8)"
               },
               "valueType": {
-                "id": 9527,
+                "id": 10373,
                 "name": "int8",
                 "nodeType": "ElementaryTypeName",
                 "src": "820:4:11",
@@ -8591,21 +8591,21 @@
           },
           {
             "constant": false,
-            "id": 9533,
+            "id": 10379,
             "name": "certificates",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "850:51:11",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
             },
             "typeName": {
-              "id": 9532,
+              "id": 10378,
               "keyType": {
-                "id": 9530,
+                "id": 10376,
                 "name": "uint256",
                 "nodeType": "ElementaryTypeName",
                 "src": "858:7:11",
@@ -8617,18 +8617,18 @@
               "nodeType": "Mapping",
               "src": "850:31:11",
               "typeDescriptions": {
-                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                 "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate)"
               },
               "valueType": {
                 "contractScope": null,
-                "id": 9531,
+                "id": 10377,
                 "name": "Certificate",
                 "nodeType": "UserDefinedTypeName",
-                "referencedDeclaration": 9506,
+                "referencedDeclaration": 10352,
                 "src": "869:11:11",
                 "typeDescriptions": {
-                  "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
+                  "typeIdentifier": "t_struct$_Certificate_$10352_storage_ptr",
                   "typeString": "struct ProfileRegistry.Certificate"
                 }
               }
@@ -8638,10 +8638,10 @@
           },
           {
             "constant": false,
-            "id": 9539,
+            "id": 10385,
             "name": "certificateValue",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "908:62:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -8650,9 +8650,9 @@
               "typeString": "mapping(address => mapping(uint256 => bytes))"
             },
             "typeName": {
-              "id": 9538,
+              "id": 10384,
               "keyType": {
-                "id": 9534,
+                "id": 10380,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "916:7:11",
@@ -8668,9 +8668,9 @@
                 "typeString": "mapping(address => mapping(uint256 => bytes))"
               },
               "valueType": {
-                "id": 9537,
+                "id": 10383,
                 "keyType": {
-                  "id": 9535,
+                  "id": 10381,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
                   "src": "935:7:11",
@@ -8686,7 +8686,7 @@
                   "typeString": "mapping(uint256 => bytes)"
                 },
                 "valueType": {
-                  "id": 9536,
+                  "id": 10382,
                   "name": "bytes",
                   "nodeType": "ElementaryTypeName",
                   "src": "946:5:11",
@@ -8702,10 +8702,10 @@
           },
           {
             "constant": false,
-            "id": 9545,
+            "id": 10391,
             "name": "certificateCount",
             "nodeType": "VariableDeclaration",
-            "scope": 10035,
+            "scope": 10881,
             "src": "977:61:11",
             "stateVariable": true,
             "storageLocation": "default",
@@ -8714,9 +8714,9 @@
               "typeString": "mapping(address => mapping(uint256 => uint256))"
             },
             "typeName": {
-              "id": 9544,
+              "id": 10390,
               "keyType": {
-                "id": 9540,
+                "id": 10386,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
                 "src": "985:7:11",
@@ -8732,9 +8732,9 @@
                 "typeString": "mapping(address => mapping(uint256 => uint256))"
               },
               "valueType": {
-                "id": 9543,
+                "id": 10389,
                 "keyType": {
-                  "id": 9541,
+                  "id": 10387,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
                   "src": "1004:7:11",
@@ -8750,7 +8750,7 @@
                   "typeString": "mapping(uint256 => uint256)"
                 },
                 "valueType": {
-                  "id": 9542,
+                  "id": 10388,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "1015:4:11",
@@ -8766,25 +8766,25 @@
           },
           {
             "body": {
-              "id": 9561,
+              "id": 10407,
               "nodeType": "Block",
               "src": "1066:73:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9551,
+                    "id": 10397,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 9548,
+                      "id": 10394,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "1076:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -8797,18 +8797,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 9549,
+                        "id": 10395,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "1084:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 9550,
+                      "id": 10396,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -8828,14 +8828,14 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 9552,
+                  "id": 10398,
                   "nodeType": "ExpressionStatement",
                   "src": "1076:18:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9559,
+                    "id": 10405,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -8844,34 +8844,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9553,
+                        "id": 10399,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1104:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9556,
+                      "id": 10402,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9554,
+                          "id": 10400,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
+                          "referencedDeclaration": 11599,
                           "src": "1115:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 9555,
+                        "id": 10401,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -8900,7 +8900,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 9558,
+                      "id": 10404,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -8912,7 +8912,7 @@
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9557,
+                        "id": 10403,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -8938,14 +8938,14 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9560,
+                  "id": 10406,
                   "nodeType": "ExpressionStatement",
                   "src": "1104:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9562,
+            "id": 10408,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -8953,19 +8953,19 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9546,
+              "id": 10392,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1056:2:11"
             },
             "payable": false,
             "returnParameters": {
-              "id": 9547,
+              "id": 10393,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1066:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1045:94:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -8973,7 +8973,7 @@
           },
           {
             "body": {
-              "id": 9601,
+              "id": 10447,
               "nodeType": "Block",
               "src": "1248:200:11",
               "statements": [
@@ -8987,18 +8987,18 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9578,
+                        "id": 10424,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 9576,
+                          "id": 10422,
                           "name": "_level",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9566,
+                          "referencedDeclaration": 10412,
                           "src": "1266:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_int8",
@@ -9010,7 +9010,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9577,
+                          "id": 10423,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -9039,21 +9039,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9575,
+                      "id": 10421,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1258:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9579,
+                    "id": 10425,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9067,7 +9067,7 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9580,
+                  "id": 10426,
                   "nodeType": "ExpressionStatement",
                   "src": "1258:19:11"
                 },
@@ -9081,7 +9081,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9586,
+                        "id": 10432,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9091,11 +9091,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9583,
+                              "id": 10429,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9564,
+                              "referencedDeclaration": 10410,
                               "src": "1313:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -9110,18 +9110,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9582,
+                            "id": 10428,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "1295:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9584,
+                          "id": 10430,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9140,7 +9140,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9585,
+                          "id": 10431,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -9169,21 +9169,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9581,
+                      "id": 10427,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1287:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9587,
+                    "id": 10433,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9197,14 +9197,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9588,
+                  "id": 10434,
                   "nodeType": "ExpressionStatement",
                   "src": "1287:43:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9593,
+                    "id": 10439,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9213,25 +9213,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9589,
+                        "id": 10435,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1340:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9591,
+                      "id": 10437,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9590,
+                        "id": 10436,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9564,
+                        "referencedDeclaration": 10410,
                         "src": "1351:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -9253,11 +9253,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 9592,
+                      "id": 10438,
                       "name": "_level",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9566,
+                      "referencedDeclaration": 10412,
                       "src": "1365:6:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_int8",
@@ -9270,7 +9270,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9594,
+                  "id": 10440,
                   "nodeType": "ExpressionStatement",
                   "src": "1340:31:11"
                 },
@@ -9280,11 +9280,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9596,
+                        "id": 10442,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9564,
+                        "referencedDeclaration": 10410,
                         "src": "1403:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -9299,18 +9299,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 9595,
+                      "id": 10441,
                       "name": "ValidatorCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9510,
+                      "referencedDeclaration": 10356,
                       "src": "1386:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 9597,
+                    "id": 10443,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9324,47 +9324,47 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9598,
+                  "id": 10444,
                   "nodeType": "EmitStatement",
                   "src": "1381:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9599,
+                    "id": 10445,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 9564,
+                    "referencedDeclaration": 10410,
                     "src": "1431:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 9574,
-                  "id": 9600,
+                  "functionReturnParameters": 10420,
+                  "id": 10446,
                   "nodeType": "Return",
                   "src": "1424:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9602,
+            "id": 10448,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9569,
+                "id": 10415,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9568,
+                  "id": 10414,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 9491,
+                  "referencedDeclaration": 10337,
                   "src": "1207:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -9376,14 +9376,14 @@
               },
               {
                 "arguments": null,
-                "id": 9571,
+                "id": 10417,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9570,
+                  "id": 10416,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1216:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -9397,15 +9397,15 @@
             "name": "AddValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9567,
+              "id": 10413,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9564,
+                  "id": 10410,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1167:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9414,7 +9414,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9563,
+                    "id": 10409,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1167:7:11",
@@ -9428,10 +9428,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9566,
+                  "id": 10412,
                   "name": "_level",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1187:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9440,7 +9440,7 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 9565,
+                    "id": 10411,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
                     "src": "1187:4:11",
@@ -9457,15 +9457,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9574,
+              "id": 10420,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9573,
+                  "id": 10419,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9602,
+                  "scope": 10448,
                   "src": "1239:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9474,7 +9474,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9572,
+                    "id": 10418,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1239:7:11",
@@ -9489,7 +9489,7 @@
               ],
               "src": "1238:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1145:303:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -9497,7 +9497,7 @@
           },
           {
             "body": {
-              "id": 9633,
+              "id": 10479,
               "nodeType": "Block",
               "src": "1547:165:11",
               "statements": [
@@ -9511,7 +9511,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 9618,
+                        "id": 10464,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -9521,11 +9521,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9615,
+                              "id": 10461,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9604,
+                              "referencedDeclaration": 10450,
                               "src": "1583:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -9540,18 +9540,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 9614,
+                            "id": 10460,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "1565:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 9616,
+                          "id": 10462,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -9570,7 +9570,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9617,
+                          "id": 10463,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -9599,21 +9599,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9613,
+                      "id": 10459,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "1557:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9619,
+                    "id": 10465,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9627,14 +9627,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9620,
+                  "id": 10466,
                   "nodeType": "ExpressionStatement",
                   "src": "1557:42:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9625,
+                    "id": 10471,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9643,25 +9643,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9621,
+                        "id": 10467,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "1609:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9623,
+                      "id": 10469,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9622,
+                        "id": 10468,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9604,
+                        "referencedDeclaration": 10450,
                         "src": "1620:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -9684,7 +9684,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9624,
+                      "id": 10470,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -9705,7 +9705,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 9626,
+                  "id": 10472,
                   "nodeType": "ExpressionStatement",
                   "src": "1609:26:11"
                 },
@@ -9715,11 +9715,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9628,
+                        "id": 10474,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9604,
+                        "referencedDeclaration": 10450,
                         "src": "1667:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -9734,18 +9734,18 @@
                           "typeString": "address"
                         }
                       ],
-                      "id": 9627,
+                      "id": 10473,
                       "name": "ValidatorDeleted",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9514,
+                      "referencedDeclaration": 10360,
                       "src": "1650:16:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
                         "typeString": "function (address)"
                       }
                     },
-                    "id": 9629,
+                    "id": 10475,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -9759,47 +9759,47 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9630,
+                  "id": 10476,
                   "nodeType": "EmitStatement",
                   "src": "1645:33:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9631,
+                    "id": 10477,
                     "name": "_validator",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 9604,
+                    "referencedDeclaration": 10450,
                     "src": "1695:10:11",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
                     }
                   },
-                  "functionReturnParameters": 9612,
-                  "id": 9632,
+                  "functionReturnParameters": 10458,
+                  "id": 10478,
                   "nodeType": "Return",
                   "src": "1688:17:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9634,
+            "id": 10480,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9607,
+                "id": 10453,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9606,
+                  "id": 10452,
                   "name": "onlySonm",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 9491,
+                  "referencedDeclaration": 10337,
                   "src": "1506:8:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -9811,14 +9811,14 @@
               },
               {
                 "arguments": null,
-                "id": 9609,
+                "id": 10455,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9608,
+                  "id": 10454,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1515:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -9832,15 +9832,15 @@
             "name": "RemoveValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9605,
+              "id": 10451,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9604,
+                  "id": 10450,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9634,
+                  "scope": 10480,
                   "src": "1479:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9849,7 +9849,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9603,
+                    "id": 10449,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1479:7:11",
@@ -9866,15 +9866,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9612,
+              "id": 10458,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9611,
+                  "id": 10457,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9634,
+                  "scope": 10480,
                   "src": "1538:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9883,7 +9883,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9610,
+                    "id": 10456,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1538:7:11",
@@ -9898,7 +9898,7 @@
               ],
               "src": "1537:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1454:258:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -9906,7 +9906,7 @@
           },
           {
             "body": {
-              "id": 9645,
+              "id": 10491,
               "nodeType": "Block",
               "src": "1792:46:11",
               "statements": [
@@ -9915,25 +9915,25 @@
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 9641,
+                      "id": 10487,
                       "name": "validators",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9529,
+                      "referencedDeclaration": 10375,
                       "src": "1809:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                         "typeString": "mapping(address => int8)"
                       }
                     },
-                    "id": 9643,
+                    "id": 10489,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9642,
+                      "id": 10488,
                       "name": "_validator",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9636,
+                      "referencedDeclaration": 10482,
                       "src": "1820:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -9951,15 +9951,15 @@
                       "typeString": "int8"
                     }
                   },
-                  "functionReturnParameters": 9640,
-                  "id": 9644,
+                  "functionReturnParameters": 10486,
+                  "id": 10490,
                   "nodeType": "Return",
                   "src": "1802:29:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9646,
+            "id": 10492,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -9967,15 +9967,15 @@
             "name": "GetValidatorLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9637,
+              "id": 10483,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9636,
+                  "id": 10482,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9646,
+                  "scope": 10492,
                   "src": "1745:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -9984,7 +9984,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9635,
+                    "id": 10481,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1745:7:11",
@@ -10001,15 +10001,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9640,
+              "id": 10486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9639,
+                  "id": 10485,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9646,
+                  "scope": 10492,
                   "src": "1786:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -10018,7 +10018,7 @@
                     "typeString": "int8"
                   },
                   "typeName": {
-                    "id": 9638,
+                    "id": 10484,
                     "name": "int8",
                     "nodeType": "ElementaryTypeName",
                     "src": "1786:4:11",
@@ -10033,7 +10033,7 @@
               ],
               "src": "1785:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1718:120:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -10041,7 +10041,7 @@
           },
           {
             "body": {
-              "id": 9778,
+              "id": 10624,
               "nodeType": "Block",
               "src": "1937:947:11",
               "statements": [
@@ -10052,18 +10052,18 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9659,
+                    "id": 10505,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 9657,
+                      "id": 10503,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9650,
+                      "referencedDeclaration": 10496,
                       "src": "1983:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -10075,7 +10075,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "31313030",
-                      "id": 9658,
+                      "id": 10504,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -10097,7 +10097,7 @@
                     }
                   },
                   "falseBody": {
-                    "id": 9687,
+                    "id": 10533,
                     "nodeType": "Block",
                     "src": "2143:54:11",
                     "statements": [
@@ -10111,18 +10111,18 @@
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
                               },
-                              "id": 9684,
+                              "id": 10530,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 9681,
+                                "id": 10527,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9648,
+                                "referencedDeclaration": 10494,
                                 "src": "2165:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -10135,18 +10135,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9682,
+                                  "id": 10528,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
+                                  "referencedDeclaration": 11599,
                                   "src": "2175:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 9683,
+                                "id": 10529,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10174,21 +10174,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 9680,
+                            "id": 10526,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
+                            "referencedDeclaration": 11602,
                             "src": "2157:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 9685,
+                          "id": 10531,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10202,31 +10202,31 @@
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 9686,
+                        "id": 10532,
                         "nodeType": "ExpressionStatement",
                         "src": "2157:29:11"
                       }
                     ]
                   },
-                  "id": 9688,
+                  "id": 10534,
                   "nodeType": "IfStatement",
                   "src": "1979:218:11",
                   "trueBody": {
-                    "id": 9679,
+                    "id": 10525,
                     "nodeType": "Block",
                     "src": "1998:139:11",
                     "statements": [
                       {
                         "assignments": [
-                          9661
+                          10507
                         ],
                         "declarations": [
                           {
                             "constant": false,
-                            "id": 9661,
+                            "id": 10507,
                             "name": "attributeLevel",
                             "nodeType": "VariableDeclaration",
-                            "scope": 9779,
+                            "scope": 10625,
                             "src": "2012:19:11",
                             "stateVariable": false,
                             "storageLocation": "default",
@@ -10235,7 +10235,7 @@
                               "typeString": "int8"
                             },
                             "typeName": {
-                              "id": 9660,
+                              "id": 10506,
                               "name": "int8",
                               "nodeType": "ElementaryTypeName",
                               "src": "2012:4:11",
@@ -10248,7 +10248,7 @@
                             "visibility": "internal"
                           }
                         ],
-                        "id": 9669,
+                        "id": 10515,
                         "initialValue": {
                           "argumentTypes": null,
                           "arguments": [
@@ -10258,7 +10258,7 @@
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               },
-                              "id": 9667,
+                              "id": 10513,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -10269,18 +10269,18 @@
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 },
-                                "id": 9665,
+                                "id": 10511,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "leftExpression": {
                                   "argumentTypes": null,
-                                  "id": 9663,
+                                  "id": 10509,
                                   "name": "_type",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9650,
+                                  "referencedDeclaration": 10496,
                                   "src": "2039:5:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_uint256",
@@ -10292,7 +10292,7 @@
                                 "rightExpression": {
                                   "argumentTypes": null,
                                   "hexValue": "313030",
-                                  "id": 9664,
+                                  "id": 10510,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": true,
@@ -10318,7 +10318,7 @@
                               "rightExpression": {
                                 "argumentTypes": null,
                                 "hexValue": "3130",
-                                "id": 9666,
+                                "id": 10512,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -10347,7 +10347,7 @@
                                 "typeString": "uint256"
                               }
                             ],
-                            "id": 9662,
+                            "id": 10508,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -10360,7 +10360,7 @@
                             },
                             "typeName": "int8"
                           },
-                          "id": 9668,
+                          "id": 10514,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10387,18 +10387,18 @@
                                 "typeIdentifier": "t_int8",
                                 "typeString": "int8"
                               },
-                              "id": 9676,
+                              "id": 10522,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "leftExpression": {
                                 "argumentTypes": null,
-                                "id": 9671,
+                                "id": 10517,
                                 "name": "attributeLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9661,
+                                "referencedDeclaration": 10507,
                                 "src": "2078:14:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_int8",
@@ -10414,18 +10414,18 @@
                                     "argumentTypes": null,
                                     "expression": {
                                       "argumentTypes": null,
-                                      "id": 9673,
+                                      "id": 10519,
                                       "name": "msg",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 11315,
+                                      "referencedDeclaration": 11599,
                                       "src": "2114:3:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_magic_message",
                                         "typeString": "msg"
                                       }
                                     },
-                                    "id": 9674,
+                                    "id": 10520,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10447,18 +10447,18 @@
                                       "typeString": "address"
                                     }
                                   ],
-                                  "id": 9672,
+                                  "id": 10518,
                                   "name": "GetValidatorLevel",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9646,
+                                  "referencedDeclaration": 10492,
                                   "src": "2096:17:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                     "typeString": "function (address) view returns (int8)"
                                   }
                                 },
-                                "id": 9675,
+                                "id": 10521,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -10486,21 +10486,21 @@
                                 "typeString": "bool"
                               }
                             ],
-                            "id": 9670,
+                            "id": 10516,
                             "name": "require",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [
-                              11318,
-                              11319
+                              11602,
+                              11603
                             ],
-                            "referencedDeclaration": 11318,
+                            "referencedDeclaration": 11602,
                             "src": "2070:7:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                               "typeString": "function (bool) pure"
                             }
                           },
-                          "id": 9677,
+                          "id": 10523,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10514,7 +10514,7 @@
                             "typeString": "tuple()"
                           }
                         },
-                        "id": 9678,
+                        "id": 10524,
                         "nodeType": "ExpressionStatement",
                         "src": "2070:56:11"
                       }
@@ -10531,7 +10531,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 9696,
+                        "id": 10542,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -10541,11 +10541,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9691,
+                              "id": 10537,
                               "name": "_value",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9652,
+                              "referencedDeclaration": 10498,
                               "src": "2254:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory_ptr",
@@ -10560,18 +10560,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 9690,
+                            "id": 10536,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "2244:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9692,
+                          "id": 10538,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10593,7 +10593,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 9694,
+                              "id": 10540,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -10616,18 +10616,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 9693,
+                            "id": 10539,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "2265:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9695,
+                          "id": 10541,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -10655,21 +10655,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9689,
+                      "id": 10535,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "2236:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9697,
+                    "id": 10543,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10683,21 +10683,21 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9698,
+                  "id": 10544,
                   "nodeType": "ExpressionStatement",
                   "src": "2236:43:11"
                 },
                 {
                   "assignments": [
-                    9700
+                    10546
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 9700,
+                      "id": 10546,
                       "name": "isMultiple",
                       "nodeType": "VariableDeclaration",
-                      "scope": 9779,
+                      "scope": 10625,
                       "src": "2290:15:11",
                       "stateVariable": false,
                       "storageLocation": "default",
@@ -10706,7 +10706,7 @@
                         "typeString": "bool"
                       },
                       "typeName": {
-                        "id": 9699,
+                        "id": 10545,
                         "name": "bool",
                         "nodeType": "ElementaryTypeName",
                         "src": "2290:4:11",
@@ -10719,14 +10719,14 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 9706,
+                  "id": 10552,
                   "initialValue": {
                     "argumentTypes": null,
                     "commonType": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9705,
+                    "id": 10551,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10737,18 +10737,18 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9703,
+                      "id": 10549,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 9701,
+                        "id": 10547,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9650,
+                        "referencedDeclaration": 10496,
                         "src": "2308:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -10760,7 +10760,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31303030",
-                        "id": 9702,
+                        "id": 10548,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -10786,7 +10786,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "32",
-                      "id": 9704,
+                      "id": 10550,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -10813,7 +10813,7 @@
                 {
                   "condition": {
                     "argumentTypes": null,
-                    "id": 9708,
+                    "id": 10554,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -10824,11 +10824,11 @@
                     "src": "2339:11:11",
                     "subExpression": {
                       "argumentTypes": null,
-                      "id": 9707,
+                      "id": 10553,
                       "name": "isMultiple",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9700,
+                      "referencedDeclaration": 10546,
                       "src": "2340:10:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bool",
@@ -10841,11 +10841,11 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 9741,
+                  "id": 10587,
                   "nodeType": "IfStatement",
                   "src": "2335:268:11",
                   "trueBody": {
-                    "id": 9740,
+                    "id": 10586,
                     "nodeType": "Block",
                     "src": "2352:251:11",
                     "statements": [
@@ -10856,7 +10856,7 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 9715,
+                          "id": 10561,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -10867,25 +10867,25 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 9709,
+                                "id": 10555,
                                 "name": "certificateCount",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9545,
+                                "referencedDeclaration": 10391,
                                 "src": "2370:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => uint256))"
                                 }
                               },
-                              "id": 9711,
+                              "id": 10557,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 9710,
+                                "id": 10556,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9648,
+                                "referencedDeclaration": 10494,
                                 "src": "2387:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -10903,14 +10903,14 @@
                                 "typeString": "mapping(uint256 => uint256)"
                               }
                             },
-                            "id": 9713,
+                            "id": 10559,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 9712,
+                              "id": 10558,
                               "name": "_type",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9650,
+                              "referencedDeclaration": 10496,
                               "src": "2395:5:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -10933,7 +10933,7 @@
                           "rightExpression": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 9714,
+                            "id": 10560,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -10955,7 +10955,7 @@
                           }
                         },
                         "falseBody": {
-                          "id": 9738,
+                          "id": 10584,
                           "nodeType": "Block",
                           "src": "2487:106:11",
                           "statements": [
@@ -10969,7 +10969,7 @@
                                       "typeIdentifier": "t_bytes32",
                                       "typeString": "bytes32"
                                     },
-                                    "id": 9735,
+                                    "id": 10581,
                                     "isConstant": false,
                                     "isLValue": false,
                                     "isPure": false,
@@ -10982,11 +10982,11 @@
                                           "arguments": [
                                             {
                                               "argumentTypes": null,
-                                              "id": 9728,
+                                              "id": 10574,
                                               "name": "_owner",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 9648,
+                                              "referencedDeclaration": 10494,
                                               "src": "2541:6:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_address",
@@ -10995,11 +10995,11 @@
                                             },
                                             {
                                               "argumentTypes": null,
-                                              "id": 9729,
+                                              "id": 10575,
                                               "name": "_type",
                                               "nodeType": "Identifier",
                                               "overloadedDeclarations": [],
-                                              "referencedDeclaration": 9650,
+                                              "referencedDeclaration": 10496,
                                               "src": "2549:5:11",
                                               "typeDescriptions": {
                                                 "typeIdentifier": "t_uint256",
@@ -11018,18 +11018,18 @@
                                                 "typeString": "uint256"
                                               }
                                             ],
-                                            "id": 9727,
+                                            "id": 10573,
                                             "name": "GetAttributeValue",
                                             "nodeType": "Identifier",
                                             "overloadedDeclarations": [],
-                                            "referencedDeclaration": 9924,
+                                            "referencedDeclaration": 10770,
                                             "src": "2523:17:11",
                                             "typeDescriptions": {
                                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                               "typeString": "function (address,uint256) view returns (bytes memory)"
                                             }
                                           },
-                                          "id": 9730,
+                                          "id": 10576,
                                           "isConstant": false,
                                           "isLValue": false,
                                           "isPure": false,
@@ -11051,18 +11051,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 9726,
+                                        "id": 10572,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11309,
+                                        "referencedDeclaration": 11593,
                                         "src": "2513:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 9731,
+                                      "id": 10577,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -11083,11 +11083,11 @@
                                       "arguments": [
                                         {
                                           "argumentTypes": null,
-                                          "id": 9733,
+                                          "id": 10579,
                                           "name": "_value",
                                           "nodeType": "Identifier",
                                           "overloadedDeclarations": [],
-                                          "referencedDeclaration": 9652,
+                                          "referencedDeclaration": 10498,
                                           "src": "2570:6:11",
                                           "typeDescriptions": {
                                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -11102,18 +11102,18 @@
                                             "typeString": "bytes memory"
                                           }
                                         ],
-                                        "id": 9732,
+                                        "id": 10578,
                                         "name": "keccak256",
                                         "nodeType": "Identifier",
                                         "overloadedDeclarations": [],
-                                        "referencedDeclaration": 11309,
+                                        "referencedDeclaration": 11593,
                                         "src": "2560:9:11",
                                         "typeDescriptions": {
                                           "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                                           "typeString": "function () pure returns (bytes32)"
                                         }
                                       },
-                                      "id": 9734,
+                                      "id": 10580,
                                       "isConstant": false,
                                       "isLValue": false,
                                       "isPure": false,
@@ -11141,21 +11141,21 @@
                                       "typeString": "bool"
                                     }
                                   ],
-                                  "id": 9725,
+                                  "id": 10571,
                                   "name": "require",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [
-                                    11318,
-                                    11319
+                                    11602,
+                                    11603
                                   ],
-                                  "referencedDeclaration": 11318,
+                                  "referencedDeclaration": 11602,
                                   "src": "2505:7:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                                     "typeString": "function (bool) pure"
                                   }
                                 },
-                                "id": 9736,
+                                "id": 10582,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11169,24 +11169,24 @@
                                   "typeString": "tuple()"
                                 }
                               },
-                              "id": 9737,
+                              "id": 10583,
                               "nodeType": "ExpressionStatement",
                               "src": "2505:73:11"
                             }
                           ]
                         },
-                        "id": 9739,
+                        "id": 10585,
                         "nodeType": "IfStatement",
                         "src": "2366:227:11",
                         "trueBody": {
-                          "id": 9724,
+                          "id": 10570,
                           "nodeType": "Block",
                           "src": "2408:73:11",
                           "statements": [
                             {
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9722,
+                                "id": 10568,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -11197,25 +11197,25 @@
                                     "argumentTypes": null,
                                     "baseExpression": {
                                       "argumentTypes": null,
-                                      "id": 9716,
+                                      "id": 10562,
                                       "name": "certificateValue",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 9539,
+                                      "referencedDeclaration": 10385,
                                       "src": "2426:16:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                         "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                       }
                                     },
-                                    "id": 9719,
+                                    "id": 10565,
                                     "indexExpression": {
                                       "argumentTypes": null,
-                                      "id": 9717,
+                                      "id": 10563,
                                       "name": "_owner",
                                       "nodeType": "Identifier",
                                       "overloadedDeclarations": [],
-                                      "referencedDeclaration": 9648,
+                                      "referencedDeclaration": 10494,
                                       "src": "2443:6:11",
                                       "typeDescriptions": {
                                         "typeIdentifier": "t_address",
@@ -11233,14 +11233,14 @@
                                       "typeString": "mapping(uint256 => bytes storage ref)"
                                     }
                                   },
-                                  "id": 9720,
+                                  "id": 10566,
                                   "indexExpression": {
                                     "argumentTypes": null,
-                                    "id": 9718,
+                                    "id": 10564,
                                     "name": "_type",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 9650,
+                                    "referencedDeclaration": 10496,
                                     "src": "2451:5:11",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_uint256",
@@ -11262,11 +11262,11 @@
                                 "operator": "=",
                                 "rightHandSide": {
                                   "argumentTypes": null,
-                                  "id": 9721,
+                                  "id": 10567,
                                   "name": "_value",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9652,
+                                  "referencedDeclaration": 10498,
                                   "src": "2460:6:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_bytes_memory_ptr",
@@ -11279,7 +11279,7 @@
                                   "typeString": "bytes storage ref"
                                 }
                               },
-                              "id": 9723,
+                              "id": 10569,
                               "nodeType": "ExpressionStatement",
                               "src": "2426:40:11"
                             }
@@ -11292,7 +11292,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9754,
+                    "id": 10600,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11303,25 +11303,25 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9742,
+                          "id": 10588,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "2613:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9745,
+                        "id": 10591,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9743,
+                          "id": 10589,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9648,
+                          "referencedDeclaration": 10494,
                           "src": "2630:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -11339,14 +11339,14 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9746,
+                      "id": 10592,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9744,
+                        "id": 10590,
                         "name": "_type",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9650,
+                        "referencedDeclaration": 10496,
                         "src": "2638:5:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -11372,7 +11372,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9753,
+                      "id": 10599,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11383,25 +11383,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9747,
+                            "id": 10593,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9545,
+                            "referencedDeclaration": 10391,
                             "src": "2647:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 9749,
+                          "id": 10595,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9748,
+                            "id": 10594,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9648,
+                            "referencedDeclaration": 10494,
                             "src": "2664:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -11419,14 +11419,14 @@
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 9751,
+                        "id": 10597,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9750,
+                          "id": 10596,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9650,
+                          "referencedDeclaration": 10496,
                           "src": "2672:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -11449,7 +11449,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9752,
+                        "id": 10598,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -11476,25 +11476,25 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9755,
+                  "id": 10601,
                   "nodeType": "ExpressionStatement",
                   "src": "2613:69:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9760,
+                    "id": 10606,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 9756,
+                      "id": 10602,
                       "name": "certificatesCount",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9525,
+                      "referencedDeclaration": 10371,
                       "src": "2693:17:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -11509,18 +11509,18 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9759,
+                      "id": 10605,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 9757,
+                        "id": 10603,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2713:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -11532,7 +11532,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9758,
+                        "id": 10604,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -11559,14 +11559,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9761,
+                  "id": 10607,
                   "nodeType": "ExpressionStatement",
                   "src": "2693:41:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9772,
+                    "id": 10618,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11575,25 +11575,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9762,
+                        "id": 10608,
                         "name": "certificates",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9533,
+                        "referencedDeclaration": 10379,
                         "src": "2744:12:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                          "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                           "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                         }
                       },
-                      "id": 9764,
+                      "id": 10610,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9763,
+                        "id": 10609,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2757:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -11607,7 +11607,7 @@
                       "nodeType": "IndexAccess",
                       "src": "2744:31:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                         "typeString": "struct ProfileRegistry.Certificate storage ref"
                       }
                     },
@@ -11620,18 +11620,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9766,
+                            "id": 10612,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
+                            "referencedDeclaration": 11599,
                             "src": "2790:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 9767,
+                          "id": 10613,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -11647,11 +11647,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9768,
+                          "id": 10614,
                           "name": "_owner",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9648,
+                          "referencedDeclaration": 10494,
                           "src": "2802:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -11660,11 +11660,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9769,
+                          "id": 10615,
                           "name": "_type",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9650,
+                          "referencedDeclaration": 10496,
                           "src": "2810:5:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -11673,11 +11673,11 @@
                         },
                         {
                           "argumentTypes": null,
-                          "id": 9770,
+                          "id": 10616,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9652,
+                          "referencedDeclaration": 10498,
                           "src": "2817:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_bytes_memory_ptr",
@@ -11704,18 +11704,18 @@
                             "typeString": "bytes memory"
                           }
                         ],
-                        "id": 9765,
+                        "id": 10611,
                         "name": "Certificate",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9506,
+                        "referencedDeclaration": 10352,
                         "src": "2778:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_type$_t_struct$_Certificate_$9506_storage_ptr_$",
+                          "typeIdentifier": "t_type$_t_struct$_Certificate_$10352_storage_ptr_$",
                           "typeString": "type(struct ProfileRegistry.Certificate storage pointer)"
                         }
                       },
-                      "id": 9771,
+                      "id": 10617,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -11725,17 +11725,17 @@
                       "nodeType": "FunctionCall",
                       "src": "2778:46:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_memory",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_memory",
                         "typeString": "struct ProfileRegistry.Certificate memory"
                       }
                     },
                     "src": "2744:80:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
-                  "id": 9773,
+                  "id": 10619,
                   "nodeType": "ExpressionStatement",
                   "src": "2744:80:11"
                 },
@@ -11745,11 +11745,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9775,
+                        "id": 10621,
                         "name": "certificatesCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9525,
+                        "referencedDeclaration": 10371,
                         "src": "2859:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -11764,18 +11764,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 9774,
+                      "id": 10620,
                       "name": "CertificateCreated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9518,
+                      "referencedDeclaration": 10364,
                       "src": "2840:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 9776,
+                    "id": 10622,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -11789,28 +11789,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9777,
+                  "id": 10623,
                   "nodeType": "EmitStatement",
                   "src": "2835:42:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9779,
+            "id": 10625,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9655,
+                "id": 10501,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9654,
+                  "id": 10500,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "1923:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -11824,15 +11824,15 @@
             "name": "CreateCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9653,
+              "id": 10499,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9648,
+                  "id": 10494,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1871:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -11841,7 +11841,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9647,
+                    "id": 10493,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "1871:7:11",
@@ -11855,10 +11855,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9650,
+                  "id": 10496,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1887:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -11867,7 +11867,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9649,
+                    "id": 10495,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "1887:7:11",
@@ -11881,10 +11881,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9652,
+                  "id": 10498,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9779,
+                  "scope": 10625,
                   "src": "1902:12:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -11893,7 +11893,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9651,
+                    "id": 10497,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "1902:5:11",
@@ -11910,12 +11910,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9656,
+              "id": 10502,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "1937:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "1844:1040:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -11923,37 +11923,37 @@
           },
           {
             "body": {
-              "id": 9875,
+              "id": 10721,
               "nodeType": "Block",
               "src": "2951:536:11",
               "statements": [
                 {
                   "assignments": [
-                    9787
+                    10633
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 9787,
+                      "id": 10633,
                       "name": "crt",
                       "nodeType": "VariableDeclaration",
-                      "scope": 9876,
+                      "scope": 10722,
                       "src": "2961:22:11",
                       "stateVariable": false,
                       "storageLocation": "memory",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                        "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                         "typeString": "struct ProfileRegistry.Certificate"
                       },
                       "typeName": {
                         "contractScope": null,
-                        "id": 9786,
+                        "id": 10632,
                         "name": "Certificate",
                         "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 9506,
+                        "referencedDeclaration": 10352,
                         "src": "2961:11:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$9506_storage_ptr",
+                          "typeIdentifier": "t_struct$_Certificate_$10352_storage_ptr",
                           "typeString": "struct ProfileRegistry.Certificate"
                         }
                       },
@@ -11961,30 +11961,30 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 9791,
+                  "id": 10637,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
-                      "id": 9788,
+                      "id": 10634,
                       "name": "certificates",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9533,
+                      "referencedDeclaration": 10379,
                       "src": "2986:12:11",
                       "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                        "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                         "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                       }
                     },
-                    "id": 9790,
+                    "id": 10636,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9789,
+                      "id": 10635,
                       "name": "_id",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9781,
+                      "referencedDeclaration": 10627,
                       "src": "2999:3:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -11998,7 +11998,7 @@
                     "nodeType": "IndexAccess",
                     "src": "2986:17:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                      "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                       "typeString": "struct ProfileRegistry.Certificate storage ref"
                     }
                   },
@@ -12015,7 +12015,7 @@
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
                         },
-                        "id": 9811,
+                        "id": 10657,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12026,7 +12026,7 @@
                             "typeIdentifier": "t_bool",
                             "typeString": "bool"
                           },
-                          "id": 9803,
+                          "id": 10649,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12037,7 +12037,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 9797,
+                            "id": 10643,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12046,25 +12046,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9793,
+                                "id": 10639,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3022:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9794,
+                              "id": 10640,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "to",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9501,
+                              "referencedDeclaration": 10347,
                               "src": "3022:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -12077,18 +12077,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9795,
+                                "id": 10641,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "3032:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9796,
+                              "id": 10642,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12116,7 +12116,7 @@
                               "typeIdentifier": "t_address",
                               "typeString": "address"
                             },
-                            "id": 9802,
+                            "id": 10648,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12125,25 +12125,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9798,
+                                "id": 10644,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3046:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9799,
+                              "id": 10645,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "from",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9499,
+                              "referencedDeclaration": 10345,
                               "src": "3046:8:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -12156,18 +12156,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9800,
+                                "id": 10646,
                                 "name": "msg",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11315,
+                                "referencedDeclaration": 11599,
                                 "src": "3058:3:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_magic_message",
                                   "typeString": "msg"
                                 }
                               },
-                              "id": 9801,
+                              "id": 10647,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
@@ -12201,7 +12201,7 @@
                             "typeIdentifier": "t_int8",
                             "typeString": "int8"
                           },
-                          "id": 9810,
+                          "id": 10656,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12213,18 +12213,18 @@
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9805,
+                                  "id": 10651,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
+                                  "referencedDeclaration": 11599,
                                   "src": "3090:3:11",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 9806,
+                                "id": 10652,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -12246,18 +12246,18 @@
                                   "typeString": "address"
                                 }
                               ],
-                              "id": 9804,
+                              "id": 10650,
                               "name": "GetValidatorLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9646,
+                              "referencedDeclaration": 10492,
                               "src": "3072:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                                 "typeString": "function (address) view returns (int8)"
                               }
                             },
-                            "id": 9807,
+                            "id": 10653,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -12275,7 +12275,7 @@
                           "operator": "==",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 9809,
+                            "id": 10655,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -12287,7 +12287,7 @@
                             "subExpression": {
                               "argumentTypes": null,
                               "hexValue": "31",
-                              "id": 9808,
+                              "id": 10654,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -12327,21 +12327,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9792,
+                      "id": 10638,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "3014:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9812,
+                    "id": 10658,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12355,7 +12355,7 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9813,
+                  "id": 10659,
                   "nodeType": "ExpressionStatement",
                   "src": "3014:94:11"
                 },
@@ -12369,7 +12369,7 @@
                           "typeIdentifier": "t_bytes32",
                           "typeString": "bytes32"
                         },
-                        "id": 9822,
+                        "id": 10668,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -12381,25 +12381,25 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9816,
+                                "id": 10662,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3136:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9817,
+                              "id": 10663,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "value",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9505,
+                              "referencedDeclaration": 10351,
                               "src": "3136:9:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_bytes_memory",
@@ -12414,18 +12414,18 @@
                                 "typeString": "bytes memory"
                               }
                             ],
-                            "id": 9815,
+                            "id": 10661,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "3126:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9818,
+                          "id": 10664,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12447,7 +12447,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "",
-                              "id": 9820,
+                              "id": 10666,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -12470,18 +12470,18 @@
                                 "typeString": "literal_string \"\""
                               }
                             ],
-                            "id": 9819,
+                            "id": 10665,
                             "name": "keccak256",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11309,
+                            "referencedDeclaration": 11593,
                             "src": "3150:9:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
                               "typeString": "function () pure returns (bytes32)"
                             }
                           },
-                          "id": 9821,
+                          "id": 10667,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -12509,21 +12509,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 9814,
+                      "id": 10660,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "3118:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 9823,
+                    "id": 10669,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12537,14 +12537,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9824,
+                  "id": 10670,
                   "nodeType": "ExpressionStatement",
                   "src": "3118:46:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9841,
+                    "id": 10687,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12555,41 +12555,41 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9825,
+                          "id": 10671,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "3175:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9830,
+                        "id": 10676,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9826,
+                            "id": 10672,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3192:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9827,
+                          "id": 10673,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9501,
+                          "referencedDeclaration": 10347,
                           "src": "3192:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -12607,30 +12607,30 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9831,
+                      "id": 10677,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9828,
+                          "id": 10674,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9787,
+                          "referencedDeclaration": 10633,
                           "src": "3200:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 9829,
+                        "id": 10675,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3200:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -12656,7 +12656,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9840,
+                      "id": 10686,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -12667,41 +12667,41 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9832,
+                            "id": 10678,
                             "name": "certificateCount",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9545,
+                            "referencedDeclaration": 10391,
                             "src": "3221:16:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(uint256 => uint256))"
                             }
                           },
-                          "id": 9835,
+                          "id": 10681,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 9833,
+                              "id": 10679,
                               "name": "crt",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9787,
+                              "referencedDeclaration": 10633,
                               "src": "3238:3:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                 "typeString": "struct ProfileRegistry.Certificate memory"
                               }
                             },
-                            "id": 9834,
+                            "id": 10680,
                             "isConstant": false,
                             "isLValue": true,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "to",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 9501,
+                            "referencedDeclaration": 10347,
                             "src": "3238:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -12719,30 +12719,30 @@
                             "typeString": "mapping(uint256 => uint256)"
                           }
                         },
-                        "id": 9838,
+                        "id": 10684,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9836,
+                            "id": 10682,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3246:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9837,
+                          "id": 10683,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "attributeType",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9503,
+                          "referencedDeclaration": 10349,
                           "src": "3246:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -12765,7 +12765,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 9839,
+                        "id": 10685,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -12792,7 +12792,7 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 9842,
+                  "id": 10688,
                   "nodeType": "ExpressionStatement",
                   "src": "3175:93:11"
                 },
@@ -12803,7 +12803,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9851,
+                    "id": 10697,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -12814,41 +12814,41 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9843,
+                          "id": 10689,
                           "name": "certificateCount",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9545,
+                          "referencedDeclaration": 10391,
                           "src": "3282:16:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(uint256 => uint256))"
                           }
                         },
-                        "id": 9846,
+                        "id": 10692,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9844,
+                            "id": 10690,
                             "name": "crt",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9787,
+                            "referencedDeclaration": 10633,
                             "src": "3299:3:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                              "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                               "typeString": "struct ProfileRegistry.Certificate memory"
                             }
                           },
-                          "id": 9845,
+                          "id": 10691,
                           "isConstant": false,
                           "isLValue": true,
                           "isPure": false,
                           "lValueRequested": false,
                           "memberName": "to",
                           "nodeType": "MemberAccess",
-                          "referencedDeclaration": 9501,
+                          "referencedDeclaration": 10347,
                           "src": "3299:6:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
@@ -12866,30 +12866,30 @@
                           "typeString": "mapping(uint256 => uint256)"
                         }
                       },
-                      "id": 9849,
+                      "id": 10695,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9847,
+                          "id": 10693,
                           "name": "crt",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9787,
+                          "referencedDeclaration": 10633,
                           "src": "3307:3:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                             "typeString": "struct ProfileRegistry.Certificate memory"
                           }
                         },
-                        "id": 9848,
+                        "id": 10694,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3307:17:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -12912,7 +12912,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9850,
+                      "id": 10696,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -12934,18 +12934,18 @@
                     }
                   },
                   "falseBody": null,
-                  "id": 9863,
+                  "id": 10709,
                   "nodeType": "IfStatement",
                   "src": "3278:127:11",
                   "trueBody": {
-                    "id": 9862,
+                    "id": 10708,
                     "nodeType": "Block",
                     "src": "3332:73:11",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 9860,
+                          "id": 10706,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -12956,41 +12956,41 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 9852,
+                                "id": 10698,
                                 "name": "certificateValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9539,
+                                "referencedDeclaration": 10385,
                                 "src": "3346:16:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                                   "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                                 }
                               },
-                              "id": 9857,
+                              "id": 10703,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 9853,
+                                  "id": 10699,
                                   "name": "crt",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 9787,
+                                  "referencedDeclaration": 10633,
                                   "src": "3363:3:11",
                                   "typeDescriptions": {
-                                    "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                    "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                     "typeString": "struct ProfileRegistry.Certificate memory"
                                   }
                                 },
-                                "id": 9854,
+                                "id": 10700,
                                 "isConstant": false,
                                 "isLValue": true,
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "memberName": "to",
                                 "nodeType": "MemberAccess",
-                                "referencedDeclaration": 9501,
+                                "referencedDeclaration": 10347,
                                 "src": "3363:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -13008,30 +13008,30 @@
                                 "typeString": "mapping(uint256 => bytes storage ref)"
                               }
                             },
-                            "id": 9858,
+                            "id": 10704,
                             "indexExpression": {
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9855,
+                                "id": 10701,
                                 "name": "crt",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9787,
+                                "referencedDeclaration": 10633,
                                 "src": "3371:3:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_struct$_Certificate_$9506_memory_ptr",
+                                  "typeIdentifier": "t_struct$_Certificate_$10352_memory_ptr",
                                   "typeString": "struct ProfileRegistry.Certificate memory"
                                 }
                               },
-                              "id": 9856,
+                              "id": 10702,
                               "isConstant": false,
                               "isLValue": true,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "attributeType",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 9503,
+                              "referencedDeclaration": 10349,
                               "src": "3371:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
@@ -13054,7 +13054,7 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "",
-                            "id": 9859,
+                            "id": 10705,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -13075,7 +13075,7 @@
                             "typeString": "bytes storage ref"
                           }
                         },
-                        "id": 9861,
+                        "id": 10707,
                         "nodeType": "ExpressionStatement",
                         "src": "3346:48:11"
                       }
@@ -13085,7 +13085,7 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 9869,
+                    "id": 10715,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13096,25 +13096,25 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 9864,
+                          "id": 10710,
                           "name": "certificates",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9533,
+                          "referencedDeclaration": 10379,
                           "src": "3414:12:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                            "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                             "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                           }
                         },
-                        "id": 9866,
+                        "id": 10712,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 9865,
+                          "id": 10711,
                           "name": "_id",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9781,
+                          "referencedDeclaration": 10627,
                           "src": "3427:3:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
@@ -13128,18 +13128,18 @@
                         "nodeType": "IndexAccess",
                         "src": "3414:17:11",
                         "typeDescriptions": {
-                          "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                          "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                           "typeString": "struct ProfileRegistry.Certificate storage ref"
                         }
                       },
-                      "id": 9867,
+                      "id": 10713,
                       "isConstant": false,
                       "isLValue": true,
                       "isPure": false,
                       "lValueRequested": true,
                       "memberName": "value",
                       "nodeType": "MemberAccess",
-                      "referencedDeclaration": 9505,
+                      "referencedDeclaration": 10351,
                       "src": "3414:23:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_bytes_storage",
@@ -13151,7 +13151,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "",
-                      "id": 9868,
+                      "id": 10714,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -13172,7 +13172,7 @@
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "id": 9870,
+                  "id": 10716,
                   "nodeType": "ExpressionStatement",
                   "src": "3414:28:11"
                 },
@@ -13182,11 +13182,11 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 9872,
+                        "id": 10718,
                         "name": "_id",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9781,
+                        "referencedDeclaration": 10627,
                         "src": "3476:3:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -13201,18 +13201,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 9871,
+                      "id": 10717,
                       "name": "CertificateUpdated",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9522,
+                      "referencedDeclaration": 10368,
                       "src": "3457:18:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_uint256_$returns$__$",
                         "typeString": "function (uint256)"
                       }
                     },
-                    "id": 9873,
+                    "id": 10719,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -13226,28 +13226,28 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 9874,
+                  "id": 10720,
                   "nodeType": "EmitStatement",
                   "src": "3452:28:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9876,
+            "id": 10722,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9784,
+                "id": 10630,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9783,
+                  "id": 10629,
                   "name": "whenNotPaused",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10663,
+                  "referencedDeclaration": 10947,
                   "src": "2937:13:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -13261,15 +13261,15 @@
             "name": "RemoveCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9782,
+              "id": 10628,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9781,
+                  "id": 10627,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9876,
+                  "scope": 10722,
                   "src": "2917:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13278,7 +13278,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9780,
+                    "id": 10626,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "2917:7:11",
@@ -13295,12 +13295,12 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9785,
+              "id": 10631,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "2951:0:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "2890:597:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -13308,7 +13308,7 @@
           },
           {
             "body": {
-              "id": 9907,
+              "id": 10753,
               "nodeType": "Block",
               "src": "3585:128:11",
               "statements": [
@@ -13322,25 +13322,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9889,
+                            "id": 10735,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3603:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9891,
+                          "id": 10737,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9890,
+                            "id": 10736,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3616:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -13354,18 +13354,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3603:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9892,
+                        "id": 10738,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "from",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9499,
+                        "referencedDeclaration": 10345,
                         "src": "3603:22:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -13378,25 +13378,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9893,
+                            "id": 10739,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3627:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9895,
+                          "id": 10741,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9894,
+                            "id": 10740,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3640:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -13410,18 +13410,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3627:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9896,
+                        "id": 10742,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "to",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9501,
+                        "referencedDeclaration": 10347,
                         "src": "3627:20:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -13434,25 +13434,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9897,
+                            "id": 10743,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3649:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9899,
+                          "id": 10745,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9898,
+                            "id": 10744,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3662:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -13466,18 +13466,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3649:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9900,
+                        "id": 10746,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "attributeType",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9503,
+                        "referencedDeclaration": 10349,
                         "src": "3649:31:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
@@ -13490,25 +13490,25 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 9901,
+                            "id": 10747,
                             "name": "certificates",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9533,
+                            "referencedDeclaration": 10379,
                             "src": "3682:12:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$9506_storage_$",
+                              "typeIdentifier": "t_mapping$_t_uint256_$_t_struct$_Certificate_$10352_storage_$",
                               "typeString": "mapping(uint256 => struct ProfileRegistry.Certificate storage ref)"
                             }
                           },
-                          "id": 9903,
+                          "id": 10749,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 9902,
+                            "id": 10748,
                             "name": "_id",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9878,
+                            "referencedDeclaration": 10724,
                             "src": "3695:3:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
@@ -13522,18 +13522,18 @@
                           "nodeType": "IndexAccess",
                           "src": "3682:17:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_struct$_Certificate_$9506_storage",
+                            "typeIdentifier": "t_struct$_Certificate_$10352_storage",
                             "typeString": "struct ProfileRegistry.Certificate storage ref"
                           }
                         },
-                        "id": 9904,
+                        "id": 10750,
                         "isConstant": false,
                         "isLValue": true,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "value",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 9505,
+                        "referencedDeclaration": 10351,
                         "src": "3682:23:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bytes_storage",
@@ -13541,7 +13541,7 @@
                         }
                       }
                     ],
-                    "id": 9905,
+                    "id": 10751,
                     "isConstant": false,
                     "isInlineArray": false,
                     "isLValue": false,
@@ -13554,15 +13554,15 @@
                       "typeString": "tuple(address,address,uint256,bytes storage ref)"
                     }
                   },
-                  "functionReturnParameters": 9888,
-                  "id": 9906,
+                  "functionReturnParameters": 10734,
+                  "id": 10752,
                   "nodeType": "Return",
                   "src": "3595:111:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9908,
+            "id": 10754,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13570,15 +13570,15 @@
             "name": "GetCertificate",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9879,
+              "id": 10725,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9878,
+                  "id": 10724,
                   "name": "_id",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3517:11:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13587,7 +13587,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9877,
+                    "id": 10723,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3517:7:11",
@@ -13604,15 +13604,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9888,
+              "id": 10734,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9881,
+                  "id": 10727,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3551:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13621,7 +13621,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9880,
+                    "id": 10726,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3551:7:11",
@@ -13635,10 +13635,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9883,
+                  "id": 10729,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3560:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13647,7 +13647,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9882,
+                    "id": 10728,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3560:7:11",
@@ -13661,10 +13661,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9885,
+                  "id": 10731,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3569:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13673,7 +13673,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9884,
+                    "id": 10730,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3569:7:11",
@@ -13687,10 +13687,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9887,
+                  "id": 10733,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9908,
+                  "scope": 10754,
                   "src": "3578:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13699,7 +13699,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9886,
+                    "id": 10732,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "3578:5:11",
@@ -13714,7 +13714,7 @@
               ],
               "src": "3550:34:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3493:220:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -13722,7 +13722,7 @@
           },
           {
             "body": {
-              "id": 9923,
+              "id": 10769,
               "nodeType": "Block",
               "src": "3805:55:11",
               "statements": [
@@ -13733,25 +13733,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9917,
+                        "id": 10763,
                         "name": "certificateValue",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9539,
+                        "referencedDeclaration": 10385,
                         "src": "3822:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_bytes_storage_$_$",
                           "typeString": "mapping(address => mapping(uint256 => bytes storage ref))"
                         }
                       },
-                      "id": 9919,
+                      "id": 10765,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9918,
+                        "id": 10764,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9910,
+                        "referencedDeclaration": 10756,
                         "src": "3839:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -13769,14 +13769,14 @@
                         "typeString": "mapping(uint256 => bytes storage ref)"
                       }
                     },
-                    "id": 9921,
+                    "id": 10767,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9920,
+                      "id": 10766,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9912,
+                      "referencedDeclaration": 10758,
                       "src": "3847:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -13794,15 +13794,15 @@
                       "typeString": "bytes storage ref"
                     }
                   },
-                  "functionReturnParameters": 9916,
-                  "id": 9922,
+                  "functionReturnParameters": 10762,
+                  "id": 10768,
                   "nodeType": "Return",
                   "src": "3815:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9924,
+            "id": 10770,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13810,15 +13810,15 @@
             "name": "GetAttributeValue",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9913,
+              "id": 10759,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9910,
+                  "id": 10756,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3746:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13827,7 +13827,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9909,
+                    "id": 10755,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3746:7:11",
@@ -13841,10 +13841,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9912,
+                  "id": 10758,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3762:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13853,7 +13853,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9911,
+                    "id": 10757,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3762:7:11",
@@ -13870,15 +13870,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9916,
+              "id": 10762,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9915,
+                  "id": 10761,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9924,
+                  "scope": 10770,
                   "src": "3798:5:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -13887,7 +13887,7 @@
                     "typeString": "bytes"
                   },
                   "typeName": {
-                    "id": 9914,
+                    "id": 10760,
                     "name": "bytes",
                     "nodeType": "ElementaryTypeName",
                     "src": "3798:5:11",
@@ -13902,7 +13902,7 @@
               ],
               "src": "3797:7:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3719:141:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -13910,7 +13910,7 @@
           },
           {
             "body": {
-              "id": 9939,
+              "id": 10785,
               "nodeType": "Block",
               "src": "3954:55:11",
               "statements": [
@@ -13921,25 +13921,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9933,
+                        "id": 10779,
                         "name": "certificateCount",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9545,
+                        "referencedDeclaration": 10391,
                         "src": "3971:16:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_uint256_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(uint256 => uint256))"
                         }
                       },
-                      "id": 9935,
+                      "id": 10781,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9934,
+                        "id": 10780,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9926,
+                        "referencedDeclaration": 10772,
                         "src": "3988:6:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -13957,14 +13957,14 @@
                         "typeString": "mapping(uint256 => uint256)"
                       }
                     },
-                    "id": 9937,
+                    "id": 10783,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 9936,
+                      "id": 10782,
                       "name": "_type",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 9928,
+                      "referencedDeclaration": 10774,
                       "src": "3996:5:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -13982,15 +13982,15 @@
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 9932,
-                  "id": 9938,
+                  "functionReturnParameters": 10778,
+                  "id": 10784,
                   "nodeType": "Return",
                   "src": "3964:38:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 9940,
+            "id": 10786,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -13998,15 +13998,15 @@
             "name": "GetAttributeCount",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9929,
+              "id": 10775,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9926,
+                  "id": 10772,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3893:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14015,7 +14015,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9925,
+                    "id": 10771,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "3893:7:11",
@@ -14029,10 +14029,10 @@
                 },
                 {
                   "constant": false,
-                  "id": 9928,
+                  "id": 10774,
                   "name": "_type",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3909:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14041,7 +14041,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9927,
+                    "id": 10773,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3909:7:11",
@@ -14058,15 +14058,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9932,
+              "id": 10778,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9931,
+                  "id": 10777,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9940,
+                  "scope": 10786,
                   "src": "3945:7:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14075,7 +14075,7 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 9930,
+                    "id": 10776,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
                     "src": "3945:7:11",
@@ -14090,7 +14090,7 @@
               ],
               "src": "3944:9:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "3866:143:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -14098,7 +14098,7 @@
           },
           {
             "body": {
-              "id": 9987,
+              "id": 10833,
               "nodeType": "Block",
               "src": "4092:403:11",
               "statements": [
@@ -14109,7 +14109,7 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 9953,
+                    "id": 10799,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14121,11 +14121,11 @@
                         "arguments": [
                           {
                             "argumentTypes": null,
-                            "id": 9948,
+                            "id": 10794,
                             "name": "_owner",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9942,
+                            "referencedDeclaration": 10788,
                             "src": "4124:6:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
@@ -14135,7 +14135,7 @@
                           {
                             "argumentTypes": null,
                             "hexValue": "31343031",
-                            "id": 9949,
+                            "id": 10795,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -14162,18 +14162,18 @@
                               "typeString": "int_const 1401"
                             }
                           ],
-                          "id": 9947,
+                          "id": 10793,
                           "name": "GetAttributeValue",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 9924,
+                          "referencedDeclaration": 10770,
                           "src": "4106:17:11",
                           "typeDescriptions": {
                             "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                             "typeString": "function (address,uint256) view returns (bytes memory)"
                           }
                         },
-                        "id": 9950,
+                        "id": 10796,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14187,7 +14187,7 @@
                           "typeString": "bytes memory"
                         }
                       },
-                      "id": 9951,
+                      "id": 10797,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14206,7 +14206,7 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 9952,
+                      "id": 10798,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -14234,7 +14234,7 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 9964,
+                      "id": 10810,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -14246,11 +14246,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 9959,
+                              "id": 10805,
                               "name": "_owner",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9942,
+                              "referencedDeclaration": 10788,
                               "src": "4236:6:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -14260,7 +14260,7 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "31333031",
-                              "id": 9960,
+                              "id": 10806,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -14287,18 +14287,18 @@
                                 "typeString": "int_const 1301"
                               }
                             ],
-                            "id": 9958,
+                            "id": 10804,
                             "name": "GetAttributeValue",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9924,
+                            "referencedDeclaration": 10770,
                             "src": "4218:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                               "typeString": "function (address,uint256) view returns (bytes memory)"
                             }
                           },
-                          "id": 9961,
+                          "id": 10807,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14312,7 +14312,7 @@
                             "typeString": "bytes memory"
                           }
                         },
-                        "id": 9962,
+                        "id": 10808,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14331,7 +14331,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "30",
-                        "id": 9963,
+                        "id": 10809,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -14359,7 +14359,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 9975,
+                        "id": 10821,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14371,11 +14371,11 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 9970,
+                                "id": 10816,
                                 "name": "_owner",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9942,
+                                "referencedDeclaration": 10788,
                                 "src": "4346:6:11",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
@@ -14385,7 +14385,7 @@
                               {
                                 "argumentTypes": null,
                                 "hexValue": "31323031",
-                                "id": 9971,
+                                "id": 10817,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": true,
@@ -14412,18 +14412,18 @@
                                   "typeString": "int_const 1201"
                                 }
                               ],
-                              "id": 9969,
+                              "id": 10815,
                               "name": "GetAttributeValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9924,
+                              "referencedDeclaration": 10770,
                               "src": "4328:17:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_bytes_memory_ptr_$",
                                 "typeString": "function (address,uint256) view returns (bytes memory)"
                               }
                             },
-                            "id": 9972,
+                            "id": 10818,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -14437,7 +14437,7 @@
                               "typeString": "bytes memory"
                             }
                           },
-                          "id": 9973,
+                          "id": 10819,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -14456,7 +14456,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 9974,
+                          "id": 10820,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -14478,7 +14478,7 @@
                         }
                       },
                       "falseBody": {
-                        "id": 9983,
+                        "id": 10829,
                         "nodeType": "Block",
                         "src": "4434:55:11",
                         "statements": [
@@ -14487,18 +14487,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9980,
+                                "id": 10826,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9497,
+                                "referencedDeclaration": 10343,
                                 "src": "4455:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 9981,
+                              "id": 10827,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -14508,22 +14508,22 @@
                               "referencedDeclaration": null,
                               "src": "4455:23:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 9946,
-                            "id": 9982,
+                            "functionReturnParameters": 10792,
+                            "id": 10828,
                             "nodeType": "Return",
                             "src": "4448:30:11"
                           }
                         ]
                       },
-                      "id": 9984,
+                      "id": 10830,
                       "nodeType": "IfStatement",
                       "src": "4324:165:11",
                       "trueBody": {
-                        "id": 9979,
+                        "id": 10825,
                         "nodeType": "Block",
                         "src": "4372:56:11",
                         "statements": [
@@ -14532,18 +14532,18 @@
                               "argumentTypes": null,
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 9976,
+                                "id": 10822,
                                 "name": "IdentityLevel",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 9497,
+                                "referencedDeclaration": 10343,
                                 "src": "4393:13:11",
                                 "typeDescriptions": {
-                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                  "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                   "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                                 }
                               },
-                              "id": 9977,
+                              "id": 10823,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
@@ -14553,23 +14553,23 @@
                               "referencedDeclaration": null,
                               "src": "4393:24:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                                "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                                 "typeString": "enum ProfileRegistry.IdentityLevel"
                               }
                             },
-                            "functionReturnParameters": 9946,
-                            "id": 9978,
+                            "functionReturnParameters": 10792,
+                            "id": 10824,
                             "nodeType": "Return",
                             "src": "4386:31:11"
                           }
                         ]
                       }
                     },
-                    "id": 9985,
+                    "id": 10831,
                     "nodeType": "IfStatement",
                     "src": "4214:275:11",
                     "trueBody": {
-                      "id": 9968,
+                      "id": 10814,
                       "nodeType": "Block",
                       "src": "4262:56:11",
                       "statements": [
@@ -14578,18 +14578,18 @@
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 9965,
+                              "id": 10811,
                               "name": "IdentityLevel",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 9497,
+                              "referencedDeclaration": 10343,
                               "src": "4283:13:11",
                               "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                                "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                                 "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                               }
                             },
-                            "id": 9966,
+                            "id": 10812,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -14599,23 +14599,23 @@
                             "referencedDeclaration": null,
                             "src": "4283:24:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                              "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                               "typeString": "enum ProfileRegistry.IdentityLevel"
                             }
                           },
-                          "functionReturnParameters": 9946,
-                          "id": 9967,
+                          "functionReturnParameters": 10792,
+                          "id": 10813,
                           "nodeType": "Return",
                           "src": "4276:31:11"
                         }
                       ]
                     }
                   },
-                  "id": 9986,
+                  "id": 10832,
                   "nodeType": "IfStatement",
                   "src": "4102:387:11",
                   "trueBody": {
-                    "id": 9957,
+                    "id": 10803,
                     "nodeType": "Block",
                     "src": "4150:58:11",
                     "statements": [
@@ -14624,18 +14624,18 @@
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 9954,
+                            "id": 10800,
                             "name": "IdentityLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9497,
+                            "referencedDeclaration": 10343,
                             "src": "4171:13:11",
                             "typeDescriptions": {
-                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$9497_$",
+                              "typeIdentifier": "t_type$_t_enum$_IdentityLevel_$10343_$",
                               "typeString": "type(enum ProfileRegistry.IdentityLevel)"
                             }
                           },
-                          "id": 9955,
+                          "id": 10801,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -14645,12 +14645,12 @@
                           "referencedDeclaration": null,
                           "src": "4171:26:11",
                           "typeDescriptions": {
-                            "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                            "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                             "typeString": "enum ProfileRegistry.IdentityLevel"
                           }
                         },
-                        "functionReturnParameters": 9946,
-                        "id": 9956,
+                        "functionReturnParameters": 10792,
+                        "id": 10802,
                         "nodeType": "Return",
                         "src": "4164:33:11"
                       }
@@ -14660,7 +14660,7 @@
               ]
             },
             "documentation": null,
-            "id": 9988,
+            "id": 10834,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -14668,15 +14668,15 @@
             "name": "GetProfileLevel",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9943,
+              "id": 10789,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9942,
+                  "id": 10788,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9988,
+                  "scope": 10834,
                   "src": "4040:14:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14685,7 +14685,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9941,
+                    "id": 10787,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4040:7:11",
@@ -14702,31 +14702,31 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9946,
+              "id": 10792,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9945,
+                  "id": 10791,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 9988,
+                  "scope": 10834,
                   "src": "4077:13:11",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
-                    "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                    "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                     "typeString": "enum ProfileRegistry.IdentityLevel"
                   },
                   "typeName": {
                     "contractScope": null,
-                    "id": 9944,
+                    "id": 10790,
                     "name": "IdentityLevel",
                     "nodeType": "UserDefinedTypeName",
-                    "referencedDeclaration": 9497,
+                    "referencedDeclaration": 10343,
                     "src": "4077:13:11",
                     "typeDescriptions": {
-                      "typeIdentifier": "t_enum$_IdentityLevel_$9497",
+                      "typeIdentifier": "t_enum$_IdentityLevel_$10343",
                       "typeString": "enum ProfileRegistry.IdentityLevel"
                     }
                   },
@@ -14736,7 +14736,7 @@
               ],
               "src": "4076:15:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4015:480:11",
             "stateMutability": "view",
             "superFunction": null,
@@ -14744,14 +14744,14 @@
           },
           {
             "body": {
-              "id": 10006,
+              "id": 10852,
               "nodeType": "Block",
               "src": "4579:65:11",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10002,
+                    "id": 10848,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -14760,25 +14760,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 9997,
+                        "id": 10843,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "4589:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 9999,
+                      "id": 10845,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 9998,
+                        "id": 10844,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9990,
+                        "referencedDeclaration": 10836,
                         "src": "4600:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -14800,7 +14800,7 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10001,
+                      "id": 10847,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -14812,7 +14812,7 @@
                       "subExpression": {
                         "argumentTypes": null,
                         "hexValue": "31",
-                        "id": 10000,
+                        "id": 10846,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -14838,7 +14838,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 10003,
+                  "id": 10849,
                   "nodeType": "ExpressionStatement",
                   "src": "4589:27:11"
                 },
@@ -14846,7 +14846,7 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10004,
+                    "id": 10850,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -14861,29 +14861,29 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 9996,
-                  "id": 10005,
+                  "functionReturnParameters": 10842,
+                  "id": 10851,
                   "nodeType": "Return",
                   "src": "4626:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 10007,
+            "id": 10853,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 9993,
+                "id": 10839,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 9992,
+                  "id": 10838,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "4554:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -14897,15 +14897,15 @@
             "name": "AddSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 9991,
+              "id": 10837,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9990,
+                  "id": 10836,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10007,
+                  "scope": 10853,
                   "src": "4527:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14914,7 +14914,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 9989,
+                    "id": 10835,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4527:7:11",
@@ -14931,15 +14931,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 9996,
+              "id": 10842,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 9995,
+                  "id": 10841,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10007,
+                  "scope": 10853,
                   "src": "4573:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -14948,7 +14948,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 9994,
+                    "id": 10840,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "4573:4:11",
@@ -14963,7 +14963,7 @@
               ],
               "src": "4572:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4501:143:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
@@ -14971,7 +14971,7 @@
           },
           {
             "body": {
-              "id": 10033,
+              "id": 10879,
               "nodeType": "Block",
               "src": "4731:118:11",
               "statements": [
@@ -14985,7 +14985,7 @@
                           "typeIdentifier": "t_int8",
                           "typeString": "int8"
                         },
-                        "id": 10022,
+                        "id": 10868,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -14995,11 +14995,11 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 10018,
+                              "id": 10864,
                               "name": "_validator",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 10009,
+                              "referencedDeclaration": 10855,
                               "src": "4767:10:11",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
@@ -15014,18 +15014,18 @@
                                 "typeString": "address"
                               }
                             ],
-                            "id": 10017,
+                            "id": 10863,
                             "name": "GetValidatorLevel",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 9646,
+                            "referencedDeclaration": 10492,
                             "src": "4749:17:11",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_int8_$",
                               "typeString": "function (address) view returns (int8)"
                             }
                           },
-                          "id": 10019,
+                          "id": 10865,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -15043,7 +15043,7 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10021,
+                          "id": 10867,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -15055,7 +15055,7 @@
                           "subExpression": {
                             "argumentTypes": null,
                             "hexValue": "31",
-                            "id": 10020,
+                            "id": 10866,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
@@ -15089,21 +15089,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10016,
+                      "id": 10862,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
+                      "referencedDeclaration": 11602,
                       "src": "4741:7:11",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10023,
+                    "id": 10869,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15117,14 +15117,14 @@
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10024,
+                  "id": 10870,
                   "nodeType": "ExpressionStatement",
                   "src": "4741:44:11"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10029,
+                    "id": 10875,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -15133,25 +15133,25 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10025,
+                        "id": 10871,
                         "name": "validators",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 9529,
+                        "referencedDeclaration": 10375,
                         "src": "4795:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_int8_$",
                           "typeString": "mapping(address => int8)"
                         }
                       },
-                      "id": 10027,
+                      "id": 10873,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 10026,
+                        "id": 10872,
                         "name": "_validator",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10009,
+                        "referencedDeclaration": 10855,
                         "src": "4806:10:11",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
@@ -15174,7 +15174,7 @@
                     "rightHandSide": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 10028,
+                      "id": 10874,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -15195,7 +15195,7 @@
                       "typeString": "int8"
                     }
                   },
-                  "id": 10030,
+                  "id": 10876,
                   "nodeType": "ExpressionStatement",
                   "src": "4795:26:11"
                 },
@@ -15203,7 +15203,7 @@
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 10031,
+                    "id": 10877,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
@@ -15218,29 +15218,29 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 10015,
-                  "id": 10032,
+                  "functionReturnParameters": 10861,
+                  "id": 10878,
                   "nodeType": "Return",
                   "src": "4831:11:11"
                 }
               ]
             },
             "documentation": null,
-            "id": 10034,
+            "id": 10880,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
             "modifiers": [
               {
                 "arguments": null,
-                "id": 10012,
+                "id": 10858,
                 "modifierName": {
                   "argumentTypes": null,
-                  "id": 10011,
+                  "id": 10857,
                   "name": "onlyOwner",
                   "nodeType": "Identifier",
                   "overloadedDeclarations": [],
-                  "referencedDeclaration": 10830,
+                  "referencedDeclaration": 11114,
                   "src": "4706:9:11",
                   "typeDescriptions": {
                     "typeIdentifier": "t_modifier$__$",
@@ -15254,15 +15254,15 @@
             "name": "RemoveSonmValidator",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10010,
+              "id": 10856,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10009,
+                  "id": 10855,
                   "name": "_validator",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10034,
+                  "scope": 10880,
                   "src": "4679:18:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -15271,7 +15271,7 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 10008,
+                    "id": 10854,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
                     "src": "4679:7:11",
@@ -15288,15 +15288,15 @@
             },
             "payable": false,
             "returnParameters": {
-              "id": 10015,
+              "id": 10861,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10014,
+                  "id": 10860,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10034,
+                  "scope": 10880,
                   "src": "4725:4:11",
                   "stateVariable": false,
                   "storageLocation": "default",
@@ -15305,7 +15305,7 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 10013,
+                    "id": 10859,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
                     "src": "4725:4:11",
@@ -15320,14 +15320,14 @@
               ],
               "src": "4724:6:11"
             },
-            "scope": 10035,
+            "scope": 10881,
             "src": "4650:199:11",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10036,
+        "scope": 10882,
         "src": "150:4701:11"
       }
     ],
@@ -15431,10 +15431,10 @@
         }
       },
       "links": {},
-      "address": "0x213e899ee9a06a1ac26c91161f8ea12824f8a48c",
-      "transactionHash": "0xb9692d242c1a22139020776d2ab92e3a4a7c40a7ff4b411fd1d39ef06838c358"
+      "address": "0x96614641f3c554fd471acd4a8c028ec4713e4234",
+      "transactionHash": "0x2e41573ab721152a1040294085b848097c84b8d7650550d78fbee96a6fc5fc50"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.443Z"
+  "updatedAt": "2019-01-11T16:10:02.005Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SNM.json b/blockchain/source/migration_artifacts/contracts/SNM.json
index c638ab210..09bf3b303 100644
--- a/blockchain/source/migration_artifacts/contracts/SNM.json
+++ b/blockchain/source/migration_artifacts/contracts/SNM.json
@@ -337,22 +337,22 @@
   ],
   "bytecode": "0x60c0604052600a60808190527f534f4e4d20746f6b656e0000000000000000000000000000000000000000000060a090815261003e91600491906100d8565b506040805180820190915260038082527f534e4d00000000000000000000000000000000000000000000000000000000006020909201918252610083916005916100d8565b50601260065534801561009557600080fd5b506003805433600160a060020a0319918216811790911681179091556b016f44a83aab6c233c000000600181905560009182526020829052604090912055610173565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061011957805160ff1916838001178555610146565b82800160010185558215610146579182015b8281111561014657825182559160200191906001019061012b565b50610152929150610156565b5090565b61017091905b80821115610152576000815560010161015c565b90565b610a1a806101826000396000f3006080604052600436106100cf5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100d4578063095ea7b31461015e57806318160ddd1461019657806323b872dd146101bd578063313ce567146101e757806366188463146101fc57806370a0823114610220578063715018a6146102415780638da5cb5b1461025857806395d89b4114610289578063a9059cbb1461029e578063d73dd623146102c2578063dd62ed3e146102e6578063f2fde38b1461030d575b600080fd5b3480156100e057600080fd5b506100e961032e565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561012357818101518382015260200161010b565b50505050905090810190601f1680156101505780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561016a57600080fd5b50610182600160a060020a03600435166024356103bc565b604080519115158252519081900360200190f35b3480156101a257600080fd5b506101ab610422565b60408051918252519081900360200190f35b3480156101c957600080fd5b50610182600160a060020a0360043581169060243516604435610428565b3480156101f357600080fd5b506101ab61059d565b34801561020857600080fd5b50610182600160a060020a03600435166024356105a3565b34801561022c57600080fd5b506101ab600160a060020a0360043516610692565b34801561024d57600080fd5b506102566106ad565b005b34801561026457600080fd5b5061026d61071b565b60408051600160a060020a039092168252519081900360200190f35b34801561029557600080fd5b506100e961072a565b3480156102aa57600080fd5b50610182600160a060020a0360043516602435610785565b3480156102ce57600080fd5b50610182600160a060020a0360043516602435610864565b3480156102f257600080fd5b506101ab600160a060020a03600435811690602435166108fd565b34801561031957600080fd5b50610256600160a060020a0360043516610928565b6004805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b820191906000526020600020905b81548152906001019060200180831161039757829003601f168201915b505050505081565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561044d57600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561047d57600080fd5b600160a060020a038316151561049257600080fd5b600160a060020a0384166000908152602081905260409020546104bb908363ffffffff61094b16565b600160a060020a0380861660009081526020819052604080822093909355908516815220546104f0908363ffffffff61095d16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610532908363ffffffff61094b16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b60065481565b336000908152600260209081526040808320600160a060020a03861684529091528120548083106105f757336000908152600260209081526040808320600160a060020a038816845290915281205561062c565b610607818463ffffffff61094b16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600354600160a060020a031633146106c457600080fd5b600354604051600160a060020a03909116907ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482090600090a26003805473ffffffffffffffffffffffffffffffffffffffff19169055565b600354600160a060020a031681565b6005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b336000908152602081905260408120548211156107a157600080fd5b600160a060020a03831615156107b657600080fd5b336000908152602081905260409020546107d6908363ffffffff61094b16565b3360009081526020819052604080822092909255600160a060020a03851681522054610808908363ffffffff61095d16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a0386168452909152812054610898908363ffffffff61095d16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b600354600160a060020a0316331461093f57600080fd5b61094881610970565b50565b60008282111561095757fe5b50900390565b8181018281101561096a57fe5b92915050565b600160a060020a038116151561098557600080fd5b600354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36003805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058206a932b0aad8a192d936ade582529b77bc96c8829cc8dd09fdc74a5cdc4dd9c260029",
   "deployedBytecode": "0x6080604052600436106100cf5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100d4578063095ea7b31461015e57806318160ddd1461019657806323b872dd146101bd578063313ce567146101e757806366188463146101fc57806370a0823114610220578063715018a6146102415780638da5cb5b1461025857806395d89b4114610289578063a9059cbb1461029e578063d73dd623146102c2578063dd62ed3e146102e6578063f2fde38b1461030d575b600080fd5b3480156100e057600080fd5b506100e961032e565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561012357818101518382015260200161010b565b50505050905090810190601f1680156101505780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561016a57600080fd5b50610182600160a060020a03600435166024356103bc565b604080519115158252519081900360200190f35b3480156101a257600080fd5b506101ab610422565b60408051918252519081900360200190f35b3480156101c957600080fd5b50610182600160a060020a0360043581169060243516604435610428565b3480156101f357600080fd5b506101ab61059d565b34801561020857600080fd5b50610182600160a060020a03600435166024356105a3565b34801561022c57600080fd5b506101ab600160a060020a0360043516610692565b34801561024d57600080fd5b506102566106ad565b005b34801561026457600080fd5b5061026d61071b565b60408051600160a060020a039092168252519081900360200190f35b34801561029557600080fd5b506100e961072a565b3480156102aa57600080fd5b50610182600160a060020a0360043516602435610785565b3480156102ce57600080fd5b50610182600160a060020a0360043516602435610864565b3480156102f257600080fd5b506101ab600160a060020a03600435811690602435166108fd565b34801561031957600080fd5b50610256600160a060020a0360043516610928565b6004805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b820191906000526020600020905b81548152906001019060200180831161039757829003601f168201915b505050505081565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561044d57600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561047d57600080fd5b600160a060020a038316151561049257600080fd5b600160a060020a0384166000908152602081905260409020546104bb908363ffffffff61094b16565b600160a060020a0380861660009081526020819052604080822093909355908516815220546104f0908363ffffffff61095d16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610532908363ffffffff61094b16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b60065481565b336000908152600260209081526040808320600160a060020a03861684529091528120548083106105f757336000908152600260209081526040808320600160a060020a038816845290915281205561062c565b610607818463ffffffff61094b16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b600354600160a060020a031633146106c457600080fd5b600354604051600160a060020a03909116907ff8df31144d9c2f0f6b59d69b8b98abd5459d07f2742c4df920b25aae33c6482090600090a26003805473ffffffffffffffffffffffffffffffffffffffff19169055565b600354600160a060020a031681565b6005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156103b45780601f10610389576101008083540402835291602001916103b4565b336000908152602081905260408120548211156107a157600080fd5b600160a060020a03831615156107b657600080fd5b336000908152602081905260409020546107d6908363ffffffff61094b16565b3360009081526020819052604080822092909255600160a060020a03851681522054610808908363ffffffff61095d16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a0386168452909152812054610898908363ffffffff61095d16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b600354600160a060020a0316331461093f57600080fd5b61094881610970565b50565b60008282111561095757fe5b50900390565b8181018281101561096a57fe5b92915050565b600160a060020a038116151561098557600080fd5b600354604051600160a060020a038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a36003805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03929092169190911790555600a165627a7a723058206a932b0aad8a192d936ade582529b77bc96c8829cc8dd09fdc74a5cdc4dd9c260029",
-  "sourceMap": "236:33:12:-;157:330;236:33;;157:330;236:33;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;334:2;311:25;;343:142;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:16;:18;;575:10;-1:-1:-1;;;;;;567:18:16;;;;;374::12;;;;;;;;417:16;-1:-1:-1;402:31:12;;;-1:-1:-1;443:20:12;;;;;;;;;;;:35;157:330;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;157:330:12;;;-1:-1:-1;157:330:12;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;",
-  "deployedSourceMap": "157:330:12:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;236:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:20;-1:-1:-1;;;;;1814:188:20;;;;;;;;;;;;;;;;;;;;;;;;;389:83:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;726:470:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:20;-1:-1:-1;;;;;726:470:20;;;;;;;;;;;;311:25:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;311:25:12;;;;3679:432:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:20;-1:-1:-1;;;;;3679:432:20;;;;;;;1149:99:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;-1:-1:-1;;;;;1149:99:17;;;;;1001:111:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:16;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:16;;;;;;;;-1:-1:-1;;;;;238:20:16;;;;;;;;;;;;;;276:28:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;276:28:12;;;;626:321:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;-1:-1:-1;;;;;626:321:17;;;;;;;2926:296:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:20;-1:-1:-1;;;;;2926:296:20;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:20;-1:-1:-1;;;;;2321:153:20;;;;;;;;;;1274:103:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:16;-1:-1:-1;;;;;1274:103:16;;;;;236:33:12;;;;;;;;;;;;;;;-1:-1:-1;;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1814:188:20:-;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:20;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:20;1814:188;;;;:::o;389:83:17:-;455:12;;389:83;:::o;726:470:20:-;-1:-1:-1;;;;;864:15:20;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:20;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:20;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:20;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:20;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:20;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:20;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:20;726:470;;;;;:::o;311:25:12:-;;;;:::o;3679:432:20:-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:20;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:20;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:20;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:20;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:20;;3679:432;-1:-1:-1;;;3679:432:20:o;1149:99:17:-;-1:-1:-1;;;;;1227:16:17;1205:7;1227:16;;;;;;;;;;;;1149:99::o;1001:111:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1077:5;;1058:25;;-1:-1:-1;;;;;1077:5:16;;;;1058:25;;1077:5;;1058:25;1089:5;:18;;-1:-1:-1;;1089:18:16;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:16;;:::o;276:28:12:-;;;;;;;;;;;;;;;-1:-1:-1;;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;626:321:17;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:17;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:17;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:17;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;2926:296:20:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:20;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:20;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:20;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:20;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1274:103:16:-;719:5;;-1:-1:-1;;;;;719:5:16;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o;1512:171:16:-;-1:-1:-1;;;;;1582:23:16;;;;1574:32;;;;;;1638:5;;1617:38;;-1:-1:-1;;;;;1617:38:16;;;;1638:5;;1617:38;;1638:5;;1617:38;1661:5;:17;;-1:-1:-1;;1661:17:16;-1:-1:-1;;;;;1661:17:16;;;;;;;;;;1512:171::o",
+  "sourceMap": "236:33:12:-;157:330;236:33;;157:330;236:33;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;334:2;311:25;;343:142;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;567:5:15;:18;;575:10;-1:-1:-1;;;;;;567:18:15;;;;;374::12;;;;;;;;417:16;-1:-1:-1;402:31:12;;;-1:-1:-1;443:20:12;;;;;;;;;;;:35;157:330;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;157:330:12;;;-1:-1:-1;157:330:12;:::i;:::-;;;:::o;:::-;;;;;;;;;;;;;;;;;;;;:::o;:::-;;;;;;;",
+  "deployedSourceMap": "157:330:12:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;236:33;;8:9:-1;5:2;;;30:1;27;20:12;5:2;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:19;-1:-1:-1;;;;;1814:188:19;;;;;;;;;;;;;;;;;;;;;;;;;389:83:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:16;;;;;;;;;;;;;;;;;;;;726:470:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:19;-1:-1:-1;;;;;726:470:19;;;;;;;;;;;;311:25:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;311:25:12;;;;3679:432:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:19;-1:-1:-1;;;;;3679:432:19;;;;;;;1149:99:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:16;-1:-1:-1;;;;;1149:99:16;;;;;1001:111:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1001:111:15;;;;;;238:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;238:20:15;;;;;;;;-1:-1:-1;;;;;238:20:15;;;;;;;;;;;;;;276:28:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;276:28:12;;;;626:321:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:16;-1:-1:-1;;;;;626:321:16;;;;;;;2926:296:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:19;-1:-1:-1;;;;;2926:296:19;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:19;-1:-1:-1;;;;;2321:153:19;;;;;;;;;;1274:103:15;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1274:103:15;-1:-1:-1;;;;;1274:103:15;;;;;236:33:12;;;;;;;;;;;;;;;-1:-1:-1;;236:33:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;1814:188:19:-;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:19;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:19;1814:188;;;;:::o;389:83:16:-;455:12;;389:83;:::o;726:470:19:-;-1:-1:-1;;;;;864:15:19;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:19;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:19;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:19;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:19;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:19;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:19;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:19;726:470;;;;;:::o;311:25:12:-;;;;:::o;3679:432:19:-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:19;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:19;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:19;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:19;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:19;;3679:432;-1:-1:-1;;;3679:432:19:o;1149:99:16:-;-1:-1:-1;;;;;1227:16:16;1205:7;1227:16;;;;;;;;;;;;1149:99::o;1001:111:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1077:5;;1058:25;;-1:-1:-1;;;;;1077:5:15;;;;1058:25;;1077:5;;1058:25;1089:5;:18;;-1:-1:-1;;1089:18:15;;;1001:111::o;238:20::-;;;-1:-1:-1;;;;;238:20:15;;:::o;276:28:12:-;;;;;;;;;;;;;;;-1:-1:-1;;276:28:12;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;626:321:16;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:16;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:16;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:16;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:16;626:321;;;;:::o;2926:296:19:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:19;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:19;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:19;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:19;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1274:103:15:-;719:5;;-1:-1:-1;;;;;719:5:15;705:10;:19;697:28;;;;;;1343:29;1362:9;1343:18;:29::i;:::-;1274:103;:::o;1060:116:14:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:14;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o;1512:171:15:-;-1:-1:-1;;;;;1582:23:15;;;;1574:32;;;;;;1638:5;;1617:38;;-1:-1:-1;;;;;1617:38:15;;;;1638:5;;1617:38;;1638:5;;1617:38;1661:5;:17;;-1:-1:-1;;1661:17:15;-1:-1:-1;;;;;1661:17:15;;;;;;;;;;1512:171::o",
   "source": "pragma solidity ^0.4.23;\n\n\nimport \"zeppelin-solidity/contracts/token/ERC20/StandardToken.sol\";\nimport \"zeppelin-solidity/contracts/ownership/Ownable.sol\";\n\n\ncontract SNM is StandardToken, Ownable {\n\n    using SafeMath for uint256;\n\n    string public name = \"SONM token\";\n\n    string public symbol = \"SNM\";\n\n    uint public decimals = 18;\n\n    constructor() public {\n        owner = msg.sender;\n        totalSupply_ = 444 * 1e6 * 1e18;\n        balances[msg.sender] = totalSupply_;\n    }\n}\n",
   "sourcePath": "contracts/SNM.sol",
   "ast": {
     "absolutePath": "contracts/SNM.sol",
     "exportedSymbols": {
       "SNM": [
-        10080
+        10926
       ]
     },
-    "id": 10081,
+    "id": 10927,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10037,
+        "id": 10883,
         "literals": [
           "solidity",
           "^",
@@ -365,10 +365,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 10038,
+        "id": 10884,
         "nodeType": "ImportDirective",
-        "scope": 10081,
-        "sourceUnit": 11301,
+        "scope": 10927,
+        "sourceUnit": 11585,
         "src": "27:67:12",
         "symbolAliases": [],
         "unitAlias": ""
@@ -376,10 +376,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 10039,
+        "id": 10885,
         "nodeType": "ImportDirective",
-        "scope": 10081,
-        "sourceUnit": 10883,
+        "scope": 10927,
+        "sourceUnit": 11167,
         "src": "95:59:12",
         "symbolAliases": [],
         "unitAlias": ""
@@ -390,17 +390,17 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10040,
+              "id": 10886,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11300,
+              "referencedDeclaration": 11584,
               "src": "173:13:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$11300",
+                "typeIdentifier": "t_contract$_StandardToken_$11584",
                 "typeString": "contract StandardToken"
               }
             },
-            "id": 10041,
+            "id": 10887,
             "nodeType": "InheritanceSpecifier",
             "src": "173:13:12"
           },
@@ -408,61 +408,61 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10042,
+              "id": 10888,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "188:7:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 10043,
+            "id": 10889,
             "nodeType": "InheritanceSpecifier",
             "src": "188:7:12"
           }
         ],
         "contractDependencies": [
-          10882,
-          10978,
-          11021,
-          11053,
-          11300
+          11166,
+          11262,
+          11305,
+          11337,
+          11584
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 10080,
+        "id": 10926,
         "linearizedBaseContracts": [
-          10080,
-          10882,
-          11300,
-          10978,
-          11021,
-          11053
+          10926,
+          11166,
+          11584,
+          11262,
+          11305,
+          11337
         ],
         "name": "SNM",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 10046,
+            "id": 10892,
             "libraryName": {
               "contractScope": null,
-              "id": 10044,
+              "id": 10890,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
+              "referencedDeclaration": 11080,
               "src": "209:8:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
             "src": "203:27:12",
             "typeName": {
-              "id": 10045,
+              "id": 10891,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
               "src": "222:7:12",
@@ -474,10 +474,10 @@
           },
           {
             "constant": false,
-            "id": 10049,
+            "id": 10895,
             "name": "name",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "236:33:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -486,7 +486,7 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 10047,
+              "id": 10893,
               "name": "string",
               "nodeType": "ElementaryTypeName",
               "src": "236:6:12",
@@ -498,7 +498,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534f4e4d20746f6b656e",
-              "id": 10048,
+              "id": 10894,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -517,10 +517,10 @@
           },
           {
             "constant": false,
-            "id": 10052,
+            "id": 10898,
             "name": "symbol",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "276:28:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -529,7 +529,7 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 10050,
+              "id": 10896,
               "name": "string",
               "nodeType": "ElementaryTypeName",
               "src": "276:6:12",
@@ -541,7 +541,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534e4d",
-              "id": 10051,
+              "id": 10897,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -560,10 +560,10 @@
           },
           {
             "constant": false,
-            "id": 10055,
+            "id": 10901,
             "name": "decimals",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "311:25:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -572,7 +572,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 10053,
+              "id": 10899,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "311:4:12",
@@ -584,7 +584,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3138",
-              "id": 10054,
+              "id": 10900,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -603,25 +603,25 @@
           },
           {
             "body": {
-              "id": 10078,
+              "id": 10924,
               "nodeType": "Block",
               "src": "364:121:12",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10061,
+                    "id": 10907,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10058,
+                      "id": 10904,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "374:5:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -634,18 +634,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 10059,
+                        "id": 10905,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "382:3:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 10060,
+                      "id": 10906,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -665,25 +665,25 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 10062,
+                  "id": 10908,
                   "nodeType": "ExpressionStatement",
                   "src": "374:18:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10069,
+                    "id": 10915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10063,
+                      "id": 10909,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10897,
+                      "referencedDeclaration": 11181,
                       "src": "402:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -698,7 +698,7 @@
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       },
-                      "id": 10068,
+                      "id": 10914,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -709,7 +709,7 @@
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
                         },
-                        "id": 10066,
+                        "id": 10912,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -717,7 +717,7 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "hexValue": "343434",
-                          "id": 10064,
+                          "id": 10910,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -737,7 +737,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "316536",
-                          "id": 10065,
+                          "id": 10911,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -763,7 +763,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 10067,
+                        "id": 10913,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -790,14 +790,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10070,
+                  "id": 10916,
                   "nodeType": "ExpressionStatement",
                   "src": "402:31:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10076,
+                    "id": 10922,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -806,34 +806,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10071,
+                        "id": 10917,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
+                        "referencedDeclaration": 11179,
                         "src": "443:8:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10074,
+                      "id": 10920,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10072,
+                          "id": 10918,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
+                          "referencedDeclaration": 11599,
                           "src": "452:3:12",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10073,
+                        "id": 10919,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -862,11 +862,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10075,
+                      "id": 10921,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10897,
+                      "referencedDeclaration": 11181,
                       "src": "466:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -879,14 +879,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10077,
+                  "id": 10923,
                   "nodeType": "ExpressionStatement",
                   "src": "443:35:12"
                 }
               ]
             },
             "documentation": null,
-            "id": 10079,
+            "id": 10925,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -894,26 +894,26 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10056,
+              "id": 10902,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "354:2:12"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10057,
+              "id": 10903,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "364:0:12"
             },
-            "scope": 10080,
+            "scope": 10926,
             "src": "343:142:12",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10081,
+        "scope": 10927,
         "src": "157:330:12"
       }
     ],
@@ -923,14 +923,14 @@
     "absolutePath": "contracts/SNM.sol",
     "exportedSymbols": {
       "SNM": [
-        10080
+        10926
       ]
     },
-    "id": 10081,
+    "id": 10927,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10037,
+        "id": 10883,
         "literals": [
           "solidity",
           "^",
@@ -943,10 +943,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
         "file": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
-        "id": 10038,
+        "id": 10884,
         "nodeType": "ImportDirective",
-        "scope": 10081,
-        "sourceUnit": 11301,
+        "scope": 10927,
+        "sourceUnit": 11585,
         "src": "27:67:12",
         "symbolAliases": [],
         "unitAlias": ""
@@ -954,10 +954,10 @@
       {
         "absolutePath": "zeppelin-solidity/contracts/ownership/Ownable.sol",
         "file": "zeppelin-solidity/contracts/ownership/Ownable.sol",
-        "id": 10039,
+        "id": 10885,
         "nodeType": "ImportDirective",
-        "scope": 10081,
-        "sourceUnit": 10883,
+        "scope": 10927,
+        "sourceUnit": 11167,
         "src": "95:59:12",
         "symbolAliases": [],
         "unitAlias": ""
@@ -968,17 +968,17 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10040,
+              "id": 10886,
               "name": "StandardToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11300,
+              "referencedDeclaration": 11584,
               "src": "173:13:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_StandardToken_$11300",
+                "typeIdentifier": "t_contract$_StandardToken_$11584",
                 "typeString": "contract StandardToken"
               }
             },
-            "id": 10041,
+            "id": 10887,
             "nodeType": "InheritanceSpecifier",
             "src": "173:13:12"
           },
@@ -986,61 +986,61 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 10042,
+              "id": 10888,
               "name": "Ownable",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10882,
+              "referencedDeclaration": 11166,
               "src": "188:7:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_Ownable_$10882",
+                "typeIdentifier": "t_contract$_Ownable_$11166",
                 "typeString": "contract Ownable"
               }
             },
-            "id": 10043,
+            "id": 10889,
             "nodeType": "InheritanceSpecifier",
             "src": "188:7:12"
           }
         ],
         "contractDependencies": [
-          10882,
-          10978,
-          11021,
-          11053,
-          11300
+          11166,
+          11262,
+          11305,
+          11337,
+          11584
         ],
         "contractKind": "contract",
         "documentation": null,
         "fullyImplemented": true,
-        "id": 10080,
+        "id": 10926,
         "linearizedBaseContracts": [
-          10080,
-          10882,
-          11300,
-          10978,
-          11021,
-          11053
+          10926,
+          11166,
+          11584,
+          11262,
+          11305,
+          11337
         ],
         "name": "SNM",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
-            "id": 10046,
+            "id": 10892,
             "libraryName": {
               "contractScope": null,
-              "id": 10044,
+              "id": 10890,
               "name": "SafeMath",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10796,
+              "referencedDeclaration": 11080,
               "src": "209:8:12",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_SafeMath_$10796",
+                "typeIdentifier": "t_contract$_SafeMath_$11080",
                 "typeString": "library SafeMath"
               }
             },
             "nodeType": "UsingForDirective",
             "src": "203:27:12",
             "typeName": {
-              "id": 10045,
+              "id": 10891,
               "name": "uint256",
               "nodeType": "ElementaryTypeName",
               "src": "222:7:12",
@@ -1052,10 +1052,10 @@
           },
           {
             "constant": false,
-            "id": 10049,
+            "id": 10895,
             "name": "name",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "236:33:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1064,7 +1064,7 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 10047,
+              "id": 10893,
               "name": "string",
               "nodeType": "ElementaryTypeName",
               "src": "236:6:12",
@@ -1076,7 +1076,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534f4e4d20746f6b656e",
-              "id": 10048,
+              "id": 10894,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -1095,10 +1095,10 @@
           },
           {
             "constant": false,
-            "id": 10052,
+            "id": 10898,
             "name": "symbol",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "276:28:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1107,7 +1107,7 @@
               "typeString": "string"
             },
             "typeName": {
-              "id": 10050,
+              "id": 10896,
               "name": "string",
               "nodeType": "ElementaryTypeName",
               "src": "276:6:12",
@@ -1119,7 +1119,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "534e4d",
-              "id": 10051,
+              "id": 10897,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -1138,10 +1138,10 @@
           },
           {
             "constant": false,
-            "id": 10055,
+            "id": 10901,
             "name": "decimals",
             "nodeType": "VariableDeclaration",
-            "scope": 10080,
+            "scope": 10926,
             "src": "311:25:12",
             "stateVariable": true,
             "storageLocation": "default",
@@ -1150,7 +1150,7 @@
               "typeString": "uint256"
             },
             "typeName": {
-              "id": 10053,
+              "id": 10899,
               "name": "uint",
               "nodeType": "ElementaryTypeName",
               "src": "311:4:12",
@@ -1162,7 +1162,7 @@
             "value": {
               "argumentTypes": null,
               "hexValue": "3138",
-              "id": 10054,
+              "id": 10900,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
@@ -1181,25 +1181,25 @@
           },
           {
             "body": {
-              "id": 10078,
+              "id": 10924,
               "nodeType": "Block",
               "src": "364:121:12",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10061,
+                    "id": 10907,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10058,
+                      "id": 10904,
                       "name": "owner",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10800,
+                      "referencedDeclaration": 11084,
                       "src": "374:5:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
@@ -1212,18 +1212,18 @@
                       "argumentTypes": null,
                       "expression": {
                         "argumentTypes": null,
-                        "id": 10059,
+                        "id": 10905,
                         "name": "msg",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11315,
+                        "referencedDeclaration": 11599,
                         "src": "382:3:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_magic_message",
                           "typeString": "msg"
                         }
                       },
-                      "id": 10060,
+                      "id": 10906,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1243,25 +1243,25 @@
                       "typeString": "address"
                     }
                   },
-                  "id": 10062,
+                  "id": 10908,
                   "nodeType": "ExpressionStatement",
                   "src": "374:18:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10069,
+                    "id": 10915,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10063,
+                      "id": 10909,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10897,
+                      "referencedDeclaration": 11181,
                       "src": "402:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -1276,7 +1276,7 @@
                         "typeIdentifier": "t_rational_444000000000000000000000000_by_1",
                         "typeString": "int_const 444000000000000000000000000"
                       },
-                      "id": 10068,
+                      "id": 10914,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
@@ -1287,7 +1287,7 @@
                           "typeIdentifier": "t_rational_444000000_by_1",
                           "typeString": "int_const 444000000"
                         },
-                        "id": 10066,
+                        "id": 10912,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1295,7 +1295,7 @@
                         "leftExpression": {
                           "argumentTypes": null,
                           "hexValue": "343434",
-                          "id": 10064,
+                          "id": 10910,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1315,7 +1315,7 @@
                         "rightExpression": {
                           "argumentTypes": null,
                           "hexValue": "316536",
-                          "id": 10065,
+                          "id": 10911,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -1341,7 +1341,7 @@
                       "rightExpression": {
                         "argumentTypes": null,
                         "hexValue": "31653138",
-                        "id": 10067,
+                        "id": 10913,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": true,
@@ -1368,14 +1368,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10070,
+                  "id": 10916,
                   "nodeType": "ExpressionStatement",
                   "src": "402:31:12"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10076,
+                    "id": 10922,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1384,34 +1384,34 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 10071,
+                        "id": 10917,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
+                        "referencedDeclaration": 11179,
                         "src": "443:8:12",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 10074,
+                      "id": 10920,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 10072,
+                          "id": 10918,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
+                          "referencedDeclaration": 11599,
                           "src": "452:3:12",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 10073,
+                        "id": 10919,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1440,11 +1440,11 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 10075,
+                      "id": 10921,
                       "name": "totalSupply_",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10897,
+                      "referencedDeclaration": 11181,
                       "src": "466:12:12",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
@@ -1457,14 +1457,14 @@
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10077,
+                  "id": 10923,
                   "nodeType": "ExpressionStatement",
                   "src": "443:35:12"
                 }
               ]
             },
             "documentation": null,
-            "id": 10079,
+            "id": 10925,
             "implemented": true,
             "isConstructor": true,
             "isDeclaredConst": false,
@@ -1472,26 +1472,26 @@
             "name": "",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10056,
+              "id": 10902,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "354:2:12"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10057,
+              "id": 10903,
               "nodeType": "ParameterList",
               "parameters": [],
               "src": "364:0:12"
             },
-            "scope": 10080,
+            "scope": 10926,
             "src": "343:142:12",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 10081,
+        "scope": 10927,
         "src": "157:330:12"
       }
     ],
@@ -1579,10 +1579,10 @@
         }
       },
       "links": {},
-      "address": "0x23e808e6ef115832f79bf38ab317fe49e981add3",
-      "transactionHash": "0xe48e0356168237efede75d6965310b41332467c5ec4ceb620d3b4edb583a6068"
+      "address": "0x482606f64b39f9ba7ef43bb271bc8df4f5738867",
+      "transactionHash": "0xa0f3e047cac29f1fabdb2bbf67de5df39f38c323c97dd26a7980df7db71e98fa"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-11T13:07:54.412Z"
+  "updatedAt": "2019-01-11T16:10:01.967Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SafeMath.json b/blockchain/source/migration_artifacts/contracts/SafeMath.json
index ff7c8ef38..acba47aa7 100644
--- a/blockchain/source/migration_artifacts/contracts/SafeMath.json
+++ b/blockchain/source/migration_artifacts/contracts/SafeMath.json
@@ -3,22 +3,22 @@
   "abi": [],
   "bytecode": "0x604c602c600b82828239805160001a60731460008114601c57601e565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600080fd00a165627a7a723058208039be690fcb121eceb5677b72be9a3448b94fbe32d322db860abcab2a433c9c0029",
   "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fd00a165627a7a723058208039be690fcb121eceb5677b72be9a3448b94fbe32d322db860abcab2a433c9c0029",
-  "sourceMap": "117:1251:15:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24",
-  "deployedSourceMap": "117:1251:15:-;;;;;;;;",
+  "sourceMap": "117:1251:14:-;;132:2:-1;166:7;155:9;146:7;137:37;252:7;246:14;243:1;238:23;232:4;229:33;270:1;265:20;;;;222:63;;265:20;274:9;222:63;;298:9;295:1;288:20;328:4;319:7;311:22;352:7;343;336:24",
+  "deployedSourceMap": "117:1251:14:-;;;;;;;;",
   "source": "pragma solidity ^0.4.24;\n\n\n/**\n * @title SafeMath\n * @dev Math operations with safety checks that throw on error\n */\nlibrary SafeMath {\n\n  /**\n  * @dev Multiplies two numbers, throws on overflow.\n  */\n  function mul(uint256 _a, uint256 _b) internal pure returns (uint256 c) {\n    // Gas optimization: this is cheaper than asserting 'a' not being zero, but the\n    // benefit is lost if 'b' is also tested.\n    // See: https://github.com/OpenZeppelin/openzeppelin-solidity/pull/522\n    if (_a == 0) {\n      return 0;\n    }\n\n    c = _a * _b;\n    assert(c / _a == _b);\n    return c;\n  }\n\n  /**\n  * @dev Integer division of two numbers, truncating the quotient.\n  */\n  function div(uint256 _a, uint256 _b) internal pure returns (uint256) {\n    // assert(_b > 0); // Solidity automatically throws when dividing by 0\n    // uint256 c = _a / _b;\n    // assert(_a == _b * c + _a % _b); // There is no case in which this doesn't hold\n    return _a / _b;\n  }\n\n  /**\n  * @dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).\n  */\n  function sub(uint256 _a, uint256 _b) internal pure returns (uint256) {\n    assert(_b <= _a);\n    return _a - _b;\n  }\n\n  /**\n  * @dev Adds two numbers, throws on overflow.\n  */\n  function add(uint256 _a, uint256 _b) internal pure returns (uint256 c) {\n    c = _a + _b;\n    assert(c >= _a);\n    return c;\n  }\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
     "exportedSymbols": {
       "SafeMath": [
-        10796
+        11080
       ]
     },
-    "id": 10797,
+    "id": 11081,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10704,
+        "id": 10988,
         "literals": [
           "solidity",
           "^",
@@ -26,7 +26,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:15"
+        "src": "0:24:14"
       },
       {
         "baseContracts": [],
@@ -34,18 +34,18 @@
         "contractKind": "library",
         "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error",
         "fullyImplemented": true,
-        "id": 10796,
+        "id": 11080,
         "linearizedBaseContracts": [
-          10796
+          11080
         ],
         "name": "SafeMath",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 10736,
+              "id": 11020,
               "nodeType": "Block",
-              "src": "274:309:15",
+              "src": "274:309:14",
               "statements": [
                 {
                   "condition": {
@@ -54,19 +54,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10715,
+                    "id": 10999,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10713,
+                      "id": 10997,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10706,
-                      "src": "489:2:15",
+                      "referencedDeclaration": 10990,
+                      "src": "489:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -77,14 +77,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 10714,
+                      "id": 10998,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "495:1:15",
+                      "src": "495:1:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -92,33 +92,33 @@
                       },
                       "value": "0"
                     },
-                    "src": "489:7:15",
+                    "src": "489:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 10719,
+                  "id": 11003,
                   "nodeType": "IfStatement",
-                  "src": "485:36:15",
+                  "src": "485:36:14",
                   "trueBody": {
-                    "id": 10718,
+                    "id": 11002,
                     "nodeType": "Block",
-                    "src": "498:23:15",
+                    "src": "498:23:14",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 10716,
+                          "id": 11000,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "513:1:15",
+                          "src": "513:1:14",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -126,10 +126,10 @@
                           },
                           "value": "0"
                         },
-                        "functionReturnParameters": 10712,
-                        "id": 10717,
+                        "functionReturnParameters": 10996,
+                        "id": 11001,
                         "nodeType": "Return",
-                        "src": "506:8:15"
+                        "src": "506:8:14"
                       }
                     ]
                   }
@@ -137,19 +137,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10724,
+                    "id": 11008,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10720,
+                      "id": 11004,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10711,
-                      "src": "527:1:15",
+                      "referencedDeclaration": 10995,
+                      "src": "527:1:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -163,19 +163,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 10723,
+                      "id": 11007,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 10721,
+                        "id": 11005,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10706,
-                        "src": "531:2:15",
+                        "referencedDeclaration": 10990,
+                        "src": "531:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -185,32 +185,32 @@
                       "operator": "*",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 10722,
+                        "id": 11006,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10708,
-                        "src": "536:2:15",
+                        "referencedDeclaration": 10992,
+                        "src": "536:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "531:7:15",
+                      "src": "531:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "527:11:15",
+                    "src": "527:11:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10725,
+                  "id": 11009,
                   "nodeType": "ExpressionStatement",
-                  "src": "527:11:15"
+                  "src": "527:11:14"
                 },
                 {
                   "expression": {
@@ -222,7 +222,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10731,
+                        "id": 11015,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -233,19 +233,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 10729,
+                          "id": 11013,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 10727,
+                            "id": 11011,
                             "name": "c",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10711,
-                            "src": "551:1:15",
+                            "referencedDeclaration": 10995,
+                            "src": "551:1:14",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -255,18 +255,18 @@
                           "operator": "/",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 10728,
+                            "id": 11012,
                             "name": "_a",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10706,
-                            "src": "555:2:15",
+                            "referencedDeclaration": 10990,
+                            "src": "555:2:14",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "551:6:15",
+                          "src": "551:6:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -276,18 +276,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10730,
+                          "id": 11014,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10708,
-                          "src": "561:2:15",
+                          "referencedDeclaration": 10992,
+                          "src": "561:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "551:12:15",
+                        "src": "551:12:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -301,18 +301,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10726,
+                      "id": 11010,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "544:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "544:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10732,
+                    "id": 11016,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -320,39 +320,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "544:20:15",
+                    "src": "544:20:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10733,
+                  "id": 11017,
                   "nodeType": "ExpressionStatement",
-                  "src": "544:20:15"
+                  "src": "544:20:14"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10734,
+                    "id": 11018,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10711,
-                    "src": "577:1:15",
+                    "referencedDeclaration": 10995,
+                    "src": "577:1:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10712,
-                  "id": 10735,
+                  "functionReturnParameters": 10996,
+                  "id": 11019,
                   "nodeType": "Return",
-                  "src": "570:8:15"
+                  "src": "570:8:14"
                 }
               ]
             },
             "documentation": "@dev Multiplies two numbers, throws on overflow.",
-            "id": 10737,
+            "id": 11021,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -360,16 +360,16 @@
             "name": "mul",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10709,
+              "id": 10993,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10706,
+                  "id": 10990,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "216:10:15",
+                  "scope": 11021,
+                  "src": "216:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -377,10 +377,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10705,
+                    "id": 10989,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "216:7:15",
+                    "src": "216:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -391,11 +391,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10708,
+                  "id": 10992,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "228:10:15",
+                  "scope": 11021,
+                  "src": "228:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -403,10 +403,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10707,
+                    "id": 10991,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "228:7:15",
+                    "src": "228:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -416,20 +416,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "215:24:15"
+              "src": "215:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10712,
+              "id": 10996,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10711,
+                  "id": 10995,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "263:9:15",
+                  "scope": 11021,
+                  "src": "263:9:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -437,10 +437,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10710,
+                    "id": 10994,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "263:7:15",
+                    "src": "263:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -450,19 +450,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "262:11:15"
+              "src": "262:11:14"
             },
-            "scope": 10796,
-            "src": "203:380:15",
+            "scope": 11080,
+            "src": "203:380:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10750,
+              "id": 11034,
               "nodeType": "Block",
-              "src": "734:214:15",
+              "src": "734:214:14",
               "statements": [
                 {
                   "expression": {
@@ -471,19 +471,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10748,
+                    "id": 11032,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10746,
+                      "id": 11030,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10739,
-                      "src": "936:2:15",
+                      "referencedDeclaration": 11023,
+                      "src": "936:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -493,32 +493,32 @@
                     "operator": "/",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 10747,
+                      "id": 11031,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10741,
-                      "src": "941:2:15",
+                      "referencedDeclaration": 11025,
+                      "src": "941:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "936:7:15",
+                    "src": "936:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10745,
-                  "id": 10749,
+                  "functionReturnParameters": 11029,
+                  "id": 11033,
                   "nodeType": "Return",
-                  "src": "929:14:15"
+                  "src": "929:14:14"
                 }
               ]
             },
             "documentation": "@dev Integer division of two numbers, truncating the quotient.",
-            "id": 10751,
+            "id": 11035,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -526,16 +526,16 @@
             "name": "div",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10742,
+              "id": 11026,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10739,
+                  "id": 11023,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "678:10:15",
+                  "scope": 11035,
+                  "src": "678:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -543,10 +543,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10738,
+                    "id": 11022,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "678:7:15",
+                    "src": "678:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -557,11 +557,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10741,
+                  "id": 11025,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "690:10:15",
+                  "scope": 11035,
+                  "src": "690:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -569,10 +569,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10740,
+                    "id": 11024,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "690:7:15",
+                    "src": "690:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -582,20 +582,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "677:24:15"
+              "src": "677:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10745,
+              "id": 11029,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10744,
+                  "id": 11028,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "725:7:15",
+                  "scope": 11035,
+                  "src": "725:7:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -603,10 +603,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10743,
+                    "id": 11027,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "725:7:15",
+                    "src": "725:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -616,19 +616,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "724:9:15"
+              "src": "724:9:14"
             },
-            "scope": 10796,
-            "src": "665:283:15",
+            "scope": 11080,
+            "src": "665:283:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10770,
+              "id": 11054,
               "nodeType": "Block",
-              "src": "1129:47:15",
+              "src": "1129:47:14",
               "statements": [
                 {
                   "expression": {
@@ -640,19 +640,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10763,
+                        "id": 11047,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10761,
+                          "id": 11045,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10755,
-                          "src": "1142:2:15",
+                          "referencedDeclaration": 11039,
+                          "src": "1142:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -662,18 +662,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10762,
+                          "id": 11046,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10753,
-                          "src": "1148:2:15",
+                          "referencedDeclaration": 11037,
+                          "src": "1148:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1142:8:15",
+                        "src": "1142:8:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -687,18 +687,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10760,
+                      "id": 11044,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "1135:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "1135:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10764,
+                    "id": 11048,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -706,15 +706,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1135:16:15",
+                    "src": "1135:16:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10765,
+                  "id": 11049,
                   "nodeType": "ExpressionStatement",
-                  "src": "1135:16:15"
+                  "src": "1135:16:14"
                 },
                 {
                   "expression": {
@@ -723,19 +723,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10768,
+                    "id": 11052,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10766,
+                      "id": 11050,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10753,
-                      "src": "1164:2:15",
+                      "referencedDeclaration": 11037,
+                      "src": "1164:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -745,32 +745,32 @@
                     "operator": "-",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 10767,
+                      "id": 11051,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10755,
-                      "src": "1169:2:15",
+                      "referencedDeclaration": 11039,
+                      "src": "1169:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1164:7:15",
+                    "src": "1164:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10759,
-                  "id": 10769,
+                  "functionReturnParameters": 11043,
+                  "id": 11053,
                   "nodeType": "Return",
-                  "src": "1157:14:15"
+                  "src": "1157:14:14"
                 }
               ]
             },
             "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).",
-            "id": 10771,
+            "id": 11055,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -778,16 +778,16 @@
             "name": "sub",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10756,
+              "id": 11040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10753,
+                  "id": 11037,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1073:10:15",
+                  "scope": 11055,
+                  "src": "1073:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -795,10 +795,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10752,
+                    "id": 11036,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1073:7:15",
+                    "src": "1073:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -809,11 +809,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10755,
+                  "id": 11039,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1085:10:15",
+                  "scope": 11055,
+                  "src": "1085:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -821,10 +821,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10754,
+                    "id": 11038,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1085:7:15",
+                    "src": "1085:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -834,20 +834,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1072:24:15"
+              "src": "1072:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10759,
+              "id": 11043,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10758,
+                  "id": 11042,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1120:7:15",
+                  "scope": 11055,
+                  "src": "1120:7:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -855,10 +855,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10757,
+                    "id": 11041,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1120:7:15",
+                    "src": "1120:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -868,36 +868,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1119:9:15"
+              "src": "1119:9:14"
             },
-            "scope": 10796,
-            "src": "1060:116:15",
+            "scope": 11080,
+            "src": "1060:116:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10794,
+              "id": 11078,
               "nodeType": "Block",
-              "src": "1309:57:15",
+              "src": "1309:57:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10784,
+                    "id": 11068,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10780,
+                      "id": 11064,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10778,
-                      "src": "1315:1:15",
+                      "referencedDeclaration": 11062,
+                      "src": "1315:1:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -911,19 +911,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 10783,
+                      "id": 11067,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 10781,
+                        "id": 11065,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10773,
-                        "src": "1319:2:15",
+                        "referencedDeclaration": 11057,
+                        "src": "1319:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -933,32 +933,32 @@
                       "operator": "+",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 10782,
+                        "id": 11066,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10775,
-                        "src": "1324:2:15",
+                        "referencedDeclaration": 11059,
+                        "src": "1324:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "1319:7:15",
+                      "src": "1319:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1315:11:15",
+                    "src": "1315:11:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10785,
+                  "id": 11069,
                   "nodeType": "ExpressionStatement",
-                  "src": "1315:11:15"
+                  "src": "1315:11:14"
                 },
                 {
                   "expression": {
@@ -970,19 +970,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10789,
+                        "id": 11073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10787,
+                          "id": 11071,
                           "name": "c",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10778,
-                          "src": "1339:1:15",
+                          "referencedDeclaration": 11062,
+                          "src": "1339:1:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -992,18 +992,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10788,
+                          "id": 11072,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10773,
-                          "src": "1344:2:15",
+                          "referencedDeclaration": 11057,
+                          "src": "1344:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1339:7:15",
+                        "src": "1339:7:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1017,18 +1017,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10786,
+                      "id": 11070,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "1332:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "1332:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10790,
+                    "id": 11074,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1036,39 +1036,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1332:15:15",
+                    "src": "1332:15:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10791,
+                  "id": 11075,
                   "nodeType": "ExpressionStatement",
-                  "src": "1332:15:15"
+                  "src": "1332:15:14"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10792,
+                    "id": 11076,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10778,
-                    "src": "1360:1:15",
+                    "referencedDeclaration": 11062,
+                    "src": "1360:1:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10779,
-                  "id": 10793,
+                  "functionReturnParameters": 11063,
+                  "id": 11077,
                   "nodeType": "Return",
-                  "src": "1353:8:15"
+                  "src": "1353:8:14"
                 }
               ]
             },
             "documentation": "@dev Adds two numbers, throws on overflow.",
-            "id": 10795,
+            "id": 11079,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1076,16 +1076,16 @@
             "name": "add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10776,
+              "id": 11060,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10773,
+                  "id": 11057,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1251:10:15",
+                  "scope": 11079,
+                  "src": "1251:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1093,10 +1093,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10772,
+                    "id": 11056,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1251:7:15",
+                    "src": "1251:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1107,11 +1107,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10775,
+                  "id": 11059,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1263:10:15",
+                  "scope": 11079,
+                  "src": "1263:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1119,10 +1119,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10774,
+                    "id": 11058,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1263:7:15",
+                    "src": "1263:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1132,20 +1132,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1250:24:15"
+              "src": "1250:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10779,
+              "id": 11063,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10778,
+                  "id": 11062,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1298:9:15",
+                  "scope": 11079,
+                  "src": "1298:9:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1153,10 +1153,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10777,
+                    "id": 11061,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1298:7:15",
+                    "src": "1298:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1166,33 +1166,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1297:11:15"
+              "src": "1297:11:14"
             },
-            "scope": 10796,
-            "src": "1238:128:15",
+            "scope": 11080,
+            "src": "1238:128:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 10797,
-        "src": "117:1251:15"
+        "scope": 11081,
+        "src": "117:1251:14"
       }
     ],
-    "src": "0:1369:15"
+    "src": "0:1369:14"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/math/SafeMath.sol",
     "exportedSymbols": {
       "SafeMath": [
-        10796
+        11080
       ]
     },
-    "id": 10797,
+    "id": 11081,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 10704,
+        "id": 10988,
         "literals": [
           "solidity",
           "^",
@@ -1200,7 +1200,7 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:15"
+        "src": "0:24:14"
       },
       {
         "baseContracts": [],
@@ -1208,18 +1208,18 @@
         "contractKind": "library",
         "documentation": "@title SafeMath\n@dev Math operations with safety checks that throw on error",
         "fullyImplemented": true,
-        "id": 10796,
+        "id": 11080,
         "linearizedBaseContracts": [
-          10796
+          11080
         ],
         "name": "SafeMath",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "body": {
-              "id": 10736,
+              "id": 11020,
               "nodeType": "Block",
-              "src": "274:309:15",
+              "src": "274:309:14",
               "statements": [
                 {
                   "condition": {
@@ -1228,19 +1228,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10715,
+                    "id": 10999,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10713,
+                      "id": 10997,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10706,
-                      "src": "489:2:15",
+                      "referencedDeclaration": 10990,
+                      "src": "489:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1251,14 +1251,14 @@
                     "rightExpression": {
                       "argumentTypes": null,
                       "hexValue": "30",
-                      "id": 10714,
+                      "id": 10998,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": true,
                       "kind": "number",
                       "lValueRequested": false,
                       "nodeType": "Literal",
-                      "src": "495:1:15",
+                      "src": "495:1:14",
                       "subdenomination": null,
                       "typeDescriptions": {
                         "typeIdentifier": "t_rational_0_by_1",
@@ -1266,33 +1266,33 @@
                       },
                       "value": "0"
                     },
-                    "src": "489:7:15",
+                    "src": "489:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": null,
-                  "id": 10719,
+                  "id": 11003,
                   "nodeType": "IfStatement",
-                  "src": "485:36:15",
+                  "src": "485:36:14",
                   "trueBody": {
-                    "id": 10718,
+                    "id": 11002,
                     "nodeType": "Block",
-                    "src": "498:23:15",
+                    "src": "498:23:14",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
                           "hexValue": "30",
-                          "id": 10716,
+                          "id": 11000,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
                           "kind": "number",
                           "lValueRequested": false,
                           "nodeType": "Literal",
-                          "src": "513:1:15",
+                          "src": "513:1:14",
                           "subdenomination": null,
                           "typeDescriptions": {
                             "typeIdentifier": "t_rational_0_by_1",
@@ -1300,10 +1300,10 @@
                           },
                           "value": "0"
                         },
-                        "functionReturnParameters": 10712,
-                        "id": 10717,
+                        "functionReturnParameters": 10996,
+                        "id": 11001,
                         "nodeType": "Return",
-                        "src": "506:8:15"
+                        "src": "506:8:14"
                       }
                     ]
                   }
@@ -1311,19 +1311,19 @@
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10724,
+                    "id": 11008,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10720,
+                      "id": 11004,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10711,
-                      "src": "527:1:15",
+                      "referencedDeclaration": 10995,
+                      "src": "527:1:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1337,19 +1337,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 10723,
+                      "id": 11007,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 10721,
+                        "id": 11005,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10706,
-                        "src": "531:2:15",
+                        "referencedDeclaration": 10990,
+                        "src": "531:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1359,32 +1359,32 @@
                       "operator": "*",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 10722,
+                        "id": 11006,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10708,
-                        "src": "536:2:15",
+                        "referencedDeclaration": 10992,
+                        "src": "536:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "531:7:15",
+                      "src": "531:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "527:11:15",
+                    "src": "527:11:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10725,
+                  "id": 11009,
                   "nodeType": "ExpressionStatement",
-                  "src": "527:11:15"
+                  "src": "527:11:14"
                 },
                 {
                   "expression": {
@@ -1396,7 +1396,7 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10731,
+                        "id": 11015,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1407,19 +1407,19 @@
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           },
-                          "id": 10729,
+                          "id": 11013,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
                           "lValueRequested": false,
                           "leftExpression": {
                             "argumentTypes": null,
-                            "id": 10727,
+                            "id": 11011,
                             "name": "c",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10711,
-                            "src": "551:1:15",
+                            "referencedDeclaration": 10995,
+                            "src": "551:1:14",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -1429,18 +1429,18 @@
                           "operator": "/",
                           "rightExpression": {
                             "argumentTypes": null,
-                            "id": 10728,
+                            "id": 11012,
                             "name": "_a",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10706,
-                            "src": "555:2:15",
+                            "referencedDeclaration": 10990,
+                            "src": "555:2:14",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "551:6:15",
+                          "src": "551:6:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1450,18 +1450,18 @@
                         "operator": "==",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10730,
+                          "id": 11014,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10708,
-                          "src": "561:2:15",
+                          "referencedDeclaration": 10992,
+                          "src": "561:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "551:12:15",
+                        "src": "551:12:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1475,18 +1475,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10726,
+                      "id": 11010,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "544:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "544:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10732,
+                    "id": 11016,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1494,39 +1494,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "544:20:15",
+                    "src": "544:20:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10733,
+                  "id": 11017,
                   "nodeType": "ExpressionStatement",
-                  "src": "544:20:15"
+                  "src": "544:20:14"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10734,
+                    "id": 11018,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10711,
-                    "src": "577:1:15",
+                    "referencedDeclaration": 10995,
+                    "src": "577:1:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10712,
-                  "id": 10735,
+                  "functionReturnParameters": 10996,
+                  "id": 11019,
                   "nodeType": "Return",
-                  "src": "570:8:15"
+                  "src": "570:8:14"
                 }
               ]
             },
             "documentation": "@dev Multiplies two numbers, throws on overflow.",
-            "id": 10737,
+            "id": 11021,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1534,16 +1534,16 @@
             "name": "mul",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10709,
+              "id": 10993,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10706,
+                  "id": 10990,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "216:10:15",
+                  "scope": 11021,
+                  "src": "216:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1551,10 +1551,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10705,
+                    "id": 10989,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "216:7:15",
+                    "src": "216:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1565,11 +1565,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10708,
+                  "id": 10992,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "228:10:15",
+                  "scope": 11021,
+                  "src": "228:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1577,10 +1577,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10707,
+                    "id": 10991,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "228:7:15",
+                    "src": "228:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1590,20 +1590,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "215:24:15"
+              "src": "215:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10712,
+              "id": 10996,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10711,
+                  "id": 10995,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10737,
-                  "src": "263:9:15",
+                  "scope": 11021,
+                  "src": "263:9:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1611,10 +1611,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10710,
+                    "id": 10994,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "263:7:15",
+                    "src": "263:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1624,19 +1624,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "262:11:15"
+              "src": "262:11:14"
             },
-            "scope": 10796,
-            "src": "203:380:15",
+            "scope": 11080,
+            "src": "203:380:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10750,
+              "id": 11034,
               "nodeType": "Block",
-              "src": "734:214:15",
+              "src": "734:214:14",
               "statements": [
                 {
                   "expression": {
@@ -1645,19 +1645,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10748,
+                    "id": 11032,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10746,
+                      "id": 11030,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10739,
-                      "src": "936:2:15",
+                      "referencedDeclaration": 11023,
+                      "src": "936:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1667,32 +1667,32 @@
                     "operator": "/",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 10747,
+                      "id": 11031,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10741,
-                      "src": "941:2:15",
+                      "referencedDeclaration": 11025,
+                      "src": "941:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "936:7:15",
+                    "src": "936:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10745,
-                  "id": 10749,
+                  "functionReturnParameters": 11029,
+                  "id": 11033,
                   "nodeType": "Return",
-                  "src": "929:14:15"
+                  "src": "929:14:14"
                 }
               ]
             },
             "documentation": "@dev Integer division of two numbers, truncating the quotient.",
-            "id": 10751,
+            "id": 11035,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1700,16 +1700,16 @@
             "name": "div",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10742,
+              "id": 11026,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10739,
+                  "id": 11023,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "678:10:15",
+                  "scope": 11035,
+                  "src": "678:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1717,10 +1717,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10738,
+                    "id": 11022,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "678:7:15",
+                    "src": "678:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1731,11 +1731,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10741,
+                  "id": 11025,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "690:10:15",
+                  "scope": 11035,
+                  "src": "690:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1743,10 +1743,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10740,
+                    "id": 11024,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "690:7:15",
+                    "src": "690:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1756,20 +1756,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "677:24:15"
+              "src": "677:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10745,
+              "id": 11029,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10744,
+                  "id": 11028,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10751,
-                  "src": "725:7:15",
+                  "scope": 11035,
+                  "src": "725:7:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1777,10 +1777,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10743,
+                    "id": 11027,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "725:7:15",
+                    "src": "725:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1790,19 +1790,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "724:9:15"
+              "src": "724:9:14"
             },
-            "scope": 10796,
-            "src": "665:283:15",
+            "scope": 11080,
+            "src": "665:283:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10770,
+              "id": 11054,
               "nodeType": "Block",
-              "src": "1129:47:15",
+              "src": "1129:47:14",
               "statements": [
                 {
                   "expression": {
@@ -1814,19 +1814,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10763,
+                        "id": 11047,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10761,
+                          "id": 11045,
                           "name": "_b",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10755,
-                          "src": "1142:2:15",
+                          "referencedDeclaration": 11039,
+                          "src": "1142:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1836,18 +1836,18 @@
                         "operator": "<=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10762,
+                          "id": 11046,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10753,
-                          "src": "1148:2:15",
+                          "referencedDeclaration": 11037,
+                          "src": "1148:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1142:8:15",
+                        "src": "1142:8:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -1861,18 +1861,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10760,
+                      "id": 11044,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "1135:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "1135:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10764,
+                    "id": 11048,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1880,15 +1880,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1135:16:15",
+                    "src": "1135:16:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10765,
+                  "id": 11049,
                   "nodeType": "ExpressionStatement",
-                  "src": "1135:16:15"
+                  "src": "1135:16:14"
                 },
                 {
                   "expression": {
@@ -1897,19 +1897,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 10768,
+                    "id": 11052,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 10766,
+                      "id": 11050,
                       "name": "_a",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10753,
-                      "src": "1164:2:15",
+                      "referencedDeclaration": 11037,
+                      "src": "1164:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1919,32 +1919,32 @@
                     "operator": "-",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 10767,
+                      "id": 11051,
                       "name": "_b",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10755,
-                      "src": "1169:2:15",
+                      "referencedDeclaration": 11039,
+                      "src": "1169:2:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1164:7:15",
+                    "src": "1164:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10759,
-                  "id": 10769,
+                  "functionReturnParameters": 11043,
+                  "id": 11053,
                   "nodeType": "Return",
-                  "src": "1157:14:15"
+                  "src": "1157:14:14"
                 }
               ]
             },
             "documentation": "@dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).",
-            "id": 10771,
+            "id": 11055,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -1952,16 +1952,16 @@
             "name": "sub",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10756,
+              "id": 11040,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10753,
+                  "id": 11037,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1073:10:15",
+                  "scope": 11055,
+                  "src": "1073:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1969,10 +1969,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10752,
+                    "id": 11036,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1073:7:15",
+                    "src": "1073:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1983,11 +1983,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10755,
+                  "id": 11039,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1085:10:15",
+                  "scope": 11055,
+                  "src": "1085:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1995,10 +1995,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10754,
+                    "id": 11038,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1085:7:15",
+                    "src": "1085:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2008,20 +2008,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1072:24:15"
+              "src": "1072:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10759,
+              "id": 11043,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10758,
+                  "id": 11042,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10771,
-                  "src": "1120:7:15",
+                  "scope": 11055,
+                  "src": "1120:7:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2029,10 +2029,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10757,
+                    "id": 11041,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1120:7:15",
+                    "src": "1120:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2042,36 +2042,36 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1119:9:15"
+              "src": "1119:9:14"
             },
-            "scope": 10796,
-            "src": "1060:116:15",
+            "scope": 11080,
+            "src": "1060:116:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 10794,
+              "id": 11078,
               "nodeType": "Block",
-              "src": "1309:57:15",
+              "src": "1309:57:14",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10784,
+                    "id": 11068,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftHandSide": {
                       "argumentTypes": null,
-                      "id": 10780,
+                      "id": 11064,
                       "name": "c",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 10778,
-                      "src": "1315:1:15",
+                      "referencedDeclaration": 11062,
+                      "src": "1315:1:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2085,19 +2085,19 @@
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       },
-                      "id": 10783,
+                      "id": 11067,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "leftExpression": {
                         "argumentTypes": null,
-                        "id": 10781,
+                        "id": 11065,
                         "name": "_a",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10773,
-                        "src": "1319:2:15",
+                        "referencedDeclaration": 11057,
+                        "src": "1319:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2107,32 +2107,32 @@
                       "operator": "+",
                       "rightExpression": {
                         "argumentTypes": null,
-                        "id": 10782,
+                        "id": 11066,
                         "name": "_b",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10775,
-                        "src": "1324:2:15",
+                        "referencedDeclaration": 11059,
+                        "src": "1324:2:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         }
                       },
-                      "src": "1319:7:15",
+                      "src": "1319:7:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1315:11:15",
+                    "src": "1315:11:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 10785,
+                  "id": 11069,
                   "nodeType": "ExpressionStatement",
-                  "src": "1315:11:15"
+                  "src": "1315:11:14"
                 },
                 {
                   "expression": {
@@ -2144,19 +2144,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 10789,
+                        "id": 11073,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 10787,
+                          "id": 11071,
                           "name": "c",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10778,
-                          "src": "1339:1:15",
+                          "referencedDeclaration": 11062,
+                          "src": "1339:1:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -2166,18 +2166,18 @@
                         "operator": ">=",
                         "rightExpression": {
                           "argumentTypes": null,
-                          "id": 10788,
+                          "id": 11072,
                           "name": "_a",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 10773,
-                          "src": "1344:2:15",
+                          "referencedDeclaration": 11057,
+                          "src": "1344:2:14",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "1339:7:15",
+                        "src": "1339:7:14",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -2191,18 +2191,18 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 10786,
+                      "id": 11070,
                       "name": "assert",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11304,
-                      "src": "1332:6:15",
+                      "referencedDeclaration": 11588,
+                      "src": "1332:6:14",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 10790,
+                    "id": 11074,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2210,39 +2210,39 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1332:15:15",
+                    "src": "1332:15:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 10791,
+                  "id": 11075,
                   "nodeType": "ExpressionStatement",
-                  "src": "1332:15:15"
+                  "src": "1332:15:14"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 10792,
+                    "id": 11076,
                     "name": "c",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "referencedDeclaration": 10778,
-                    "src": "1360:1:15",
+                    "referencedDeclaration": 11062,
+                    "src": "1360:1:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 10779,
-                  "id": 10793,
+                  "functionReturnParameters": 11063,
+                  "id": 11077,
                   "nodeType": "Return",
-                  "src": "1353:8:15"
+                  "src": "1353:8:14"
                 }
               ]
             },
             "documentation": "@dev Adds two numbers, throws on overflow.",
-            "id": 10795,
+            "id": 11079,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2250,16 +2250,16 @@
             "name": "add",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 10776,
+              "id": 11060,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10773,
+                  "id": 11057,
                   "name": "_a",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1251:10:15",
+                  "scope": 11079,
+                  "src": "1251:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2267,10 +2267,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10772,
+                    "id": 11056,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1251:7:15",
+                    "src": "1251:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2281,11 +2281,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 10775,
+                  "id": 11059,
                   "name": "_b",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1263:10:15",
+                  "scope": 11079,
+                  "src": "1263:10:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2293,10 +2293,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10774,
+                    "id": 11058,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1263:7:15",
+                    "src": "1263:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2306,20 +2306,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1250:24:15"
+              "src": "1250:24:14"
             },
             "payable": false,
             "returnParameters": {
-              "id": 10779,
+              "id": 11063,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 10778,
+                  "id": 11062,
                   "name": "c",
                   "nodeType": "VariableDeclaration",
-                  "scope": 10795,
-                  "src": "1298:9:15",
+                  "scope": 11079,
+                  "src": "1298:9:14",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2327,10 +2327,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 10777,
+                    "id": 11061,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1298:7:15",
+                    "src": "1298:7:14",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2340,20 +2340,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1297:11:15"
+              "src": "1297:11:14"
             },
-            "scope": 10796,
-            "src": "1238:128:15",
+            "scope": 11080,
+            "src": "1238:128:14",
             "stateMutability": "pure",
             "superFunction": null,
             "visibility": "internal"
           }
         ],
-        "scope": 10797,
-        "src": "117:1251:15"
+        "scope": 11081,
+        "src": "117:1251:14"
       }
     ],
-    "src": "0:1369:15"
+    "src": "0:1369:14"
   },
   "compiler": {
     "name": "solc",
@@ -2361,5 +2361,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.953Z"
+  "updatedAt": "2019-01-11T15:59:13.125Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
index cdd8b296b..5d271123b 100644
--- a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
+++ b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimit.json
@@ -15401,10 +15401,10 @@
         }
       },
       "links": {},
-      "address": "0x1925b47c97c846d6ac31b31ae7a505e39ec56a69",
-      "transactionHash": "0xee7b4aab8cb0373c2c9db6976a4f6672876591ebb9d22db2ecf311138a5b539d"
+      "address": "0xd0f07c6ed0d4d681973af0b01a51079d4ab236a0",
+      "transactionHash": "0x0d7b35b2a01ffd18f2d1203be7d212a799a96b8a154068214a836f6549a49992"
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.980Z"
+  "updatedAt": "2019-01-11T16:09:31.189Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimitLive.json b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimitLive.json
index 1b4e5574a..d9277e6c1 100644
--- a/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimitLive.json
+++ b/blockchain/source/migration_artifacts/contracts/SimpleGatekeeperWithLimitLive.json
@@ -13018,8 +13018,8 @@
         }
       },
       "links": {},
-      "address": "0xcd3db92095244584530f406a226960ef98f13b61",
-      "transactionHash": "0xc0ac94f757268af80ce73b89733d1c03a3c8b9f34df8fbcb1d84bd957d1d35e6"
+      "address": "0x1946bcf133e26d69f7faae709874b8ef417664d7",
+      "transactionHash": "0x206c9ce0c34deba1a4735515c4afae8c81e46b36a7d14b9cf93030169f6dab93"
     },
     "8545": {
       "events": {
@@ -13183,5 +13183,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.344Z"
+  "updatedAt": "2019-01-11T16:09:31.176Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/StandardToken.json b/blockchain/source/migration_artifacts/contracts/StandardToken.json
index 43b343e72..b0e2d591d 100644
--- a/blockchain/source/migration_artifacts/contracts/StandardToken.json
+++ b/blockchain/source/migration_artifacts/contracts/StandardToken.json
@@ -223,22 +223,22 @@
   ],
   "bytecode": "0x608060405234801561001057600080fd5b506106ae806100206000396000f30060806040526004361061008d5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461009257806318160ddd146100ca57806323b872dd146100f1578063661884631461011b57806370a082311461013f578063a9059cbb14610160578063d73dd62314610184578063dd62ed3e146101a8575b600080fd5b34801561009e57600080fd5b506100b6600160a060020a03600435166024356101cf565b604080519115158252519081900360200190f35b3480156100d657600080fd5b506100df610235565b60408051918252519081900360200190f35b3480156100fd57600080fd5b506100b6600160a060020a036004358116906024351660443561023b565b34801561012757600080fd5b506100b6600160a060020a03600435166024356103b0565b34801561014b57600080fd5b506100df600160a060020a036004351661049f565b34801561016c57600080fd5b506100b6600160a060020a03600435166024356104ba565b34801561019057600080fd5b506100b6600160a060020a0360043516602435610599565b3480156101b457600080fd5b506100df600160a060020a0360043581169060243516610632565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561026057600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561029057600080fd5b600160a060020a03831615156102a557600080fd5b600160a060020a0384166000908152602081905260409020546102ce908363ffffffff61065d16565b600160a060020a038086166000908152602081905260408082209390935590851681522054610303908363ffffffff61066f16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610345908363ffffffff61065d16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b336000908152600260209081526040808320600160a060020a038616845290915281205480831061040457336000908152600260209081526040808320600160a060020a0388168452909152812055610439565b610414818463ffffffff61065d16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b336000908152602081905260408120548211156104d657600080fd5b600160a060020a03831615156104eb57600080fd5b3360009081526020819052604090205461050b908363ffffffff61065d16565b3360009081526020819052604080822092909255600160a060020a0385168152205461053d908363ffffffff61066f16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a03861684529091528120546105cd908363ffffffff61066f16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b60008282111561066957fe5b50900390565b8181018281101561067c57fe5b929150505600a165627a7a72305820aef462e65cb5e2ff82873a10fc33d70f06f7ada39991415c65989f4ca98547a80029",
   "deployedBytecode": "0x60806040526004361061008d5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663095ea7b3811461009257806318160ddd146100ca57806323b872dd146100f1578063661884631461011b57806370a082311461013f578063a9059cbb14610160578063d73dd62314610184578063dd62ed3e146101a8575b600080fd5b34801561009e57600080fd5b506100b6600160a060020a03600435166024356101cf565b604080519115158252519081900360200190f35b3480156100d657600080fd5b506100df610235565b60408051918252519081900360200190f35b3480156100fd57600080fd5b506100b6600160a060020a036004358116906024351660443561023b565b34801561012757600080fd5b506100b6600160a060020a03600435166024356103b0565b34801561014b57600080fd5b506100df600160a060020a036004351661049f565b34801561016c57600080fd5b506100b6600160a060020a03600435166024356104ba565b34801561019057600080fd5b506100b6600160a060020a0360043516602435610599565b3480156101b457600080fd5b506100df600160a060020a0360043581169060243516610632565b336000818152600260209081526040808320600160a060020a038716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60015490565b600160a060020a03831660009081526020819052604081205482111561026057600080fd5b600160a060020a038416600090815260026020908152604080832033845290915290205482111561029057600080fd5b600160a060020a03831615156102a557600080fd5b600160a060020a0384166000908152602081905260409020546102ce908363ffffffff61065d16565b600160a060020a038086166000908152602081905260408082209390935590851681522054610303908363ffffffff61066f16565b600160a060020a03808516600090815260208181526040808320949094559187168152600282528281203382529091522054610345908363ffffffff61065d16565b600160a060020a03808616600081815260026020908152604080832033845282529182902094909455805186815290519287169391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a35060019392505050565b336000908152600260209081526040808320600160a060020a038616845290915281205480831061040457336000908152600260209081526040808320600160a060020a0388168452909152812055610439565b610414818463ffffffff61065d16565b336000908152600260209081526040808320600160a060020a03891684529091529020555b336000818152600260209081526040808320600160a060020a0389168085529083529281902054815190815290519293927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060019392505050565b600160a060020a031660009081526020819052604090205490565b336000908152602081905260408120548211156104d657600080fd5b600160a060020a03831615156104eb57600080fd5b3360009081526020819052604090205461050b908363ffffffff61065d16565b3360009081526020819052604080822092909255600160a060020a0385168152205461053d908363ffffffff61066f16565b600160a060020a038416600081815260208181526040918290209390935580518581529051919233927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a350600192915050565b336000908152600260209081526040808320600160a060020a03861684529091528120546105cd908363ffffffff61066f16565b336000818152600260209081526040808320600160a060020a0389168085529083529281902085905580519485525191937f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929081900390910190a350600192915050565b600160a060020a03918216600090815260026020908152604080832093909416825291909152205490565b60008282111561066957fe5b50900390565b8181018281101561067c57fe5b929150505600a165627a7a72305820aef462e65cb5e2ff82873a10fc33d70f06f7ada39991415c65989f4ca98547a80029",
-  "sourceMap": "334:3780:20:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;334:3780:20;;;;;;;",
-  "deployedSourceMap": "334:3780:20:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:20;-1:-1:-1;;;;;1814:188:20;;;;;;;;;;;;;;;;;;;;;;;;;389:83:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:17;;;;;;;;;;;;;;;;;;;;726:470:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:20;-1:-1:-1;;;;;726:470:20;;;;;;;;;;;;3679:432;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:20;-1:-1:-1;;;;;3679:432:20;;;;;;;1149:99:17;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:17;-1:-1:-1;;;;;1149:99:17;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:17;-1:-1:-1;;;;;626:321:17;;;;;;;2926:296:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:20;-1:-1:-1;;;;;2926:296:20;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:20;-1:-1:-1;;;;;2321:153:20;;;;;;;;;;1814:188;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:20;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:20;1814:188;;;;:::o;389:83:17:-;455:12;;389:83;:::o;726:470:20:-;-1:-1:-1;;;;;864:15:20;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:20;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:20;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:20;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:20;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:20;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:20;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:20;726:470;;;;;:::o;3679:432::-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:20;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:20;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:20;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:20;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:20;;3679:432;-1:-1:-1;;;3679:432:20:o;1149:99:17:-;-1:-1:-1;;;;;1227:16:17;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:17;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:17;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:17;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:17;626:321;;;;:::o;2926:296:20:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:20;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:20;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:20;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:20;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1060:116:15:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:15;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
+  "sourceMap": "334:3780:19:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;334:3780:19;;;;;;;",
+  "deployedSourceMap": "334:3780:19:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1814:188;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1814:188:19;-1:-1:-1;;;;;1814:188:19;;;;;;;;;;;;;;;;;;;;;;;;;389:83:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;389:83:16;;;;;;;;;;;;;;;;;;;;726:470:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;726:470:19;-1:-1:-1;;;;;726:470:19;;;;;;;;;;;;3679:432;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3679:432:19;-1:-1:-1;;;;;3679:432:19;;;;;;;1149:99:16;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1149:99:16;-1:-1:-1;;;;;1149:99:16;;;;;626:321;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;626:321:16;-1:-1:-1;;;;;626:321:16;;;;;;;2926:296:19;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2926:296:19;-1:-1:-1;;;;;2926:296:19;;;;;;;2321:153;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2321:153:19;-1:-1:-1;;;;;2321:153:19;;;;;;;;;;1814:188;1901:10;1881:4;1893:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;1893:29:19;;;;;;;;;;;:38;;;1942;;;;;;;1881:4;;1893:29;;1901:10;;1942:38;;;;;;;;-1:-1:-1;1993:4:19;1814:188;;;;:::o;389:83:16:-;455:12;;389:83;:::o;726:470:19:-;-1:-1:-1;;;;;864:15:19;;832:4;864:15;;;;;;;;;;;854:25;;;846:34;;;;;;-1:-1:-1;;;;;904:14:19;;;;;;:7;:14;;;;;;;;919:10;904:26;;;;;;;;894:36;;;886:45;;;;;;-1:-1:-1;;;;;945:17:19;;;;937:26;;;;;;-1:-1:-1;;;;;988:15:19;;:8;:15;;;;;;;;;;;:27;;1008:6;988:27;:19;:27;:::i;:::-;-1:-1:-1;;;;;970:15:19;;;:8;:15;;;;;;;;;;;:45;;;;1037:13;;;;;;;:25;;1055:6;1037:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;1021:13:19;;;:8;:13;;;;;;;;;;;:41;;;;1097:14;;;;;:7;:14;;;;;1112:10;1097:26;;;;;;;:38;;1128:6;1097:38;:30;:38;:::i;:::-;-1:-1:-1;;;;;1068:14:19;;;;;;;:7;:14;;;;;;;;1083:10;1068:26;;;;;;;;:67;;;;1146:28;;;;;;;;;;;1068:14;;1146:28;;;;;;;;;;;-1:-1:-1;1187:4:19;726:470;;;;;:::o;3679:432::-;3826:10;3785:4;3818:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3818:29:19;;;;;;;;;;3857:28;;;3853:165;;3903:10;3927:1;3895:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3895:29:19;;;;;;;;;:33;3853:165;;;3981:30;:8;3994:16;3981:30;:12;:30;:::i;:::-;3957:10;3949:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3949:29:19;;;;;;;;;:62;3853:165;4037:10;4059:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;4028:61:19;;4059:29;;;;;;;;;;;4028:61;;;;;;;;;4037:10;4028:61;;;;;;;;;;;-1:-1:-1;4102:4:19;;3679:432;-1:-1:-1;;;3679:432:19:o;1149:99:16:-;-1:-1:-1;;;;;1227:16:16;1205:7;1227:16;;;;;;;;;;;;1149:99::o;626:321::-;728:10;689:4;719:20;;;;;;;;;;;709:30;;;701:39;;;;;;-1:-1:-1;;;;;754:17:16;;;;746:26;;;;;;811:10;802:8;:20;;;;;;;;;;;:32;;827:6;802:32;:24;:32;:::i;:::-;788:10;779:8;:20;;;;;;;;;;;:55;;;;-1:-1:-1;;;;;856:13:16;;;;;;:25;;874:6;856:25;:17;:25;:::i;:::-;-1:-1:-1;;;;;840:13:16;;:8;:13;;;;;;;;;;;;:41;;;;892:33;;;;;;;840:13;;901:10;;892:33;;;;;;;;;;-1:-1:-1;938:4:16;626:321;;;;:::o;2926:296:19:-;3089:10;3027:4;3081:19;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3081:29:19;;;;;;;;;;:46;;3115:11;3081:46;:33;:46;:::i;:::-;3049:10;3041:19;;;;:7;:19;;;;;;;;-1:-1:-1;;;;;3041:29:19;;;;;;;;;;;;:87;;;3139:61;;;;;;3041:29;;3139:61;;;;;;;;;;;-1:-1:-1;3213:4:19;2926:296;;;;:::o;2321:153::-;-1:-1:-1;;;;;2444:15:19;;;2420:7;2444:15;;;:7;:15;;;;;;;;:25;;;;;;;;;;;;;2321:153::o;1060:116:14:-;1120:7;1142:8;;;;1135:16;;;;-1:-1:-1;1164:7:14;;;1060:116::o;1238:128::-;1319:7;;;1339;;;;1332:15;;;;1238:128;;;;:::o",
   "source": "pragma solidity ^0.4.24;\n\nimport \"./BasicToken.sol\";\nimport \"./ERC20.sol\";\n\n\n/**\n * @title Standard ERC20 token\n *\n * @dev Implementation of the basic standard token.\n * https://github.com/ethereum/EIPs/issues/20\n * Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol\n */\ncontract StandardToken is ERC20, BasicToken {\n\n  mapping (address => mapping (address => uint256)) internal allowed;\n\n\n  /**\n   * @dev Transfer tokens from one address to another\n   * @param _from address The address which you want to send tokens from\n   * @param _to address The address which you want to transfer to\n   * @param _value uint256 the amount of tokens to be transferred\n   */\n  function transferFrom(\n    address _from,\n    address _to,\n    uint256 _value\n  )\n    public\n    returns (bool)\n  {\n    require(_value <= balances[_from]);\n    require(_value <= allowed[_from][msg.sender]);\n    require(_to != address(0));\n\n    balances[_from] = balances[_from].sub(_value);\n    balances[_to] = balances[_to].add(_value);\n    allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_value);\n    emit Transfer(_from, _to, _value);\n    return true;\n  }\n\n  /**\n   * @dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\n   * Beware that changing an allowance with this method brings the risk that someone may use both the old\n   * and the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\n   * race condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\n   * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n   * @param _spender The address which will spend the funds.\n   * @param _value The amount of tokens to be spent.\n   */\n  function approve(address _spender, uint256 _value) public returns (bool) {\n    allowed[msg.sender][_spender] = _value;\n    emit Approval(msg.sender, _spender, _value);\n    return true;\n  }\n\n  /**\n   * @dev Function to check the amount of tokens that an owner allowed to a spender.\n   * @param _owner address The address which owns the funds.\n   * @param _spender address The address which will spend the funds.\n   * @return A uint256 specifying the amount of tokens still available for the spender.\n   */\n  function allowance(\n    address _owner,\n    address _spender\n   )\n    public\n    view\n    returns (uint256)\n  {\n    return allowed[_owner][_spender];\n  }\n\n  /**\n   * @dev Increase the amount of tokens that an owner allowed to a spender.\n   * approve should be called when allowed[_spender] == 0. To increment\n   * allowed value is better to use this function to avoid 2 calls (and wait until\n   * the first transaction is mined)\n   * From MonolithDAO Token.sol\n   * @param _spender The address which will spend the funds.\n   * @param _addedValue The amount of tokens to increase the allowance by.\n   */\n  function increaseApproval(\n    address _spender,\n    uint256 _addedValue\n  )\n    public\n    returns (bool)\n  {\n    allowed[msg.sender][_spender] = (\n      allowed[msg.sender][_spender].add(_addedValue));\n    emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n    return true;\n  }\n\n  /**\n   * @dev Decrease the amount of tokens that an owner allowed to a spender.\n   * approve should be called when allowed[_spender] == 0. To decrement\n   * allowed value is better to use this function to avoid 2 calls (and wait until\n   * the first transaction is mined)\n   * From MonolithDAO Token.sol\n   * @param _spender The address which will spend the funds.\n   * @param _subtractedValue The amount of tokens to decrease the allowance by.\n   */\n  function decreaseApproval(\n    address _spender,\n    uint256 _subtractedValue\n  )\n    public\n    returns (bool)\n  {\n    uint256 oldValue = allowed[msg.sender][_spender];\n    if (_subtractedValue >= oldValue) {\n      allowed[msg.sender][_spender] = 0;\n    } else {\n      allowed[msg.sender][_spender] = oldValue.sub(_subtractedValue);\n    }\n    emit Approval(msg.sender, _spender, allowed[msg.sender][_spender]);\n    return true;\n  }\n\n}\n",
   "sourcePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
   "ast": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
     "exportedSymbols": {
       "StandardToken": [
-        11300
+        11584
       ]
     },
-    "id": 11301,
+    "id": 11585,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 11055,
+        "id": 11339,
         "literals": [
           "solidity",
           "^",
@@ -246,27 +246,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:20"
+        "src": "0:24:19"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
         "file": "./BasicToken.sol",
-        "id": 11056,
+        "id": 11340,
         "nodeType": "ImportDirective",
-        "scope": 11301,
-        "sourceUnit": 10979,
-        "src": "26:26:20",
+        "scope": 11585,
+        "sourceUnit": 11263,
+        "src": "26:26:19",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
         "file": "./ERC20.sol",
-        "id": 11057,
+        "id": 11341,
         "nodeType": "ImportDirective",
-        "scope": 11301,
-        "sourceUnit": 11022,
-        "src": "53:21:20",
+        "scope": 11585,
+        "sourceUnit": 11306,
+        "src": "53:21:19",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -276,64 +276,64 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 11058,
+              "id": 11342,
               "name": "ERC20",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11021,
-              "src": "360:5:20",
+              "referencedDeclaration": 11305,
+              "src": "360:5:19",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20_$11021",
+                "typeIdentifier": "t_contract$_ERC20_$11305",
                 "typeString": "contract ERC20"
               }
             },
-            "id": 11059,
+            "id": 11343,
             "nodeType": "InheritanceSpecifier",
-            "src": "360:5:20"
+            "src": "360:5:19"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 11060,
+              "id": 11344,
               "name": "BasicToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10978,
-              "src": "367:10:20",
+              "referencedDeclaration": 11262,
+              "src": "367:10:19",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_BasicToken_$10978",
+                "typeIdentifier": "t_contract$_BasicToken_$11262",
                 "typeString": "contract BasicToken"
               }
             },
-            "id": 11061,
+            "id": 11345,
             "nodeType": "InheritanceSpecifier",
-            "src": "367:10:20"
+            "src": "367:10:19"
           }
         ],
         "contractDependencies": [
-          10978,
-          11021,
-          11053
+          11262,
+          11305,
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol",
         "fullyImplemented": true,
-        "id": 11300,
+        "id": 11584,
         "linearizedBaseContracts": [
-          11300,
-          10978,
-          11021,
-          11053
+          11584,
+          11262,
+          11305,
+          11337
         ],
         "name": "StandardToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 11067,
+            "id": 11351,
             "name": "allowed",
             "nodeType": "VariableDeclaration",
-            "scope": 11300,
-            "src": "383:66:20",
+            "scope": 11584,
+            "src": "383:66:19",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -341,46 +341,46 @@
               "typeString": "mapping(address => mapping(address => uint256))"
             },
             "typeName": {
-              "id": 11066,
+              "id": 11350,
               "keyType": {
-                "id": 11062,
+                "id": 11346,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "392:7:20",
+                "src": "392:7:19",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "383:49:20",
+              "src": "383:49:19",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(address => uint256))"
               },
               "valueType": {
-                "id": 11065,
+                "id": 11349,
                 "keyType": {
-                  "id": 11063,
+                  "id": 11347,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "412:7:20",
+                  "src": "412:7:19",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "403:28:20",
+                "src": "403:28:19",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                   "typeString": "mapping(address => uint256)"
                 },
                 "valueType": {
-                  "id": 11064,
+                  "id": 11348,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "423:7:20",
+                  "src": "423:7:19",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -393,9 +393,9 @@
           },
           {
             "body": {
-              "id": 11152,
+              "id": 11436,
               "nodeType": "Block",
-              "src": "840:356:20",
+              "src": "840:356:19",
               "statements": [
                 {
                   "expression": {
@@ -407,19 +407,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 11083,
+                        "id": 11367,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11079,
+                          "id": 11363,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "854:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "854:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -431,26 +431,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11080,
+                            "id": 11364,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "864:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "864:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11082,
+                          "id": 11366,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11081,
+                            "id": 11365,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11069,
-                            "src": "873:5:20",
+                            "referencedDeclaration": 11353,
+                            "src": "873:5:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -461,13 +461,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "864:15:20",
+                          "src": "864:15:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "854:25:20",
+                        "src": "854:25:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -481,21 +481,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11078,
+                      "id": 11362,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "846:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "846:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11084,
+                    "id": 11368,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -503,15 +503,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "846:34:20",
+                    "src": "846:34:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11085,
+                  "id": 11369,
                   "nodeType": "ExpressionStatement",
-                  "src": "846:34:20"
+                  "src": "846:34:19"
                 },
                 {
                   "expression": {
@@ -523,19 +523,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 11094,
+                        "id": 11378,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11087,
+                          "id": 11371,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "894:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "894:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -549,26 +549,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 11088,
+                              "id": 11372,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11067,
-                              "src": "904:7:20",
+                              "referencedDeclaration": 11351,
+                              "src": "904:7:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 11090,
+                            "id": 11374,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11089,
+                              "id": 11373,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11069,
-                              "src": "912:5:20",
+                              "referencedDeclaration": 11353,
+                              "src": "912:5:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -579,29 +579,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "904:14:20",
+                            "src": "904:14:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11093,
+                          "id": 11377,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11091,
+                              "id": 11375,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "919:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "919:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11092,
+                            "id": 11376,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -609,7 +609,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "919:10:20",
+                            "src": "919:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -620,13 +620,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "904:26:20",
+                          "src": "904:26:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "894:36:20",
+                        "src": "894:36:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -640,21 +640,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11086,
+                      "id": 11370,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "886:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "886:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11095,
+                    "id": 11379,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -662,15 +662,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "886:45:20",
+                    "src": "886:45:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11096,
+                  "id": 11380,
                   "nodeType": "ExpressionStatement",
-                  "src": "886:45:20"
+                  "src": "886:45:19"
                 },
                 {
                   "expression": {
@@ -682,19 +682,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 11102,
+                        "id": 11386,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11098,
+                          "id": 11382,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11071,
-                          "src": "945:3:20",
+                          "referencedDeclaration": 11355,
+                          "src": "945:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -708,14 +708,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 11100,
+                              "id": 11384,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "960:1:20",
+                              "src": "960:1:19",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -731,20 +731,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 11099,
+                            "id": 11383,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "952:7:20",
+                            "src": "952:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 11101,
+                          "id": 11385,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -752,13 +752,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "952:10:20",
+                          "src": "952:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "945:17:20",
+                        "src": "945:17:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -772,21 +772,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11097,
+                      "id": 11381,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "937:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "937:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11103,
+                    "id": 11387,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -794,20 +794,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "937:26:20",
+                    "src": "937:26:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11104,
+                  "id": 11388,
                   "nodeType": "ExpressionStatement",
-                  "src": "937:26:20"
+                  "src": "937:26:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11114,
+                    "id": 11398,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -816,26 +816,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11105,
+                        "id": 11389,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "970:8:20",
+                        "referencedDeclaration": 11179,
+                        "src": "970:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11107,
+                      "id": 11391,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11106,
+                        "id": 11390,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11069,
-                        "src": "979:5:20",
+                        "referencedDeclaration": 11353,
+                        "src": "979:5:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -846,7 +846,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "970:15:20",
+                      "src": "970:15:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -859,12 +859,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11112,
+                          "id": 11396,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1008:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1008:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -882,26 +882,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11108,
+                            "id": 11392,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "988:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "988:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11110,
+                          "id": 11394,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11109,
+                            "id": 11393,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11069,
-                            "src": "997:5:20",
+                            "referencedDeclaration": 11353,
+                            "src": "997:5:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -912,27 +912,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "988:15:20",
+                          "src": "988:15:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11111,
+                        "id": 11395,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "988:19:20",
+                        "referencedDeclaration": 11055,
+                        "src": "988:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11113,
+                      "id": 11397,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -940,26 +940,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "988:27:20",
+                      "src": "988:27:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "970:45:20",
+                    "src": "970:45:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11115,
+                  "id": 11399,
                   "nodeType": "ExpressionStatement",
-                  "src": "970:45:20"
+                  "src": "970:45:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11125,
+                    "id": 11409,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -968,26 +968,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11116,
+                        "id": 11400,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "1021:8:20",
+                        "referencedDeclaration": 11179,
+                        "src": "1021:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11118,
+                      "id": 11402,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11117,
+                        "id": 11401,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11071,
-                        "src": "1030:3:20",
+                        "referencedDeclaration": 11355,
+                        "src": "1030:3:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -998,7 +998,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1021:13:20",
+                      "src": "1021:13:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1011,12 +1011,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11123,
+                          "id": 11407,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1055:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1055:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1034,26 +1034,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11119,
+                            "id": 11403,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "1037:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "1037:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11121,
+                          "id": 11405,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11120,
+                            "id": 11404,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11071,
-                            "src": "1046:3:20",
+                            "referencedDeclaration": 11355,
+                            "src": "1046:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1064,27 +1064,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1037:13:20",
+                          "src": "1037:13:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11122,
+                        "id": 11406,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "1037:17:20",
+                        "referencedDeclaration": 11079,
+                        "src": "1037:17:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11124,
+                      "id": 11408,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1092,26 +1092,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1037:25:20",
+                      "src": "1037:25:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1021:41:20",
+                    "src": "1021:41:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11126,
+                  "id": 11410,
                   "nodeType": "ExpressionStatement",
-                  "src": "1021:41:20"
+                  "src": "1021:41:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11142,
+                    "id": 11426,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1122,26 +1122,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11127,
+                          "id": 11411,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "1068:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "1068:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11131,
+                        "id": 11415,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11128,
+                          "id": 11412,
                           "name": "_from",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11069,
-                          "src": "1076:5:20",
+                          "referencedDeclaration": 11353,
+                          "src": "1076:5:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1152,29 +1152,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1068:14:20",
+                        "src": "1068:14:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11132,
+                      "id": 11416,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11129,
+                          "id": 11413,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1083:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "1083:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11130,
+                        "id": 11414,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1182,7 +1182,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1083:10:20",
+                        "src": "1083:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1193,7 +1193,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1068:26:20",
+                      "src": "1068:26:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1206,12 +1206,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11140,
+                          "id": 11424,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1128:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1128:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -1231,26 +1231,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 11133,
+                              "id": 11417,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11067,
-                              "src": "1097:7:20",
+                              "referencedDeclaration": 11351,
+                              "src": "1097:7:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 11135,
+                            "id": 11419,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11134,
+                              "id": 11418,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11069,
-                              "src": "1105:5:20",
+                              "referencedDeclaration": 11353,
+                              "src": "1105:5:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -1261,29 +1261,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1097:14:20",
+                            "src": "1097:14:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11138,
+                          "id": 11422,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11136,
+                              "id": 11420,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "1112:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "1112:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11137,
+                            "id": 11421,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -1291,7 +1291,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "1112:10:20",
+                            "src": "1112:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -1302,27 +1302,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1097:26:20",
+                          "src": "1097:26:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11139,
+                        "id": 11423,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "1097:30:20",
+                        "referencedDeclaration": 11055,
+                        "src": "1097:30:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11141,
+                      "id": 11425,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -1330,21 +1330,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:38:20",
+                      "src": "1097:38:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1068:67:20",
+                    "src": "1068:67:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11143,
+                  "id": 11427,
                   "nodeType": "ExpressionStatement",
-                  "src": "1068:67:20"
+                  "src": "1068:67:19"
                 },
                 {
                   "eventCall": {
@@ -1352,12 +1352,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 11145,
+                        "id": 11429,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11069,
-                        "src": "1155:5:20",
+                        "referencedDeclaration": 11353,
+                        "src": "1155:5:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1365,12 +1365,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11146,
+                        "id": 11430,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11071,
-                        "src": "1162:3:20",
+                        "referencedDeclaration": 11355,
+                        "src": "1162:3:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1378,12 +1378,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11147,
+                        "id": 11431,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11073,
-                        "src": "1167:6:20",
+                        "referencedDeclaration": 11357,
+                        "src": "1167:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1405,18 +1405,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11144,
+                      "id": 11428,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11052,
-                      "src": "1146:8:20",
+                      "referencedDeclaration": 11336,
+                      "src": "1146:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11148,
+                    "id": 11432,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1424,28 +1424,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1146:28:20",
+                    "src": "1146:28:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11149,
+                  "id": 11433,
                   "nodeType": "EmitStatement",
-                  "src": "1141:33:20"
+                  "src": "1141:33:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11150,
+                    "id": 11434,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1187:4:20",
+                    "src": "1187:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1453,15 +1453,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11077,
-                  "id": 11151,
+                  "functionReturnParameters": 11361,
+                  "id": 11435,
                   "nodeType": "Return",
-                  "src": "1180:11:20"
+                  "src": "1180:11:19"
                 }
               ]
             },
             "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred",
-            "id": 11153,
+            "id": 11437,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1469,16 +1469,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11074,
+              "id": 11358,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11069,
+                  "id": 11353,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "753:13:20",
+                  "scope": 11437,
+                  "src": "753:13:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1486,10 +1486,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11068,
+                    "id": 11352,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:20",
+                    "src": "753:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1500,11 +1500,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11071,
+                  "id": 11355,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "772:11:20",
+                  "scope": 11437,
+                  "src": "772:11:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1512,10 +1512,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11070,
+                    "id": 11354,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:20",
+                    "src": "772:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1526,11 +1526,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11073,
+                  "id": 11357,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "789:14:20",
+                  "scope": 11437,
+                  "src": "789:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1538,10 +1538,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11072,
+                    "id": 11356,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "789:7:20",
+                    "src": "789:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1551,20 +1551,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "747:60:20"
+              "src": "747:60:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11077,
+              "id": 11361,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11076,
+                  "id": 11360,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "832:4:20",
+                  "scope": 11437,
+                  "src": "832:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1572,10 +1572,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11075,
+                    "id": 11359,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "832:4:20",
+                    "src": "832:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1585,24 +1585,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "831:6:20"
+              "src": "831:6:19"
             },
-            "scope": 11300,
-            "src": "726:470:20",
+            "scope": 11584,
+            "src": "726:470:19",
             "stateMutability": "nonpayable",
-            "superFunction": 11003,
+            "superFunction": 11287,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11180,
+              "id": 11464,
               "nodeType": "Block",
-              "src": "1887:115:20",
+              "src": "1887:115:19",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11169,
+                    "id": 11453,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1613,34 +1613,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11162,
+                          "id": 11446,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "1893:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "1893:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11166,
+                        "id": 11450,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 11163,
+                            "id": 11447,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "1901:3:20",
+                            "referencedDeclaration": 11599,
+                            "src": "1901:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 11164,
+                          "id": 11448,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -1648,7 +1648,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1901:10:20",
+                          "src": "1901:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -1659,21 +1659,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1893:19:20",
+                        "src": "1893:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11167,
+                      "id": 11451,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11165,
+                        "id": 11449,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11155,
-                        "src": "1913:8:20",
+                        "referencedDeclaration": 11439,
+                        "src": "1913:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1684,7 +1684,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1893:29:20",
+                      "src": "1893:29:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -1694,26 +1694,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 11168,
+                      "id": 11452,
                       "name": "_value",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11157,
-                      "src": "1925:6:20",
+                      "referencedDeclaration": 11441,
+                      "src": "1925:6:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1893:38:20",
+                    "src": "1893:38:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11170,
+                  "id": 11454,
                   "nodeType": "ExpressionStatement",
-                  "src": "1893:38:20"
+                  "src": "1893:38:19"
                 },
                 {
                   "eventCall": {
@@ -1723,18 +1723,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11172,
+                          "id": 11456,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1951:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "1951:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11173,
+                        "id": 11457,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -1742,7 +1742,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1951:10:20",
+                        "src": "1951:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1750,12 +1750,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11174,
+                        "id": 11458,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11155,
-                        "src": "1963:8:20",
+                        "referencedDeclaration": 11439,
+                        "src": "1963:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1763,12 +1763,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11175,
+                        "id": 11459,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11157,
-                        "src": "1973:6:20",
+                        "referencedDeclaration": 11441,
+                        "src": "1973:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -1790,18 +1790,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11171,
+                      "id": 11455,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "1942:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "1942:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11176,
+                    "id": 11460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -1809,28 +1809,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1942:38:20",
+                    "src": "1942:38:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11177,
+                  "id": 11461,
                   "nodeType": "EmitStatement",
-                  "src": "1937:43:20"
+                  "src": "1937:43:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11178,
+                    "id": 11462,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1993:4:20",
+                    "src": "1993:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -1838,15 +1838,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11161,
-                  "id": 11179,
+                  "functionReturnParameters": 11445,
+                  "id": 11463,
                   "nodeType": "Return",
-                  "src": "1986:11:20"
+                  "src": "1986:11:19"
                 }
               ]
             },
             "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.",
-            "id": 11181,
+            "id": 11465,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -1854,16 +1854,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11158,
+              "id": 11442,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11155,
+                  "id": 11439,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1831:16:20",
+                  "scope": 11465,
+                  "src": "1831:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1871,10 +1871,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11154,
+                    "id": 11438,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1831:7:20",
+                    "src": "1831:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -1885,11 +1885,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11157,
+                  "id": 11441,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1849:14:20",
+                  "scope": 11465,
+                  "src": "1849:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1897,10 +1897,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11156,
+                    "id": 11440,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1849:7:20",
+                    "src": "1849:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -1910,20 +1910,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1830:34:20"
+              "src": "1830:34:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11161,
+              "id": 11445,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11160,
+                  "id": 11444,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1881:4:20",
+                  "scope": 11465,
+                  "src": "1881:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -1931,10 +1931,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11159,
+                    "id": 11443,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1881:4:20",
+                    "src": "1881:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -1944,19 +1944,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1880:6:20"
+              "src": "1880:6:19"
             },
-            "scope": 11300,
-            "src": "1814:188:20",
+            "scope": 11584,
+            "src": "1814:188:19",
             "stateMutability": "nonpayable",
-            "superFunction": 11012,
+            "superFunction": 11296,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11196,
+              "id": 11480,
               "nodeType": "Block",
-              "src": "2431:43:20",
+              "src": "2431:43:19",
               "statements": [
                 {
                   "expression": {
@@ -1965,26 +1965,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11190,
+                        "id": 11474,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11067,
-                        "src": "2444:7:20",
+                        "referencedDeclaration": 11351,
+                        "src": "2444:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 11192,
+                      "id": 11476,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11191,
+                        "id": 11475,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11183,
-                        "src": "2452:6:20",
+                        "referencedDeclaration": 11467,
+                        "src": "2452:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -1995,21 +1995,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "2444:15:20",
+                      "src": "2444:15:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 11194,
+                    "id": 11478,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 11193,
+                      "id": 11477,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11185,
-                      "src": "2460:8:20",
+                      "referencedDeclaration": 11469,
+                      "src": "2460:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2020,21 +2020,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2444:25:20",
+                    "src": "2444:25:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 11189,
-                  "id": 11195,
+                  "functionReturnParameters": 11473,
+                  "id": 11479,
                   "nodeType": "Return",
-                  "src": "2437:32:20"
+                  "src": "2437:32:19"
                 }
               ]
             },
             "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.",
-            "id": 11197,
+            "id": 11481,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -2042,16 +2042,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11186,
+              "id": 11470,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11183,
+                  "id": 11467,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2345:14:20",
+                  "scope": 11481,
+                  "src": "2345:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2059,10 +2059,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11182,
+                    "id": 11466,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:20",
+                    "src": "2345:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2073,11 +2073,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11185,
+                  "id": 11469,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2365:16:20",
+                  "scope": 11481,
+                  "src": "2365:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2085,10 +2085,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11184,
+                    "id": 11468,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2365:7:20",
+                    "src": "2365:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2098,20 +2098,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2339:47:20"
+              "src": "2339:47:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11189,
+              "id": 11473,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11188,
+                  "id": 11472,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2420:7:20",
+                  "scope": 11481,
+                  "src": "2420:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2119,10 +2119,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11187,
+                    "id": 11471,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2420:7:20",
+                    "src": "2420:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2132,24 +2132,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2419:9:20"
+              "src": "2419:9:19"
             },
-            "scope": 11300,
-            "src": "2321:153:20",
+            "scope": 11584,
+            "src": "2321:153:19",
             "stateMutability": "view",
-            "superFunction": 10992,
+            "superFunction": 11276,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11238,
+              "id": 11522,
               "nodeType": "Block",
-              "src": "3035:187:20",
+              "src": "3035:187:19",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11222,
+                    "id": 11506,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2160,34 +2160,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11206,
+                          "id": 11490,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "3041:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "3041:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11210,
+                        "id": 11494,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 11207,
+                            "id": 11491,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "3049:3:20",
+                            "referencedDeclaration": 11599,
+                            "src": "3049:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 11208,
+                          "id": 11492,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2195,7 +2195,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "3049:10:20",
+                          "src": "3049:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2206,21 +2206,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3041:19:20",
+                        "src": "3041:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11211,
+                      "id": 11495,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11209,
+                        "id": 11493,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11199,
-                        "src": "3061:8:20",
+                        "referencedDeclaration": 11483,
+                        "src": "3061:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2231,7 +2231,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3041:29:20",
+                      "src": "3041:29:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2247,12 +2247,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 11219,
+                              "id": 11503,
                               "name": "_addedValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11201,
-                              "src": "3115:11:20",
+                              "referencedDeclaration": 11485,
+                              "src": "3115:11:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -2272,34 +2272,34 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 11212,
+                                  "id": 11496,
                                   "name": "allowed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11067,
-                                  "src": "3081:7:20",
+                                  "referencedDeclaration": 11351,
+                                  "src": "3081:7:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                     "typeString": "mapping(address => mapping(address => uint256))"
                                   }
                                 },
-                                "id": 11215,
+                                "id": 11499,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 11213,
+                                    "id": 11497,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "3089:3:20",
+                                    "referencedDeclaration": 11599,
+                                    "src": "3089:3:19",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 11214,
+                                  "id": 11498,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -2307,7 +2307,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3089:10:20",
+                                  "src": "3089:10:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -2318,21 +2318,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "3081:19:20",
+                                "src": "3081:19:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                   "typeString": "mapping(address => uint256)"
                                 }
                               },
-                              "id": 11217,
+                              "id": 11501,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 11216,
+                                "id": 11500,
                                 "name": "_spender",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11199,
-                                "src": "3101:8:20",
+                                "referencedDeclaration": 11483,
+                                "src": "3101:8:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2343,27 +2343,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3081:29:20",
+                              "src": "3081:29:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 11218,
+                            "id": 11502,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10795,
-                            "src": "3081:33:20",
+                            "referencedDeclaration": 11079,
+                            "src": "3081:33:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 11220,
+                          "id": 11504,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2371,35 +2371,35 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3081:46:20",
+                          "src": "3081:46:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         }
                       ],
-                      "id": 11221,
+                      "id": 11505,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "TupleExpression",
-                      "src": "3073:55:20",
+                      "src": "3073:55:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3041:87:20",
+                    "src": "3041:87:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11223,
+                  "id": 11507,
                   "nodeType": "ExpressionStatement",
-                  "src": "3041:87:20"
+                  "src": "3041:87:19"
                 },
                 {
                   "eventCall": {
@@ -2409,18 +2409,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11225,
+                          "id": 11509,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "3148:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "3148:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11226,
+                        "id": 11510,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2428,7 +2428,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3148:10:20",
+                        "src": "3148:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2436,12 +2436,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11227,
+                        "id": 11511,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11199,
-                        "src": "3160:8:20",
+                        "referencedDeclaration": 11483,
+                        "src": "3160:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2453,34 +2453,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11228,
+                            "id": 11512,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11067,
-                            "src": "3170:7:20",
+                            "referencedDeclaration": 11351,
+                            "src": "3170:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 11231,
+                          "id": 11515,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11229,
+                              "id": 11513,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "3178:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "3178:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11230,
+                            "id": 11514,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -2488,7 +2488,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3178:10:20",
+                            "src": "3178:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -2499,21 +2499,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3170:19:20",
+                          "src": "3170:19:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 11233,
+                        "id": 11517,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11232,
+                          "id": 11516,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11199,
-                          "src": "3190:8:20",
+                          "referencedDeclaration": 11483,
+                          "src": "3190:8:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -2524,7 +2524,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3170:29:20",
+                        "src": "3170:29:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2546,18 +2546,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11224,
+                      "id": 11508,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "3139:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "3139:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11234,
+                    "id": 11518,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -2565,28 +2565,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3139:61:20",
+                    "src": "3139:61:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11235,
+                  "id": 11519,
                   "nodeType": "EmitStatement",
-                  "src": "3134:66:20"
+                  "src": "3134:66:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11236,
+                    "id": 11520,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "3213:4:20",
+                    "src": "3213:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -2594,15 +2594,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11205,
-                  "id": 11237,
+                  "functionReturnParameters": 11489,
+                  "id": 11521,
                   "nodeType": "Return",
-                  "src": "3206:11:20"
+                  "src": "3206:11:19"
                 }
               ]
             },
             "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.",
-            "id": 11239,
+            "id": 11523,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -2610,16 +2610,16 @@
             "name": "increaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11202,
+              "id": 11486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11199,
+                  "id": 11483,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "2957:16:20",
+                  "scope": 11523,
+                  "src": "2957:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2627,10 +2627,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11198,
+                    "id": 11482,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2957:7:20",
+                    "src": "2957:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -2641,11 +2641,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11201,
+                  "id": 11485,
                   "name": "_addedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "2979:19:20",
+                  "scope": 11523,
+                  "src": "2979:19:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2653,10 +2653,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11200,
+                    "id": 11484,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2979:7:20",
+                    "src": "2979:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -2666,20 +2666,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2951:51:20"
+              "src": "2951:51:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11205,
+              "id": 11489,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11204,
+                  "id": 11488,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "3027:4:20",
+                  "scope": 11523,
+                  "src": "3027:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -2687,10 +2687,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11203,
+                    "id": 11487,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3027:4:20",
+                    "src": "3027:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -2700,32 +2700,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3026:6:20"
+              "src": "3026:6:19"
             },
-            "scope": 11300,
-            "src": "2926:296:20",
+            "scope": 11584,
+            "src": "2926:296:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11298,
+              "id": 11582,
               "nodeType": "Block",
-              "src": "3793:318:20",
+              "src": "3793:318:19",
               "statements": [
                 {
                   "assignments": [
-                    11249
+                    11533
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 11249,
+                      "id": 11533,
                       "name": "oldValue",
                       "nodeType": "VariableDeclaration",
-                      "scope": 11299,
-                      "src": "3799:16:20",
+                      "scope": 11583,
+                      "src": "3799:16:19",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -2733,10 +2733,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 11248,
+                        "id": 11532,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "3799:7:20",
+                        "src": "3799:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -2746,41 +2746,41 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 11256,
+                  "id": 11540,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11250,
+                        "id": 11534,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11067,
-                        "src": "3818:7:20",
+                        "referencedDeclaration": 11351,
+                        "src": "3818:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 11253,
+                      "id": 11537,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11251,
+                          "id": 11535,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "3826:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "3826:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11252,
+                        "id": 11536,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -2788,7 +2788,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3826:10:20",
+                        "src": "3826:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -2799,21 +2799,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3818:19:20",
+                      "src": "3818:19:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 11255,
+                    "id": 11539,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 11254,
+                      "id": 11538,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11241,
-                      "src": "3838:8:20",
+                      "referencedDeclaration": 11525,
+                      "src": "3838:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -2824,14 +2824,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3818:29:20",
+                    "src": "3818:29:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "3799:48:20"
+                  "src": "3799:48:19"
                 },
                 {
                   "condition": {
@@ -2840,19 +2840,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 11259,
+                    "id": 11543,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 11257,
+                      "id": 11541,
                       "name": "_subtractedValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11243,
-                      "src": "3857:16:20",
+                      "referencedDeclaration": 11527,
+                      "src": "3857:16:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -2862,32 +2862,32 @@
                     "operator": ">=",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 11258,
+                      "id": 11542,
                       "name": "oldValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11249,
-                      "src": "3877:8:20",
+                      "referencedDeclaration": 11533,
+                      "src": "3877:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3857:28:20",
+                    "src": "3857:28:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 11282,
+                    "id": 11566,
                     "nodeType": "Block",
-                    "src": "3941:77:20",
+                    "src": "3941:77:19",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11280,
+                          "id": 11564,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -2898,34 +2898,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 11270,
+                                "id": 11554,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11067,
-                                "src": "3949:7:20",
+                                "referencedDeclaration": 11351,
+                                "src": "3949:7:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 11274,
+                              "id": 11558,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 11271,
+                                  "id": 11555,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "3957:3:20",
+                                  "referencedDeclaration": 11599,
+                                  "src": "3957:3:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 11272,
+                                "id": 11556,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -2933,7 +2933,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3957:10:20",
+                                "src": "3957:10:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -2944,21 +2944,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3949:19:20",
+                              "src": "3949:19:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 11275,
+                            "id": 11559,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11273,
+                              "id": 11557,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11241,
-                              "src": "3969:8:20",
+                              "referencedDeclaration": 11525,
+                              "src": "3969:8:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -2969,7 +2969,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3949:29:20",
+                            "src": "3949:29:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -2982,12 +2982,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 11278,
+                                "id": 11562,
                                 "name": "_subtractedValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11243,
-                                "src": "3994:16:20",
+                                "referencedDeclaration": 11527,
+                                "src": "3994:16:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -3003,32 +3003,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 11276,
+                                "id": 11560,
                                 "name": "oldValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11249,
-                                "src": "3981:8:20",
+                                "referencedDeclaration": 11533,
+                                "src": "3981:8:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 11277,
+                              "id": 11561,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "3981:12:20",
+                              "referencedDeclaration": 11055,
+                              "src": "3981:12:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 11279,
+                            "id": 11563,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3036,36 +3036,36 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3981:30:20",
+                            "src": "3981:30:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3949:62:20",
+                          "src": "3949:62:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11281,
+                        "id": 11565,
                         "nodeType": "ExpressionStatement",
-                        "src": "3949:62:20"
+                        "src": "3949:62:19"
                       }
                     ]
                   },
-                  "id": 11283,
+                  "id": 11567,
                   "nodeType": "IfStatement",
-                  "src": "3853:165:20",
+                  "src": "3853:165:19",
                   "trueBody": {
-                    "id": 11269,
+                    "id": 11553,
                     "nodeType": "Block",
-                    "src": "3887:48:20",
+                    "src": "3887:48:19",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11267,
+                          "id": 11551,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -3076,34 +3076,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 11260,
+                                "id": 11544,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11067,
-                                "src": "3895:7:20",
+                                "referencedDeclaration": 11351,
+                                "src": "3895:7:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 11264,
+                              "id": 11548,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 11261,
+                                  "id": 11545,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "3903:3:20",
+                                  "referencedDeclaration": 11599,
+                                  "src": "3903:3:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 11262,
+                                "id": 11546,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -3111,7 +3111,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3903:10:20",
+                                "src": "3903:10:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -3122,21 +3122,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3895:19:20",
+                              "src": "3895:19:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 11265,
+                            "id": 11549,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11263,
+                              "id": 11547,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11241,
-                              "src": "3915:8:20",
+                              "referencedDeclaration": 11525,
+                              "src": "3915:8:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3147,7 +3147,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3895:29:20",
+                            "src": "3895:29:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -3158,14 +3158,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 11266,
+                            "id": 11550,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3927:1:20",
+                            "src": "3927:1:19",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -3173,15 +3173,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "3895:33:20",
+                          "src": "3895:33:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11268,
+                        "id": 11552,
                         "nodeType": "ExpressionStatement",
-                        "src": "3895:33:20"
+                        "src": "3895:33:19"
                       }
                     ]
                   }
@@ -3194,18 +3194,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11285,
+                          "id": 11569,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "4037:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "4037:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11286,
+                        "id": 11570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -3213,7 +3213,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4037:10:20",
+                        "src": "4037:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3221,12 +3221,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11287,
+                        "id": 11571,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11241,
-                        "src": "4049:8:20",
+                        "referencedDeclaration": 11525,
+                        "src": "4049:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -3238,34 +3238,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11288,
+                            "id": 11572,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11067,
-                            "src": "4059:7:20",
+                            "referencedDeclaration": 11351,
+                            "src": "4059:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 11291,
+                          "id": 11575,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11289,
+                              "id": 11573,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "4067:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "4067:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11290,
+                            "id": 11574,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3273,7 +3273,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4067:10:20",
+                            "src": "4067:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3284,21 +3284,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4059:19:20",
+                          "src": "4059:19:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 11293,
+                        "id": 11577,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11292,
+                          "id": 11576,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11241,
-                          "src": "4079:8:20",
+                          "referencedDeclaration": 11525,
+                          "src": "4079:8:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3309,7 +3309,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4059:29:20",
+                        "src": "4059:29:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -3331,18 +3331,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11284,
+                      "id": 11568,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "4028:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "4028:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11294,
+                    "id": 11578,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3350,28 +3350,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4028:61:20",
+                    "src": "4028:61:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11295,
+                  "id": 11579,
                   "nodeType": "EmitStatement",
-                  "src": "4023:66:20"
+                  "src": "4023:66:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11296,
+                    "id": 11580,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4102:4:20",
+                    "src": "4102:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -3379,15 +3379,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11247,
-                  "id": 11297,
+                  "functionReturnParameters": 11531,
+                  "id": 11581,
                   "nodeType": "Return",
-                  "src": "4095:11:20"
+                  "src": "4095:11:19"
                 }
               ]
             },
             "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.",
-            "id": 11299,
+            "id": 11583,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -3395,16 +3395,16 @@
             "name": "decreaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11244,
+              "id": 11528,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11241,
+                  "id": 11525,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3710:16:20",
+                  "scope": 11583,
+                  "src": "3710:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3412,10 +3412,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11240,
+                    "id": 11524,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3710:7:20",
+                    "src": "3710:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -3426,11 +3426,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11243,
+                  "id": 11527,
                   "name": "_subtractedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3732:24:20",
+                  "scope": 11583,
+                  "src": "3732:24:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3438,10 +3438,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11242,
+                    "id": 11526,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3732:7:20",
+                    "src": "3732:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -3451,20 +3451,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3704:56:20"
+              "src": "3704:56:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11247,
+              "id": 11531,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11246,
+                  "id": 11530,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3785:4:20",
+                  "scope": 11583,
+                  "src": "3785:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -3472,10 +3472,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11245,
+                    "id": 11529,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3785:4:20",
+                    "src": "3785:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -3485,33 +3485,33 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3784:6:20"
+              "src": "3784:6:19"
             },
-            "scope": 11300,
-            "src": "3679:432:20",
+            "scope": 11584,
+            "src": "3679:432:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 11301,
-        "src": "334:3780:20"
+        "scope": 11585,
+        "src": "334:3780:19"
       }
     ],
-    "src": "0:4115:20"
+    "src": "0:4115:19"
   },
   "legacyAST": {
     "absolutePath": "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol",
     "exportedSymbols": {
       "StandardToken": [
-        11300
+        11584
       ]
     },
-    "id": 11301,
+    "id": 11585,
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 11055,
+        "id": 11339,
         "literals": [
           "solidity",
           "^",
@@ -3519,27 +3519,27 @@
           ".24"
         ],
         "nodeType": "PragmaDirective",
-        "src": "0:24:20"
+        "src": "0:24:19"
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/BasicToken.sol",
         "file": "./BasicToken.sol",
-        "id": 11056,
+        "id": 11340,
         "nodeType": "ImportDirective",
-        "scope": 11301,
-        "sourceUnit": 10979,
-        "src": "26:26:20",
+        "scope": 11585,
+        "sourceUnit": 11263,
+        "src": "26:26:19",
         "symbolAliases": [],
         "unitAlias": ""
       },
       {
         "absolutePath": "zeppelin-solidity/contracts/token/ERC20/ERC20.sol",
         "file": "./ERC20.sol",
-        "id": 11057,
+        "id": 11341,
         "nodeType": "ImportDirective",
-        "scope": 11301,
-        "sourceUnit": 11022,
-        "src": "53:21:20",
+        "scope": 11585,
+        "sourceUnit": 11306,
+        "src": "53:21:19",
         "symbolAliases": [],
         "unitAlias": ""
       },
@@ -3549,64 +3549,64 @@
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 11058,
+              "id": 11342,
               "name": "ERC20",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 11021,
-              "src": "360:5:20",
+              "referencedDeclaration": 11305,
+              "src": "360:5:19",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_ERC20_$11021",
+                "typeIdentifier": "t_contract$_ERC20_$11305",
                 "typeString": "contract ERC20"
               }
             },
-            "id": 11059,
+            "id": 11343,
             "nodeType": "InheritanceSpecifier",
-            "src": "360:5:20"
+            "src": "360:5:19"
           },
           {
             "arguments": null,
             "baseName": {
               "contractScope": null,
-              "id": 11060,
+              "id": 11344,
               "name": "BasicToken",
               "nodeType": "UserDefinedTypeName",
-              "referencedDeclaration": 10978,
-              "src": "367:10:20",
+              "referencedDeclaration": 11262,
+              "src": "367:10:19",
               "typeDescriptions": {
-                "typeIdentifier": "t_contract$_BasicToken_$10978",
+                "typeIdentifier": "t_contract$_BasicToken_$11262",
                 "typeString": "contract BasicToken"
               }
             },
-            "id": 11061,
+            "id": 11345,
             "nodeType": "InheritanceSpecifier",
-            "src": "367:10:20"
+            "src": "367:10:19"
           }
         ],
         "contractDependencies": [
-          10978,
-          11021,
-          11053
+          11262,
+          11305,
+          11337
         ],
         "contractKind": "contract",
         "documentation": "@title Standard ERC20 token\n * @dev Implementation of the basic standard token.\nhttps://github.com/ethereum/EIPs/issues/20\nBased on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol",
         "fullyImplemented": true,
-        "id": 11300,
+        "id": 11584,
         "linearizedBaseContracts": [
-          11300,
-          10978,
-          11021,
-          11053
+          11584,
+          11262,
+          11305,
+          11337
         ],
         "name": "StandardToken",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": false,
-            "id": 11067,
+            "id": 11351,
             "name": "allowed",
             "nodeType": "VariableDeclaration",
-            "scope": 11300,
-            "src": "383:66:20",
+            "scope": 11584,
+            "src": "383:66:19",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -3614,46 +3614,46 @@
               "typeString": "mapping(address => mapping(address => uint256))"
             },
             "typeName": {
-              "id": 11066,
+              "id": 11350,
               "keyType": {
-                "id": 11062,
+                "id": 11346,
                 "name": "address",
                 "nodeType": "ElementaryTypeName",
-                "src": "392:7:20",
+                "src": "392:7:19",
                 "typeDescriptions": {
                   "typeIdentifier": "t_address",
                   "typeString": "address"
                 }
               },
               "nodeType": "Mapping",
-              "src": "383:49:20",
+              "src": "383:49:19",
               "typeDescriptions": {
                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                 "typeString": "mapping(address => mapping(address => uint256))"
               },
               "valueType": {
-                "id": 11065,
+                "id": 11349,
                 "keyType": {
-                  "id": 11063,
+                  "id": 11347,
                   "name": "address",
                   "nodeType": "ElementaryTypeName",
-                  "src": "412:7:20",
+                  "src": "412:7:19",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   }
                 },
                 "nodeType": "Mapping",
-                "src": "403:28:20",
+                "src": "403:28:19",
                 "typeDescriptions": {
                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                   "typeString": "mapping(address => uint256)"
                 },
                 "valueType": {
-                  "id": 11064,
+                  "id": 11348,
                   "name": "uint256",
                   "nodeType": "ElementaryTypeName",
-                  "src": "423:7:20",
+                  "src": "423:7:19",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
@@ -3666,9 +3666,9 @@
           },
           {
             "body": {
-              "id": 11152,
+              "id": 11436,
               "nodeType": "Block",
-              "src": "840:356:20",
+              "src": "840:356:19",
               "statements": [
                 {
                   "expression": {
@@ -3680,19 +3680,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 11083,
+                        "id": 11367,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11079,
+                          "id": 11363,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "854:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "854:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3704,26 +3704,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11080,
+                            "id": 11364,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "864:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "864:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11082,
+                          "id": 11366,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11081,
+                            "id": 11365,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11069,
-                            "src": "873:5:20",
+                            "referencedDeclaration": 11353,
+                            "src": "873:5:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3734,13 +3734,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "864:15:20",
+                          "src": "864:15:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "854:25:20",
+                        "src": "854:25:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3754,21 +3754,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11078,
+                      "id": 11362,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "846:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "846:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11084,
+                    "id": 11368,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3776,15 +3776,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "846:34:20",
+                    "src": "846:34:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11085,
+                  "id": 11369,
                   "nodeType": "ExpressionStatement",
-                  "src": "846:34:20"
+                  "src": "846:34:19"
                 },
                 {
                   "expression": {
@@ -3796,19 +3796,19 @@
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
                         },
-                        "id": 11094,
+                        "id": 11378,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11087,
+                          "id": 11371,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "894:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "894:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -3822,26 +3822,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 11088,
+                              "id": 11372,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11067,
-                              "src": "904:7:20",
+                              "referencedDeclaration": 11351,
+                              "src": "904:7:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 11090,
+                            "id": 11374,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11089,
+                              "id": 11373,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11069,
-                              "src": "912:5:20",
+                              "referencedDeclaration": 11353,
+                              "src": "912:5:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -3852,29 +3852,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "904:14:20",
+                            "src": "904:14:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11093,
+                          "id": 11377,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11091,
+                              "id": 11375,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "919:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "919:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11092,
+                            "id": 11376,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -3882,7 +3882,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "919:10:20",
+                            "src": "919:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -3893,13 +3893,13 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "904:26:20",
+                          "src": "904:26:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "src": "894:36:20",
+                        "src": "894:36:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -3913,21 +3913,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11086,
+                      "id": 11370,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "886:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "886:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11095,
+                    "id": 11379,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -3935,15 +3935,15 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "886:45:20",
+                    "src": "886:45:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11096,
+                  "id": 11380,
                   "nodeType": "ExpressionStatement",
-                  "src": "886:45:20"
+                  "src": "886:45:19"
                 },
                 {
                   "expression": {
@@ -3955,19 +3955,19 @@
                           "typeIdentifier": "t_address",
                           "typeString": "address"
                         },
-                        "id": 11102,
+                        "id": 11386,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "leftExpression": {
                           "argumentTypes": null,
-                          "id": 11098,
+                          "id": 11382,
                           "name": "_to",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11071,
-                          "src": "945:3:20",
+                          "referencedDeclaration": 11355,
+                          "src": "945:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -3981,14 +3981,14 @@
                             {
                               "argumentTypes": null,
                               "hexValue": "30",
-                              "id": 11100,
+                              "id": 11384,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": true,
                               "kind": "number",
                               "lValueRequested": false,
                               "nodeType": "Literal",
-                              "src": "960:1:20",
+                              "src": "960:1:19",
                               "subdenomination": null,
                               "typeDescriptions": {
                                 "typeIdentifier": "t_rational_0_by_1",
@@ -4004,20 +4004,20 @@
                                 "typeString": "int_const 0"
                               }
                             ],
-                            "id": 11099,
+                            "id": 11383,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "lValueRequested": false,
                             "nodeType": "ElementaryTypeNameExpression",
-                            "src": "952:7:20",
+                            "src": "952:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_type$_t_address_$",
                               "typeString": "type(address)"
                             },
                             "typeName": "address"
                           },
-                          "id": 11101,
+                          "id": 11385,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": true,
@@ -4025,13 +4025,13 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "952:10:20",
+                          "src": "952:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
                           }
                         },
-                        "src": "945:17:20",
+                        "src": "945:17:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_bool",
                           "typeString": "bool"
@@ -4045,21 +4045,21 @@
                           "typeString": "bool"
                         }
                       ],
-                      "id": 11097,
+                      "id": 11381,
                       "name": "require",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [
-                        11318,
-                        11319
+                        11602,
+                        11603
                       ],
-                      "referencedDeclaration": 11318,
-                      "src": "937:7:20",
+                      "referencedDeclaration": 11602,
+                      "src": "937:7:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$",
                         "typeString": "function (bool) pure"
                       }
                     },
-                    "id": 11103,
+                    "id": 11387,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4067,20 +4067,20 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "937:26:20",
+                    "src": "937:26:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11104,
+                  "id": 11388,
                   "nodeType": "ExpressionStatement",
-                  "src": "937:26:20"
+                  "src": "937:26:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11114,
+                    "id": 11398,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4089,26 +4089,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11105,
+                        "id": 11389,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "970:8:20",
+                        "referencedDeclaration": 11179,
+                        "src": "970:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11107,
+                      "id": 11391,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11106,
+                        "id": 11390,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11069,
-                        "src": "979:5:20",
+                        "referencedDeclaration": 11353,
+                        "src": "979:5:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4119,7 +4119,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "970:15:20",
+                      "src": "970:15:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4132,12 +4132,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11112,
+                          "id": 11396,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1008:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1008:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4155,26 +4155,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11108,
+                            "id": 11392,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "988:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "988:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11110,
+                          "id": 11394,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11109,
+                            "id": 11393,
                             "name": "_from",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11069,
-                            "src": "997:5:20",
+                            "referencedDeclaration": 11353,
+                            "src": "997:5:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4185,27 +4185,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "988:15:20",
+                          "src": "988:15:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11111,
+                        "id": 11395,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "988:19:20",
+                        "referencedDeclaration": 11055,
+                        "src": "988:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11113,
+                      "id": 11397,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4213,26 +4213,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "988:27:20",
+                      "src": "988:27:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "970:45:20",
+                    "src": "970:45:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11115,
+                  "id": 11399,
                   "nodeType": "ExpressionStatement",
-                  "src": "970:45:20"
+                  "src": "970:45:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11125,
+                    "id": 11409,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4241,26 +4241,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11116,
+                        "id": 11400,
                         "name": "balances",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 10895,
-                        "src": "1021:8:20",
+                        "referencedDeclaration": 11179,
+                        "src": "1021:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11118,
+                      "id": 11402,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11117,
+                        "id": 11401,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11071,
-                        "src": "1030:3:20",
+                        "referencedDeclaration": 11355,
+                        "src": "1030:3:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4271,7 +4271,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1021:13:20",
+                      "src": "1021:13:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4284,12 +4284,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11123,
+                          "id": 11407,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1055:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1055:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4307,26 +4307,26 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11119,
+                            "id": 11403,
                             "name": "balances",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 10895,
-                            "src": "1037:8:20",
+                            "referencedDeclaration": 11179,
+                            "src": "1037:8:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11121,
+                          "id": 11405,
                           "indexExpression": {
                             "argumentTypes": null,
-                            "id": 11120,
+                            "id": 11404,
                             "name": "_to",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11071,
-                            "src": "1046:3:20",
+                            "referencedDeclaration": 11355,
+                            "src": "1046:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4337,27 +4337,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1037:13:20",
+                          "src": "1037:13:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11122,
+                        "id": 11406,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "add",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10795,
-                        "src": "1037:17:20",
+                        "referencedDeclaration": 11079,
+                        "src": "1037:17:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11124,
+                      "id": 11408,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4365,26 +4365,26 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1037:25:20",
+                      "src": "1037:25:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1021:41:20",
+                    "src": "1021:41:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11126,
+                  "id": 11410,
                   "nodeType": "ExpressionStatement",
-                  "src": "1021:41:20"
+                  "src": "1021:41:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11142,
+                    "id": 11426,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4395,26 +4395,26 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11127,
+                          "id": 11411,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "1068:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "1068:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11131,
+                        "id": 11415,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11128,
+                          "id": 11412,
                           "name": "_from",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11069,
-                          "src": "1076:5:20",
+                          "referencedDeclaration": 11353,
+                          "src": "1076:5:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4425,29 +4425,29 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1068:14:20",
+                        "src": "1068:14:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11132,
+                      "id": 11416,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11129,
+                          "id": 11413,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1083:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "1083:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11130,
+                        "id": 11414,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -4455,7 +4455,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1083:10:20",
+                        "src": "1083:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4466,7 +4466,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1068:26:20",
+                      "src": "1068:26:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4479,12 +4479,12 @@
                       "arguments": [
                         {
                           "argumentTypes": null,
-                          "id": 11140,
+                          "id": 11424,
                           "name": "_value",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11073,
-                          "src": "1128:6:20",
+                          "referencedDeclaration": 11357,
+                          "src": "1128:6:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
@@ -4504,26 +4504,26 @@
                             "argumentTypes": null,
                             "baseExpression": {
                               "argumentTypes": null,
-                              "id": 11133,
+                              "id": 11417,
                               "name": "allowed",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11067,
-                              "src": "1097:7:20",
+                              "referencedDeclaration": 11351,
+                              "src": "1097:7:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                 "typeString": "mapping(address => mapping(address => uint256))"
                               }
                             },
-                            "id": 11135,
+                            "id": 11419,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11134,
+                              "id": 11418,
                               "name": "_from",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11069,
-                              "src": "1105:5:20",
+                              "referencedDeclaration": 11353,
+                              "src": "1105:5:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -4534,29 +4534,29 @@
                             "isPure": false,
                             "lValueRequested": false,
                             "nodeType": "IndexAccess",
-                            "src": "1097:14:20",
+                            "src": "1097:14:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                               "typeString": "mapping(address => uint256)"
                             }
                           },
-                          "id": 11138,
+                          "id": 11422,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11136,
+                              "id": 11420,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "1112:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "1112:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11137,
+                            "id": 11421,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -4564,7 +4564,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "1112:10:20",
+                            "src": "1112:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -4575,27 +4575,27 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "1097:26:20",
+                          "src": "1097:26:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11139,
+                        "id": 11423,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
                         "lValueRequested": false,
                         "memberName": "sub",
                         "nodeType": "MemberAccess",
-                        "referencedDeclaration": 10771,
-                        "src": "1097:30:20",
+                        "referencedDeclaration": 11055,
+                        "src": "1097:30:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                           "typeString": "function (uint256,uint256) pure returns (uint256)"
                         }
                       },
-                      "id": 11141,
+                      "id": 11425,
                       "isConstant": false,
                       "isLValue": false,
                       "isPure": false,
@@ -4603,21 +4603,21 @@
                       "lValueRequested": false,
                       "names": [],
                       "nodeType": "FunctionCall",
-                      "src": "1097:38:20",
+                      "src": "1097:38:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1068:67:20",
+                    "src": "1068:67:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11143,
+                  "id": 11427,
                   "nodeType": "ExpressionStatement",
-                  "src": "1068:67:20"
+                  "src": "1068:67:19"
                 },
                 {
                   "eventCall": {
@@ -4625,12 +4625,12 @@
                     "arguments": [
                       {
                         "argumentTypes": null,
-                        "id": 11145,
+                        "id": 11429,
                         "name": "_from",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11069,
-                        "src": "1155:5:20",
+                        "referencedDeclaration": 11353,
+                        "src": "1155:5:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4638,12 +4638,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11146,
+                        "id": 11430,
                         "name": "_to",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11071,
-                        "src": "1162:3:20",
+                        "referencedDeclaration": 11355,
+                        "src": "1162:3:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4651,12 +4651,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11147,
+                        "id": 11431,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11073,
-                        "src": "1167:6:20",
+                        "referencedDeclaration": 11357,
+                        "src": "1167:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -4678,18 +4678,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11144,
+                      "id": 11428,
                       "name": "Transfer",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11052,
-                      "src": "1146:8:20",
+                      "referencedDeclaration": 11336,
+                      "src": "1146:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11148,
+                    "id": 11432,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4697,28 +4697,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1146:28:20",
+                    "src": "1146:28:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11149,
+                  "id": 11433,
                   "nodeType": "EmitStatement",
-                  "src": "1141:33:20"
+                  "src": "1141:33:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11150,
+                    "id": 11434,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1187:4:20",
+                    "src": "1187:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -4726,15 +4726,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11077,
-                  "id": 11151,
+                  "functionReturnParameters": 11361,
+                  "id": 11435,
                   "nodeType": "Return",
-                  "src": "1180:11:20"
+                  "src": "1180:11:19"
                 }
               ]
             },
             "documentation": "@dev Transfer tokens from one address to another\n@param _from address The address which you want to send tokens from\n@param _to address The address which you want to transfer to\n@param _value uint256 the amount of tokens to be transferred",
-            "id": 11153,
+            "id": 11437,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -4742,16 +4742,16 @@
             "name": "transferFrom",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11074,
+              "id": 11358,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11069,
+                  "id": 11353,
                   "name": "_from",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "753:13:20",
+                  "scope": 11437,
+                  "src": "753:13:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4759,10 +4759,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11068,
+                    "id": 11352,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "753:7:20",
+                    "src": "753:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4773,11 +4773,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11071,
+                  "id": 11355,
                   "name": "_to",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "772:11:20",
+                  "scope": 11437,
+                  "src": "772:11:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4785,10 +4785,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11070,
+                    "id": 11354,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "772:7:20",
+                    "src": "772:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -4799,11 +4799,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11073,
+                  "id": 11357,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "789:14:20",
+                  "scope": 11437,
+                  "src": "789:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4811,10 +4811,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11072,
+                    "id": 11356,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "789:7:20",
+                    "src": "789:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -4824,20 +4824,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "747:60:20"
+              "src": "747:60:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11077,
+              "id": 11361,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11076,
+                  "id": 11360,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11153,
-                  "src": "832:4:20",
+                  "scope": 11437,
+                  "src": "832:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -4845,10 +4845,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11075,
+                    "id": 11359,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "832:4:20",
+                    "src": "832:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -4858,24 +4858,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "831:6:20"
+              "src": "831:6:19"
             },
-            "scope": 11300,
-            "src": "726:470:20",
+            "scope": 11584,
+            "src": "726:470:19",
             "stateMutability": "nonpayable",
-            "superFunction": 11003,
+            "superFunction": 11287,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11180,
+              "id": 11464,
               "nodeType": "Block",
-              "src": "1887:115:20",
+              "src": "1887:115:19",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11169,
+                    "id": 11453,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -4886,34 +4886,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11162,
+                          "id": 11446,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "1893:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "1893:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11166,
+                        "id": 11450,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 11163,
+                            "id": 11447,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "1901:3:20",
+                            "referencedDeclaration": 11599,
+                            "src": "1901:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 11164,
+                          "id": 11448,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -4921,7 +4921,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "1901:10:20",
+                          "src": "1901:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -4932,21 +4932,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "1893:19:20",
+                        "src": "1893:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11167,
+                      "id": 11451,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11165,
+                        "id": 11449,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11155,
-                        "src": "1913:8:20",
+                        "referencedDeclaration": 11439,
+                        "src": "1913:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -4957,7 +4957,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "1893:29:20",
+                      "src": "1893:29:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -4967,26 +4967,26 @@
                     "operator": "=",
                     "rightHandSide": {
                       "argumentTypes": null,
-                      "id": 11168,
+                      "id": 11452,
                       "name": "_value",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11157,
-                      "src": "1925:6:20",
+                      "referencedDeclaration": 11441,
+                      "src": "1925:6:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "1893:38:20",
+                    "src": "1893:38:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11170,
+                  "id": 11454,
                   "nodeType": "ExpressionStatement",
-                  "src": "1893:38:20"
+                  "src": "1893:38:19"
                 },
                 {
                   "eventCall": {
@@ -4996,18 +4996,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11172,
+                          "id": 11456,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "1951:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "1951:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11173,
+                        "id": 11457,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -5015,7 +5015,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "1951:10:20",
+                        "src": "1951:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5023,12 +5023,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11174,
+                        "id": 11458,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11155,
-                        "src": "1963:8:20",
+                        "referencedDeclaration": 11439,
+                        "src": "1963:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5036,12 +5036,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11175,
+                        "id": 11459,
                         "name": "_value",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11157,
-                        "src": "1973:6:20",
+                        "referencedDeclaration": 11441,
+                        "src": "1973:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5063,18 +5063,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11171,
+                      "id": 11455,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "1942:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "1942:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11176,
+                    "id": 11460,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5082,28 +5082,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "1942:38:20",
+                    "src": "1942:38:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11177,
+                  "id": 11461,
                   "nodeType": "EmitStatement",
-                  "src": "1937:43:20"
+                  "src": "1937:43:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11178,
+                    "id": 11462,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "1993:4:20",
+                    "src": "1993:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5111,15 +5111,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11161,
-                  "id": 11179,
+                  "functionReturnParameters": 11445,
+                  "id": 11463,
                   "nodeType": "Return",
-                  "src": "1986:11:20"
+                  "src": "1986:11:19"
                 }
               ]
             },
             "documentation": "@dev Approve the passed address to spend the specified amount of tokens on behalf of msg.sender.\nBeware that changing an allowance with this method brings the risk that someone may use both the old\nand the new allowance by unfortunate transaction ordering. One possible solution to mitigate this\nrace condition is to first reduce the spender's allowance to 0 and set the desired value afterwards:\nhttps://github.com/ethereum/EIPs/issues/20#issuecomment-263524729\n@param _spender The address which will spend the funds.\n@param _value The amount of tokens to be spent.",
-            "id": 11181,
+            "id": 11465,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -5127,16 +5127,16 @@
             "name": "approve",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11158,
+              "id": 11442,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11155,
+                  "id": 11439,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1831:16:20",
+                  "scope": 11465,
+                  "src": "1831:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5144,10 +5144,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11154,
+                    "id": 11438,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1831:7:20",
+                    "src": "1831:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5158,11 +5158,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11157,
+                  "id": 11441,
                   "name": "_value",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1849:14:20",
+                  "scope": 11465,
+                  "src": "1849:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5170,10 +5170,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11156,
+                    "id": 11440,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1849:7:20",
+                    "src": "1849:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5183,20 +5183,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1830:34:20"
+              "src": "1830:34:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11161,
+              "id": 11445,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11160,
+                  "id": 11444,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11181,
-                  "src": "1881:4:20",
+                  "scope": 11465,
+                  "src": "1881:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5204,10 +5204,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11159,
+                    "id": 11443,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "1881:4:20",
+                    "src": "1881:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5217,19 +5217,19 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "1880:6:20"
+              "src": "1880:6:19"
             },
-            "scope": 11300,
-            "src": "1814:188:20",
+            "scope": 11584,
+            "src": "1814:188:19",
             "stateMutability": "nonpayable",
-            "superFunction": 11012,
+            "superFunction": 11296,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11196,
+              "id": 11480,
               "nodeType": "Block",
-              "src": "2431:43:20",
+              "src": "2431:43:19",
               "statements": [
                 {
                   "expression": {
@@ -5238,26 +5238,26 @@
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11190,
+                        "id": 11474,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11067,
-                        "src": "2444:7:20",
+                        "referencedDeclaration": 11351,
+                        "src": "2444:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 11192,
+                      "id": 11476,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11191,
+                        "id": 11475,
                         "name": "_owner",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11183,
-                        "src": "2452:6:20",
+                        "referencedDeclaration": 11467,
+                        "src": "2452:6:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5268,21 +5268,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "2444:15:20",
+                      "src": "2444:15:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 11194,
+                    "id": 11478,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 11193,
+                      "id": 11477,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11185,
-                      "src": "2460:8:20",
+                      "referencedDeclaration": 11469,
+                      "src": "2460:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -5293,21 +5293,21 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "2444:25:20",
+                    "src": "2444:25:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "functionReturnParameters": 11189,
-                  "id": 11195,
+                  "functionReturnParameters": 11473,
+                  "id": 11479,
                   "nodeType": "Return",
-                  "src": "2437:32:20"
+                  "src": "2437:32:19"
                 }
               ]
             },
             "documentation": "@dev Function to check the amount of tokens that an owner allowed to a spender.\n@param _owner address The address which owns the funds.\n@param _spender address The address which will spend the funds.\n@return A uint256 specifying the amount of tokens still available for the spender.",
-            "id": 11197,
+            "id": 11481,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": true,
@@ -5315,16 +5315,16 @@
             "name": "allowance",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11186,
+              "id": 11470,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11183,
+                  "id": 11467,
                   "name": "_owner",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2345:14:20",
+                  "scope": 11481,
+                  "src": "2345:14:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5332,10 +5332,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11182,
+                    "id": 11466,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2345:7:20",
+                    "src": "2345:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5346,11 +5346,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11185,
+                  "id": 11469,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2365:16:20",
+                  "scope": 11481,
+                  "src": "2365:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5358,10 +5358,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11184,
+                    "id": 11468,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2365:7:20",
+                    "src": "2365:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5371,20 +5371,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2339:47:20"
+              "src": "2339:47:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11189,
+              "id": 11473,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11188,
+                  "id": 11472,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11197,
-                  "src": "2420:7:20",
+                  "scope": 11481,
+                  "src": "2420:7:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5392,10 +5392,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11187,
+                    "id": 11471,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2420:7:20",
+                    "src": "2420:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5405,24 +5405,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2419:9:20"
+              "src": "2419:9:19"
             },
-            "scope": 11300,
-            "src": "2321:153:20",
+            "scope": 11584,
+            "src": "2321:153:19",
             "stateMutability": "view",
-            "superFunction": 10992,
+            "superFunction": 11276,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11238,
+              "id": 11522,
               "nodeType": "Block",
-              "src": "3035:187:20",
+              "src": "3035:187:19",
               "statements": [
                 {
                   "expression": {
                     "argumentTypes": null,
-                    "id": 11222,
+                    "id": 11506,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5433,34 +5433,34 @@
                         "argumentTypes": null,
                         "baseExpression": {
                           "argumentTypes": null,
-                          "id": 11206,
+                          "id": 11490,
                           "name": "allowed",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11067,
-                          "src": "3041:7:20",
+                          "referencedDeclaration": 11351,
+                          "src": "3041:7:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                             "typeString": "mapping(address => mapping(address => uint256))"
                           }
                         },
-                        "id": 11210,
+                        "id": 11494,
                         "indexExpression": {
                           "argumentTypes": null,
                           "expression": {
                             "argumentTypes": null,
-                            "id": 11207,
+                            "id": 11491,
                             "name": "msg",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11315,
-                            "src": "3049:3:20",
+                            "referencedDeclaration": 11599,
+                            "src": "3049:3:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_magic_message",
                               "typeString": "msg"
                             }
                           },
-                          "id": 11208,
+                          "id": 11492,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5468,7 +5468,7 @@
                           "memberName": "sender",
                           "nodeType": "MemberAccess",
                           "referencedDeclaration": null,
-                          "src": "3049:10:20",
+                          "src": "3049:10:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5479,21 +5479,21 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3041:19:20",
+                        "src": "3041:19:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                           "typeString": "mapping(address => uint256)"
                         }
                       },
-                      "id": 11211,
+                      "id": 11495,
                       "indexExpression": {
                         "argumentTypes": null,
-                        "id": 11209,
+                        "id": 11493,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11199,
-                        "src": "3061:8:20",
+                        "referencedDeclaration": 11483,
+                        "src": "3061:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5504,7 +5504,7 @@
                       "isPure": false,
                       "lValueRequested": true,
                       "nodeType": "IndexAccess",
-                      "src": "3041:29:20",
+                      "src": "3041:29:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -5520,12 +5520,12 @@
                           "arguments": [
                             {
                               "argumentTypes": null,
-                              "id": 11219,
+                              "id": 11503,
                               "name": "_addedValue",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11201,
-                              "src": "3115:11:20",
+                              "referencedDeclaration": 11485,
+                              "src": "3115:11:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
@@ -5545,34 +5545,34 @@
                                 "argumentTypes": null,
                                 "baseExpression": {
                                   "argumentTypes": null,
-                                  "id": 11212,
+                                  "id": 11496,
                                   "name": "allowed",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11067,
-                                  "src": "3081:7:20",
+                                  "referencedDeclaration": 11351,
+                                  "src": "3081:7:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                     "typeString": "mapping(address => mapping(address => uint256))"
                                   }
                                 },
-                                "id": 11215,
+                                "id": 11499,
                                 "indexExpression": {
                                   "argumentTypes": null,
                                   "expression": {
                                     "argumentTypes": null,
-                                    "id": 11213,
+                                    "id": 11497,
                                     "name": "msg",
                                     "nodeType": "Identifier",
                                     "overloadedDeclarations": [],
-                                    "referencedDeclaration": 11315,
-                                    "src": "3089:3:20",
+                                    "referencedDeclaration": 11599,
+                                    "src": "3089:3:19",
                                     "typeDescriptions": {
                                       "typeIdentifier": "t_magic_message",
                                       "typeString": "msg"
                                     }
                                   },
-                                  "id": 11214,
+                                  "id": 11498,
                                   "isConstant": false,
                                   "isLValue": false,
                                   "isPure": false,
@@ -5580,7 +5580,7 @@
                                   "memberName": "sender",
                                   "nodeType": "MemberAccess",
                                   "referencedDeclaration": null,
-                                  "src": "3089:10:20",
+                                  "src": "3089:10:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_address",
                                     "typeString": "address"
@@ -5591,21 +5591,21 @@
                                 "isPure": false,
                                 "lValueRequested": false,
                                 "nodeType": "IndexAccess",
-                                "src": "3081:19:20",
+                                "src": "3081:19:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                   "typeString": "mapping(address => uint256)"
                                 }
                               },
-                              "id": 11217,
+                              "id": 11501,
                               "indexExpression": {
                                 "argumentTypes": null,
-                                "id": 11216,
+                                "id": 11500,
                                 "name": "_spender",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11199,
-                                "src": "3101:8:20",
+                                "referencedDeclaration": 11483,
+                                "src": "3101:8:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -5616,27 +5616,27 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3081:29:20",
+                              "src": "3081:29:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_uint256",
                                 "typeString": "uint256"
                               }
                             },
-                            "id": 11218,
+                            "id": 11502,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
                             "lValueRequested": false,
                             "memberName": "add",
                             "nodeType": "MemberAccess",
-                            "referencedDeclaration": 10795,
-                            "src": "3081:33:20",
+                            "referencedDeclaration": 11079,
+                            "src": "3081:33:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                               "typeString": "function (uint256,uint256) pure returns (uint256)"
                             }
                           },
-                          "id": 11220,
+                          "id": 11504,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -5644,35 +5644,35 @@
                           "lValueRequested": false,
                           "names": [],
                           "nodeType": "FunctionCall",
-                          "src": "3081:46:20",
+                          "src": "3081:46:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         }
                       ],
-                      "id": 11221,
+                      "id": 11505,
                       "isConstant": false,
                       "isInlineArray": false,
                       "isLValue": false,
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "TupleExpression",
-                      "src": "3073:55:20",
+                      "src": "3073:55:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3041:87:20",
+                    "src": "3041:87:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
-                  "id": 11223,
+                  "id": 11507,
                   "nodeType": "ExpressionStatement",
-                  "src": "3041:87:20"
+                  "src": "3041:87:19"
                 },
                 {
                   "eventCall": {
@@ -5682,18 +5682,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11225,
+                          "id": 11509,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "3148:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "3148:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11226,
+                        "id": 11510,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -5701,7 +5701,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3148:10:20",
+                        "src": "3148:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5709,12 +5709,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11227,
+                        "id": 11511,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11199,
-                        "src": "3160:8:20",
+                        "referencedDeclaration": 11483,
+                        "src": "3160:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -5726,34 +5726,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11228,
+                            "id": 11512,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11067,
-                            "src": "3170:7:20",
+                            "referencedDeclaration": 11351,
+                            "src": "3170:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 11231,
+                          "id": 11515,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11229,
+                              "id": 11513,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "3178:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "3178:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11230,
+                            "id": 11514,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -5761,7 +5761,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "3178:10:20",
+                            "src": "3178:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -5772,21 +5772,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "3170:19:20",
+                          "src": "3170:19:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 11233,
+                        "id": 11517,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11232,
+                          "id": 11516,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11199,
-                          "src": "3190:8:20",
+                          "referencedDeclaration": 11483,
+                          "src": "3190:8:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -5797,7 +5797,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "3170:29:20",
+                        "src": "3170:29:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -5819,18 +5819,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11224,
+                      "id": 11508,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "3139:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "3139:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11234,
+                    "id": 11518,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -5838,28 +5838,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "3139:61:20",
+                    "src": "3139:61:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11235,
+                  "id": 11519,
                   "nodeType": "EmitStatement",
-                  "src": "3134:66:20"
+                  "src": "3134:66:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11236,
+                    "id": 11520,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "3213:4:20",
+                    "src": "3213:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -5867,15 +5867,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11205,
-                  "id": 11237,
+                  "functionReturnParameters": 11489,
+                  "id": 11521,
                   "nodeType": "Return",
-                  "src": "3206:11:20"
+                  "src": "3206:11:19"
                 }
               ]
             },
             "documentation": "@dev Increase the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To increment\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _addedValue The amount of tokens to increase the allowance by.",
-            "id": 11239,
+            "id": 11523,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -5883,16 +5883,16 @@
             "name": "increaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11202,
+              "id": 11486,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11199,
+                  "id": 11483,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "2957:16:20",
+                  "scope": 11523,
+                  "src": "2957:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5900,10 +5900,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11198,
+                    "id": 11482,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2957:7:20",
+                    "src": "2957:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -5914,11 +5914,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11201,
+                  "id": 11485,
                   "name": "_addedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "2979:19:20",
+                  "scope": 11523,
+                  "src": "2979:19:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5926,10 +5926,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11200,
+                    "id": 11484,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "2979:7:20",
+                    "src": "2979:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -5939,20 +5939,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "2951:51:20"
+              "src": "2951:51:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11205,
+              "id": 11489,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11204,
+                  "id": 11488,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11239,
-                  "src": "3027:4:20",
+                  "scope": 11523,
+                  "src": "3027:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -5960,10 +5960,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11203,
+                    "id": 11487,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3027:4:20",
+                    "src": "3027:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -5973,32 +5973,32 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3026:6:20"
+              "src": "3026:6:19"
             },
-            "scope": 11300,
-            "src": "2926:296:20",
+            "scope": 11584,
+            "src": "2926:296:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           },
           {
             "body": {
-              "id": 11298,
+              "id": 11582,
               "nodeType": "Block",
-              "src": "3793:318:20",
+              "src": "3793:318:19",
               "statements": [
                 {
                   "assignments": [
-                    11249
+                    11533
                   ],
                   "declarations": [
                     {
                       "constant": false,
-                      "id": 11249,
+                      "id": 11533,
                       "name": "oldValue",
                       "nodeType": "VariableDeclaration",
-                      "scope": 11299,
-                      "src": "3799:16:20",
+                      "scope": 11583,
+                      "src": "3799:16:19",
                       "stateVariable": false,
                       "storageLocation": "default",
                       "typeDescriptions": {
@@ -6006,10 +6006,10 @@
                         "typeString": "uint256"
                       },
                       "typeName": {
-                        "id": 11248,
+                        "id": 11532,
                         "name": "uint256",
                         "nodeType": "ElementaryTypeName",
-                        "src": "3799:7:20",
+                        "src": "3799:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6019,41 +6019,41 @@
                       "visibility": "internal"
                     }
                   ],
-                  "id": 11256,
+                  "id": 11540,
                   "initialValue": {
                     "argumentTypes": null,
                     "baseExpression": {
                       "argumentTypes": null,
                       "baseExpression": {
                         "argumentTypes": null,
-                        "id": 11250,
+                        "id": 11534,
                         "name": "allowed",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11067,
-                        "src": "3818:7:20",
+                        "referencedDeclaration": 11351,
+                        "src": "3818:7:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                           "typeString": "mapping(address => mapping(address => uint256))"
                         }
                       },
-                      "id": 11253,
+                      "id": 11537,
                       "indexExpression": {
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11251,
+                          "id": 11535,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "3826:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "3826:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11252,
+                        "id": 11536,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6061,7 +6061,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "3826:10:20",
+                        "src": "3826:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6072,21 +6072,21 @@
                       "isPure": false,
                       "lValueRequested": false,
                       "nodeType": "IndexAccess",
-                      "src": "3818:19:20",
+                      "src": "3818:19:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                         "typeString": "mapping(address => uint256)"
                       }
                     },
-                    "id": 11255,
+                    "id": 11539,
                     "indexExpression": {
                       "argumentTypes": null,
-                      "id": 11254,
+                      "id": 11538,
                       "name": "_spender",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11241,
-                      "src": "3838:8:20",
+                      "referencedDeclaration": 11525,
+                      "src": "3838:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_address",
                         "typeString": "address"
@@ -6097,14 +6097,14 @@
                     "isPure": false,
                     "lValueRequested": false,
                     "nodeType": "IndexAccess",
-                    "src": "3818:29:20",
+                    "src": "3818:29:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     }
                   },
                   "nodeType": "VariableDeclarationStatement",
-                  "src": "3799:48:20"
+                  "src": "3799:48:19"
                 },
                 {
                   "condition": {
@@ -6113,19 +6113,19 @@
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
                     },
-                    "id": 11259,
+                    "id": 11543,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
                     "lValueRequested": false,
                     "leftExpression": {
                       "argumentTypes": null,
-                      "id": 11257,
+                      "id": 11541,
                       "name": "_subtractedValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11243,
-                      "src": "3857:16:20",
+                      "referencedDeclaration": 11527,
+                      "src": "3857:16:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
@@ -6135,32 +6135,32 @@
                     "operator": ">=",
                     "rightExpression": {
                       "argumentTypes": null,
-                      "id": 11258,
+                      "id": 11542,
                       "name": "oldValue",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11249,
-                      "src": "3877:8:20",
+                      "referencedDeclaration": 11533,
+                      "src": "3877:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_uint256",
                         "typeString": "uint256"
                       }
                     },
-                    "src": "3857:28:20",
+                    "src": "3857:28:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
                     }
                   },
                   "falseBody": {
-                    "id": 11282,
+                    "id": 11566,
                     "nodeType": "Block",
-                    "src": "3941:77:20",
+                    "src": "3941:77:19",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11280,
+                          "id": 11564,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6171,34 +6171,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 11270,
+                                "id": 11554,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11067,
-                                "src": "3949:7:20",
+                                "referencedDeclaration": 11351,
+                                "src": "3949:7:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 11274,
+                              "id": 11558,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 11271,
+                                  "id": 11555,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "3957:3:20",
+                                  "referencedDeclaration": 11599,
+                                  "src": "3957:3:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 11272,
+                                "id": 11556,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6206,7 +6206,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3957:10:20",
+                                "src": "3957:10:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6217,21 +6217,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3949:19:20",
+                              "src": "3949:19:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 11275,
+                            "id": 11559,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11273,
+                              "id": 11557,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11241,
-                              "src": "3969:8:20",
+                              "referencedDeclaration": 11525,
+                              "src": "3969:8:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6242,7 +6242,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3949:29:20",
+                            "src": "3949:29:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6255,12 +6255,12 @@
                             "arguments": [
                               {
                                 "argumentTypes": null,
-                                "id": 11278,
+                                "id": 11562,
                                 "name": "_subtractedValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11243,
-                                "src": "3994:16:20",
+                                "referencedDeclaration": 11527,
+                                "src": "3994:16:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
@@ -6276,32 +6276,32 @@
                               ],
                               "expression": {
                                 "argumentTypes": null,
-                                "id": 11276,
+                                "id": 11560,
                                 "name": "oldValue",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11249,
-                                "src": "3981:8:20",
+                                "referencedDeclaration": 11533,
+                                "src": "3981:8:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_uint256",
                                   "typeString": "uint256"
                                 }
                               },
-                              "id": 11277,
+                              "id": 11561,
                               "isConstant": false,
                               "isLValue": false,
                               "isPure": false,
                               "lValueRequested": false,
                               "memberName": "sub",
                               "nodeType": "MemberAccess",
-                              "referencedDeclaration": 10771,
-                              "src": "3981:12:20",
+                              "referencedDeclaration": 11055,
+                              "src": "3981:12:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$",
                                 "typeString": "function (uint256,uint256) pure returns (uint256)"
                               }
                             },
-                            "id": 11279,
+                            "id": 11563,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6309,36 +6309,36 @@
                             "lValueRequested": false,
                             "names": [],
                             "nodeType": "FunctionCall",
-                            "src": "3981:30:20",
+                            "src": "3981:30:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
                             }
                           },
-                          "src": "3949:62:20",
+                          "src": "3949:62:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11281,
+                        "id": 11565,
                         "nodeType": "ExpressionStatement",
-                        "src": "3949:62:20"
+                        "src": "3949:62:19"
                       }
                     ]
                   },
-                  "id": 11283,
+                  "id": 11567,
                   "nodeType": "IfStatement",
-                  "src": "3853:165:20",
+                  "src": "3853:165:19",
                   "trueBody": {
-                    "id": 11269,
+                    "id": 11553,
                     "nodeType": "Block",
-                    "src": "3887:48:20",
+                    "src": "3887:48:19",
                     "statements": [
                       {
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11267,
+                          "id": 11551,
                           "isConstant": false,
                           "isLValue": false,
                           "isPure": false,
@@ -6349,34 +6349,34 @@
                               "argumentTypes": null,
                               "baseExpression": {
                                 "argumentTypes": null,
-                                "id": 11260,
+                                "id": 11544,
                                 "name": "allowed",
                                 "nodeType": "Identifier",
                                 "overloadedDeclarations": [],
-                                "referencedDeclaration": 11067,
-                                "src": "3895:7:20",
+                                "referencedDeclaration": 11351,
+                                "src": "3895:7:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                                   "typeString": "mapping(address => mapping(address => uint256))"
                                 }
                               },
-                              "id": 11264,
+                              "id": 11548,
                               "indexExpression": {
                                 "argumentTypes": null,
                                 "expression": {
                                   "argumentTypes": null,
-                                  "id": 11261,
+                                  "id": 11545,
                                   "name": "msg",
                                   "nodeType": "Identifier",
                                   "overloadedDeclarations": [],
-                                  "referencedDeclaration": 11315,
-                                  "src": "3903:3:20",
+                                  "referencedDeclaration": 11599,
+                                  "src": "3903:3:19",
                                   "typeDescriptions": {
                                     "typeIdentifier": "t_magic_message",
                                     "typeString": "msg"
                                   }
                                 },
-                                "id": 11262,
+                                "id": 11546,
                                 "isConstant": false,
                                 "isLValue": false,
                                 "isPure": false,
@@ -6384,7 +6384,7 @@
                                 "memberName": "sender",
                                 "nodeType": "MemberAccess",
                                 "referencedDeclaration": null,
-                                "src": "3903:10:20",
+                                "src": "3903:10:19",
                                 "typeDescriptions": {
                                   "typeIdentifier": "t_address",
                                   "typeString": "address"
@@ -6395,21 +6395,21 @@
                               "isPure": false,
                               "lValueRequested": false,
                               "nodeType": "IndexAccess",
-                              "src": "3895:19:20",
+                              "src": "3895:19:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                                 "typeString": "mapping(address => uint256)"
                               }
                             },
-                            "id": 11265,
+                            "id": 11549,
                             "indexExpression": {
                               "argumentTypes": null,
-                              "id": 11263,
+                              "id": 11547,
                               "name": "_spender",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11241,
-                              "src": "3915:8:20",
+                              "referencedDeclaration": 11525,
+                              "src": "3915:8:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_address",
                                 "typeString": "address"
@@ -6420,7 +6420,7 @@
                             "isPure": false,
                             "lValueRequested": true,
                             "nodeType": "IndexAccess",
-                            "src": "3895:29:20",
+                            "src": "3895:29:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_uint256",
                               "typeString": "uint256"
@@ -6431,14 +6431,14 @@
                           "rightHandSide": {
                             "argumentTypes": null,
                             "hexValue": "30",
-                            "id": 11266,
+                            "id": 11550,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": true,
                             "kind": "number",
                             "lValueRequested": false,
                             "nodeType": "Literal",
-                            "src": "3927:1:20",
+                            "src": "3927:1:19",
                             "subdenomination": null,
                             "typeDescriptions": {
                               "typeIdentifier": "t_rational_0_by_1",
@@ -6446,15 +6446,15 @@
                             },
                             "value": "0"
                           },
-                          "src": "3895:33:20",
+                          "src": "3895:33:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_uint256",
                             "typeString": "uint256"
                           }
                         },
-                        "id": 11268,
+                        "id": 11552,
                         "nodeType": "ExpressionStatement",
-                        "src": "3895:33:20"
+                        "src": "3895:33:19"
                       }
                     ]
                   }
@@ -6467,18 +6467,18 @@
                         "argumentTypes": null,
                         "expression": {
                           "argumentTypes": null,
-                          "id": 11285,
+                          "id": 11569,
                           "name": "msg",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11315,
-                          "src": "4037:3:20",
+                          "referencedDeclaration": 11599,
+                          "src": "4037:3:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_magic_message",
                             "typeString": "msg"
                           }
                         },
-                        "id": 11286,
+                        "id": 11570,
                         "isConstant": false,
                         "isLValue": false,
                         "isPure": false,
@@ -6486,7 +6486,7 @@
                         "memberName": "sender",
                         "nodeType": "MemberAccess",
                         "referencedDeclaration": null,
-                        "src": "4037:10:20",
+                        "src": "4037:10:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6494,12 +6494,12 @@
                       },
                       {
                         "argumentTypes": null,
-                        "id": 11287,
+                        "id": 11571,
                         "name": "_spender",
                         "nodeType": "Identifier",
                         "overloadedDeclarations": [],
-                        "referencedDeclaration": 11241,
-                        "src": "4049:8:20",
+                        "referencedDeclaration": 11525,
+                        "src": "4049:8:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_address",
                           "typeString": "address"
@@ -6511,34 +6511,34 @@
                           "argumentTypes": null,
                           "baseExpression": {
                             "argumentTypes": null,
-                            "id": 11288,
+                            "id": 11572,
                             "name": "allowed",
                             "nodeType": "Identifier",
                             "overloadedDeclarations": [],
-                            "referencedDeclaration": 11067,
-                            "src": "4059:7:20",
+                            "referencedDeclaration": 11351,
+                            "src": "4059:7:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_uint256_$_$",
                               "typeString": "mapping(address => mapping(address => uint256))"
                             }
                           },
-                          "id": 11291,
+                          "id": 11575,
                           "indexExpression": {
                             "argumentTypes": null,
                             "expression": {
                               "argumentTypes": null,
-                              "id": 11289,
+                              "id": 11573,
                               "name": "msg",
                               "nodeType": "Identifier",
                               "overloadedDeclarations": [],
-                              "referencedDeclaration": 11315,
-                              "src": "4067:3:20",
+                              "referencedDeclaration": 11599,
+                              "src": "4067:3:19",
                               "typeDescriptions": {
                                 "typeIdentifier": "t_magic_message",
                                 "typeString": "msg"
                               }
                             },
-                            "id": 11290,
+                            "id": 11574,
                             "isConstant": false,
                             "isLValue": false,
                             "isPure": false,
@@ -6546,7 +6546,7 @@
                             "memberName": "sender",
                             "nodeType": "MemberAccess",
                             "referencedDeclaration": null,
-                            "src": "4067:10:20",
+                            "src": "4067:10:19",
                             "typeDescriptions": {
                               "typeIdentifier": "t_address",
                               "typeString": "address"
@@ -6557,21 +6557,21 @@
                           "isPure": false,
                           "lValueRequested": false,
                           "nodeType": "IndexAccess",
-                          "src": "4059:19:20",
+                          "src": "4059:19:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
                             "typeString": "mapping(address => uint256)"
                           }
                         },
-                        "id": 11293,
+                        "id": 11577,
                         "indexExpression": {
                           "argumentTypes": null,
-                          "id": 11292,
+                          "id": 11576,
                           "name": "_spender",
                           "nodeType": "Identifier",
                           "overloadedDeclarations": [],
-                          "referencedDeclaration": 11241,
-                          "src": "4079:8:20",
+                          "referencedDeclaration": 11525,
+                          "src": "4079:8:19",
                           "typeDescriptions": {
                             "typeIdentifier": "t_address",
                             "typeString": "address"
@@ -6582,7 +6582,7 @@
                         "isPure": false,
                         "lValueRequested": false,
                         "nodeType": "IndexAccess",
-                        "src": "4059:29:20",
+                        "src": "4059:29:19",
                         "typeDescriptions": {
                           "typeIdentifier": "t_uint256",
                           "typeString": "uint256"
@@ -6604,18 +6604,18 @@
                           "typeString": "uint256"
                         }
                       ],
-                      "id": 11284,
+                      "id": 11568,
                       "name": "Approval",
                       "nodeType": "Identifier",
                       "overloadedDeclarations": [],
-                      "referencedDeclaration": 11020,
-                      "src": "4028:8:20",
+                      "referencedDeclaration": 11304,
+                      "src": "4028:8:19",
                       "typeDescriptions": {
                         "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$",
                         "typeString": "function (address,address,uint256)"
                       }
                     },
-                    "id": 11294,
+                    "id": 11578,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": false,
@@ -6623,28 +6623,28 @@
                     "lValueRequested": false,
                     "names": [],
                     "nodeType": "FunctionCall",
-                    "src": "4028:61:20",
+                    "src": "4028:61:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_tuple$__$",
                       "typeString": "tuple()"
                     }
                   },
-                  "id": 11295,
+                  "id": 11579,
                   "nodeType": "EmitStatement",
-                  "src": "4023:66:20"
+                  "src": "4023:66:19"
                 },
                 {
                   "expression": {
                     "argumentTypes": null,
                     "hexValue": "74727565",
-                    "id": 11296,
+                    "id": 11580,
                     "isConstant": false,
                     "isLValue": false,
                     "isPure": true,
                     "kind": "bool",
                     "lValueRequested": false,
                     "nodeType": "Literal",
-                    "src": "4102:4:20",
+                    "src": "4102:4:19",
                     "subdenomination": null,
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
@@ -6652,15 +6652,15 @@
                     },
                     "value": "true"
                   },
-                  "functionReturnParameters": 11247,
-                  "id": 11297,
+                  "functionReturnParameters": 11531,
+                  "id": 11581,
                   "nodeType": "Return",
-                  "src": "4095:11:20"
+                  "src": "4095:11:19"
                 }
               ]
             },
             "documentation": "@dev Decrease the amount of tokens that an owner allowed to a spender.\napprove should be called when allowed[_spender] == 0. To decrement\nallowed value is better to use this function to avoid 2 calls (and wait until\nthe first transaction is mined)\nFrom MonolithDAO Token.sol\n@param _spender The address which will spend the funds.\n@param _subtractedValue The amount of tokens to decrease the allowance by.",
-            "id": 11299,
+            "id": 11583,
             "implemented": true,
             "isConstructor": false,
             "isDeclaredConst": false,
@@ -6668,16 +6668,16 @@
             "name": "decreaseApproval",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 11244,
+              "id": 11528,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11241,
+                  "id": 11525,
                   "name": "_spender",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3710:16:20",
+                  "scope": 11583,
+                  "src": "3710:16:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6685,10 +6685,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 11240,
+                    "id": 11524,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3710:7:20",
+                    "src": "3710:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
                       "typeString": "address"
@@ -6699,11 +6699,11 @@
                 },
                 {
                   "constant": false,
-                  "id": 11243,
+                  "id": 11527,
                   "name": "_subtractedValue",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3732:24:20",
+                  "scope": 11583,
+                  "src": "3732:24:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6711,10 +6711,10 @@
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 11242,
+                    "id": 11526,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3732:7:20",
+                    "src": "3732:7:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -6724,20 +6724,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3704:56:20"
+              "src": "3704:56:19"
             },
             "payable": false,
             "returnParameters": {
-              "id": 11247,
+              "id": 11531,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 11246,
+                  "id": 11530,
                   "name": "",
                   "nodeType": "VariableDeclaration",
-                  "scope": 11299,
-                  "src": "3785:4:20",
+                  "scope": 11583,
+                  "src": "3785:4:19",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -6745,10 +6745,10 @@
                     "typeString": "bool"
                   },
                   "typeName": {
-                    "id": 11245,
+                    "id": 11529,
                     "name": "bool",
                     "nodeType": "ElementaryTypeName",
-                    "src": "3785:4:20",
+                    "src": "3785:4:19",
                     "typeDescriptions": {
                       "typeIdentifier": "t_bool",
                       "typeString": "bool"
@@ -6758,20 +6758,20 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "3784:6:20"
+              "src": "3784:6:19"
             },
-            "scope": 11300,
-            "src": "3679:432:20",
+            "scope": 11584,
+            "src": "3679:432:19",
             "stateMutability": "nonpayable",
             "superFunction": null,
             "visibility": "public"
           }
         ],
-        "scope": 11301,
-        "src": "334:3780:20"
+        "scope": 11585,
+        "src": "334:3780:19"
       }
     ],
-    "src": "0:4115:20"
+    "src": "0:4115:19"
   },
   "compiler": {
     "name": "solc",
@@ -6779,5 +6779,5 @@
   },
   "networks": {},
   "schemaVersion": "2.0.1",
-  "updatedAt": "2019-01-10T13:57:39.973Z"
+  "updatedAt": "2019-01-11T15:59:13.147Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migration_artifacts/contracts/TestnetFaucet.json b/blockchain/source/migration_artifacts/contracts/TestnetFaucet.json
index 37c1eb83e..be791a97b 100644
--- a/blockchain/source/migration_artifacts/contracts/TestnetFaucet.json
+++ b/blockchain/source/migration_artifacts/contracts/TestnetFaucet.json
@@ -2266,8 +2266,8 @@
     "4": {
       "events": {},
       "links": {},
-      "address": "0x149d479e5591523c37bca4fb27be91c31b4262aa",
-      "transactionHash": "0xe839d9d37468776f1cfc42dc494c528658b833fd23ac418864e6f6f011b0675c"
+      "address": "0x94841fbc2a4319fe1a4b7ec74398f9e0877b1b14",
+      "transactionHash": "0x8a7af1a498bd5b20a86ee68d550c6541e4e9a98a39cbefd2df7c0c6a4eac8d53"
     },
     "8545": {
       "events": {},
@@ -2277,5 +2277,5 @@
     }
   },
   "schemaVersion": "2.0.1",
-  "updatedAt": "2018-12-19T16:46:12.332Z"
+  "updatedAt": "2019-01-11T16:09:31.161Z"
 }
\ No newline at end of file
diff --git a/blockchain/source/migrations/2_deploy_v1.js b/blockchain/source/migrations/2_deploy_v1.js
index bcdbba5c5..fcad81d10 100644
--- a/blockchain/source/migrations/2_deploy_v1.js
+++ b/blockchain/source/migrations/2_deploy_v1.js
@@ -29,6 +29,14 @@ function MSRequired (network) {
     }
 }
 
+function OracleMSOwners (network, accounts) {
+    let owners = MSOwners(network, accounts);
+    if (network === 'private') {
+        owners.push('0x1b01279d1ba00800733d7037d4dc6536f9b6f741');
+    }
+    return owners;
+}
+
 function MSOwners (network, accounts) {
     if (network === 'dev_main' || network === 'dev_side') {
         return accounts;
@@ -80,8 +88,9 @@ async function deployMainchain (deployer, network, accounts) {
     let gk = await GateKeeperLive.deployed();
     await registry.write('gatekeeperMasterchainAddress', gk.address, { gasPrice: 0 });
 
-    // add keeper with 100k limit for testing
-    await gk.ChangeKeeperLimit('0xAfA5a3b6675024af5C6D56959eF366d6b1FBa0d4', 100000 * 1e18, { gasPrice: actualGasPrice }); // eslint-disable-line max-len
+    if (network === 'rinkeby') {
+        await gk.ChangeKeeperLimit('0x1b01279d1ba00800733d7037d4dc6536f9b6f741', 2000000 * 1e18, { gasPrice: actualGasPrice }); // eslint-disable-line max-len
+    }
 
     await deployer.deploy(Multisig, MSOwners(network, accounts), MSRequired(network), { gasPrice: actualGasPrice });
     let multisig = await Multisig.deployed();
@@ -103,8 +112,9 @@ async function deploySidechain (deployer, network, accounts) {
     // 3) transfer all tokens to Gatekeeper
     await token.transfer(gk.address, 444 * 1e6 * 1e18, { gasPrice: 0 });
 
-    // 3.1): add keeper with 100k limit for testing
-    await gk.ChangeKeeperLimit('0x1f0dc2f125a2df9e37f32242cc3e34328f096b3c', 100000 * 1e18, { gasPrice: 0 });
+    if (network === 'private') {
+        await gk.ChangeKeeperLimit('0x1b01279d1ba00800733d7037d4dc6536f9b6f741', 2000000 * 1e18, { gasPrice: 0 });
+    }
 
     // deploy ProfileRegistry
     await deployer.deploy(ProfileRegistry, { gasPrice: 0 });
@@ -135,7 +145,7 @@ async function deploySidechain (deployer, network, accounts) {
     // write
     await ahm.write('sidechainSNMAddress', SNM.address, { gasPrice: 0 });
 
-    await deployer.deploy(OracleMultisig, MSOwners(network, accounts), MSRequired(network), { gasPrice: 0 });
+    await deployer.deploy(OracleMultisig, OracleMSOwners(network, accounts), MSRequired(network), { gasPrice: 0 });
     let oracleMS = await OracleMultisig.deployed();
 
     await deployer.deploy(GateKeeperMultisig, MSOwners(network, accounts), MSRequired(network), { gasPrice: 0 });

From dadc71240ffa613aa88d5a32b88295b4ddc278e3 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Tue, 22 Jan 2019 16:37:32 +0300
Subject: [PATCH 18/23] versioned market

---
 blockchain/addresses.go          | 14 +++++-
 blockchain/api.go                | 12 +++--
 blockchain/config.go             |  8 ++++
 blockchain/options.go            | 11 ++++-
 etc/node.yaml                    |  4 ++
 insonmnia/migration/migration.go | 76 ++++++++++++++++++++++++++++++++
 6 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 insonmnia/migration/migration.go

diff --git a/blockchain/addresses.go b/blockchain/addresses.go
index 0bf9e9396..357dc6857 100644
--- a/blockchain/addresses.go
+++ b/blockchain/addresses.go
@@ -1,12 +1,13 @@
 package blockchain
 
+import "fmt"
+
 const (
 	defaultContractRegistryAddr = "0xd1a6f3d1ae33b4b19565a6b283d7a05c5a0decb0"
 
 	sidechainSNMAddressKey          = "sidechainSNMAddress"
 	masterchainSNMAddressKey        = "masterchainSNMAddress"
 	blacklistAddressKey             = "blacklistAddress"
-	marketAddressKey                = "marketV2Address"
 	profileRegistryAddressKey       = "profileRegistryAddress"
 	oracleUsdAddressKey             = "oracleUsdAddress"
 	gatekeeperMasterchainAddressKey = "gatekeeperMasterchainAddress"
@@ -14,3 +15,14 @@ const (
 	testnetFaucetAddressKey         = "testnetFaucetAddress"
 	oracleMultiSigAddressKey        = "oracleMultiSigAddress"
 )
+
+func marketAddressKey(version uint) (string, error) {
+	switch version {
+	case 1:
+		return "marketAddress", nil
+	case 2:
+		return "marketV2Address", nil
+	default:
+		return "", fmt.Errorf("invalid market version %d", version)
+	}
+}
diff --git a/blockchain/api.go b/blockchain/api.go
index d6dfa12ca..cd2283c7d 100644
--- a/blockchain/api.go
+++ b/blockchain/api.go
@@ -231,7 +231,7 @@ func NewAPI(ctx context.Context, opts ...Option) (API, error) {
 }
 
 func (api *BasicAPI) setupContractRegistry(ctx context.Context) error {
-	registry, err := NewRegistry(ctx, api.options.contractRegistry, api.options.sidechain)
+	registry, err := NewRegistry(ctx, api.options.version, api.options.contractRegistry, api.options.sidechain)
 	if err != nil {
 		return fmt.Errorf("failed to setup contract registry: %s", err)
 	}
@@ -405,7 +405,7 @@ func NewRegistry(ctx context.Context, address common.Address, opts *chainOpts) (
 	registry := &BasicContractRegistry{
 		registryContract: contract,
 	}
-	if err := registry.setup(ctx); err != nil {
+	if err := registry.setup(ctx, version); err != nil {
 		return nil, err
 	}
 	return registry, nil
@@ -444,7 +444,11 @@ func (m *BasicContractRegistry) readContract(ctx context.Context, key string, ta
 	return nil
 }
 
-func (m *BasicContractRegistry) setup(ctx context.Context) error {
+func (m *BasicContractRegistry) setup(ctx context.Context, version uint) error {
+	marketKey, err := marketAddressKey(version)
+	if err != nil {
+		return err
+	}
 	addresses := []struct {
 		key    string
 		target *common.Address
@@ -452,7 +456,7 @@ func (m *BasicContractRegistry) setup(ctx context.Context) error {
 		{sidechainSNMAddressKey, &m.sidechainSNMAddress},
 		{masterchainSNMAddressKey, &m.masterchainSNMAddress},
 		{blacklistAddressKey, &m.blacklistAddress},
-		{marketAddressKey, &m.marketAddress},
+		{marketKey, &m.marketAddress},
 		{profileRegistryAddressKey, &m.profileRegistryAddress},
 		{oracleUsdAddressKey, &m.oracleUsdAddress},
 		{gatekeeperMasterchainAddressKey, &m.gatekeeperMasterchainAddress},
diff --git a/blockchain/config.go b/blockchain/config.go
index 1023642c1..2838fefe3 100644
--- a/blockchain/config.go
+++ b/blockchain/config.go
@@ -15,6 +15,7 @@ type Config struct {
 	ContractRegistryAddr common.Address
 	BlocksBatchSize      uint64
 	MasterchainGasPrice  *big.Int
+	Version              uint
 }
 
 func NewDefaultConfig() (*Config, error) {
@@ -32,6 +33,7 @@ func NewDefaultConfig() (*Config, error) {
 		Endpoint:             *endpoint,
 		SidechainEndpoint:    *sidechainEndpoint,
 		ContractRegistryAddr: common.HexToAddress(defaultContractRegistryAddr),
+		Version:              defaultVersion,
 	}, nil
 }
 
@@ -42,6 +44,7 @@ func (m *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		ContractRegistryAddr common.Address `yaml:"contract_registry"`
 		BlocksBatchSize      uint64         `yaml:"blocks_batch_size"`
 		MasterchainGasPrice  GasPrice       `yaml:"masterchain_gas_price"`
+		Version              uint
 	}
 
 	if err := unmarshal(&cfg); err != nil {
@@ -56,6 +59,10 @@ func (m *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		cfg.SidechainEndpoint = defaultSidechainEndpoint
 	}
 
+	if cfg.Version == 0 {
+		cfg.Version = defaultVersion
+	}
+
 	endpoint, err := url.Parse(cfg.MasterchainEndpoint)
 	if err != nil {
 		return err
@@ -75,6 +82,7 @@ func (m *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	m.ContractRegistryAddr = cfg.ContractRegistryAddr
 	m.BlocksBatchSize = cfg.BlocksBatchSize
 	m.MasterchainGasPrice = cfg.MasterchainGasPrice.Int
+	m.Version = cfg.Version
 
 	return nil
 }
diff --git a/blockchain/options.go b/blockchain/options.go
index 23deb8dcd..5872bcc28 100644
--- a/blockchain/options.go
+++ b/blockchain/options.go
@@ -19,7 +19,8 @@ const (
 	defaultLogParsePeriod             = time.Second
 	defaultMasterchainGasLimit        = 500000
 	defaultSidechainGasLimit          = 2000000
-	defaultBlockBatchSize             = 50
+	defaultBlockBatchSize             = 500
+	defaultVersion                    = 1
 )
 
 // chainOpts describes common options
@@ -60,6 +61,7 @@ type options struct {
 	contractRegistry common.Address
 	blocksBatchSize  uint64
 	niceMarket       bool
+	version          uint
 }
 
 func defaultOptions() *options {
@@ -125,6 +127,7 @@ func WithConfig(cfg *Config) Option {
 			}
 			o.blocksBatchSize = cfg.BlocksBatchSize
 			o.masterchain.gasPrice = cfg.MasterchainGasPrice
+			o.version = cfg.Version
 		}
 	}
 }
@@ -165,3 +168,9 @@ func WithNiceMarket() Option {
 		o.niceMarket = true
 	}
 }
+
+func WithVersion(version uint) Option {
+	return func(o *options) {
+		o.version = version
+	}
+}
diff --git a/etc/node.yaml b/etc/node.yaml
index 87b6efaea..816316083 100644
--- a/etc/node.yaml
+++ b/etc/node.yaml
@@ -1,3 +1,7 @@
+migration_dwh:
+  endpoint:
+
+
 # Local Node settings
 node:
   # Node's port to listen for client connection
diff --git a/insonmnia/migration/migration.go b/insonmnia/migration/migration.go
new file mode 100644
index 000000000..2b90deaad
--- /dev/null
+++ b/insonmnia/migration/migration.go
@@ -0,0 +1,76 @@
+package migration
+
+import (
+	"context"
+	"crypto/ecdsa"
+
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/sonm-io/core/blockchain"
+	"github.com/sonm-io/core/insonmnia/dwh"
+	"github.com/sonm-io/core/proto"
+	"github.com/sonm-io/core/util/multierror"
+	"github.com/sonm-io/core/util/xgrpc"
+)
+
+type MarketShredder struct {
+	api blockchain.API
+	dwh sonm.DWHClient
+}
+
+func NewV1MarketShredder(ctx context.Context, bcCfg *blockchain.Config, dwhCfg dwh.YAMLConfig) (*MarketShredder, error) {
+	api, err := blockchain.NewAPI(ctx, blockchain.WithConfig(bcCfg), blockchain.WithVersion(1))
+	if err != nil {
+		return nil, err
+	}
+
+	cc, err := xgrpc.NewClient(ctx, dwhCfg.Endpoint, credentials)
+	if err != nil {
+		return err
+	}
+
+	dwh := sonm.NewDWHClient(cc)
+}
+
+func NewMarketShredder(api blockchain.API, dwh sonm.DWHClient) *MarketShredder {
+	return &MarketShredder{
+		api: api,
+		dwh: dwh,
+	}
+}
+
+func (m *MarketShredder) WeDontNeedNoWaterLetTheMothefuckerBurn(ctx context.Context, pKey *ecdsa.PrivateKey) error {
+	author := crypto.PubkeyToAddress(pKey.PublicKey)
+	ordersRequest := &sonm.OrdersRequest{
+		AuthorID: sonm.NewEthAddress(author),
+	}
+	orders, err := m.dwh.GetOrders(ctx, ordersRequest)
+	if err != nil {
+		return err
+	}
+	market := m.api.Market()
+	merr := multierror.NewMultiError()
+	for _, order := range orders.GetOrders() {
+		if err := market.CancelOrder(ctx, pKey, order.GetOrder().GetId().Unwrap()); err != nil {
+			merr = multierror.Append(merr, err)
+		}
+	}
+
+	dealsRequest := &sonm.DealsRequest{
+		AnyUserID: sonm.NewEthAddress(author),
+	}
+	deals, err := m.dwh.GetDeals(ctx, dealsRequest)
+	if err != nil {
+		return err
+	}
+
+	for _, deal := range deals.GetDeals() {
+		// We only match masterID, but master cannot close deals.
+		if deal.GetDeal().GetConsumerID().Unwrap() != author && deal.GetDeal().GetSupplierID().Unwrap() != author {
+			continue
+		}
+		if err := market.CloseDeal(ctx, pKey, deal.GetDeal().GetId().Unwrap(), sonm.BlacklistType_BLACKLIST_NOBODY); err != nil {
+			merr = multierror.Append(merr, err)
+		}
+	}
+	return merr.ErrorOrNil()
+}

From d3990de15be47bf3c148973ca6eae1fa159dfcfa Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 24 Jan 2019 18:01:05 +0300
Subject: [PATCH 19/23] feat: market shredder

---
 etc/node.yaml                    |  4 ---
 insonmnia/migration/migration.go | 43 ++++++++++++++++++++++------
 insonmnia/worker/config.go       | 48 +++++++++++++++++++-------------
 insonmnia/worker/server.go       | 25 +++++++++++++++++
 4 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/etc/node.yaml b/etc/node.yaml
index 816316083..87b6efaea 100644
--- a/etc/node.yaml
+++ b/etc/node.yaml
@@ -1,7 +1,3 @@
-migration_dwh:
-  endpoint:
-
-
 # Local Node settings
 node:
   # Node's port to listen for client connection
diff --git a/insonmnia/migration/migration.go b/insonmnia/migration/migration.go
index 2b90deaad..8ecd9a557 100644
--- a/insonmnia/migration/migration.go
+++ b/insonmnia/migration/migration.go
@@ -3,6 +3,7 @@ package migration
 import (
 	"context"
 	"crypto/ecdsa"
+	"fmt"
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/sonm-io/core/blockchain"
@@ -10,35 +11,61 @@ import (
 	"github.com/sonm-io/core/proto"
 	"github.com/sonm-io/core/util/multierror"
 	"github.com/sonm-io/core/util/xgrpc"
+	"google.golang.org/grpc/credentials"
 )
 
-type MarketShredder struct {
+type MarketShredder interface {
+	WeDontNeedNoWaterLetTheMothefuckerBurn(ctx context.Context, pKey *ecdsa.PrivateKey) error
+}
+
+type nilMarketShredder struct {
+}
+
+func (m *nilMarketShredder) WeDontNeedNoWaterLetTheMothefuckerBurn(ctx context.Context, pKey *ecdsa.PrivateKey) error {
+	return nil
+}
+
+type marketShredder struct {
 	api blockchain.API
 	dwh sonm.DWHClient
 }
 
-func NewV1MarketShredder(ctx context.Context, bcCfg *blockchain.Config, dwhCfg dwh.YAMLConfig) (*MarketShredder, error) {
-	api, err := blockchain.NewAPI(ctx, blockchain.WithConfig(bcCfg), blockchain.WithVersion(1))
+type MigrationConfig struct {
+	Blockchain   *blockchain.Config
+	MigrationDWH *dwh.YAMLConfig
+	Enabled      *bool `default:"true"`
+	Version      uint
+}
+
+func NewV1MarketShredder(ctx context.Context, cfg *MigrationConfig, credentials credentials.TransportCredentials) (MarketShredder, error) {
+	if !*cfg.Enabled {
+		return &nilMarketShredder{}, nil
+	}
+	if cfg.MigrationDWH == nil {
+		return nil, fmt.Errorf("dwh config is required for enabled migrartion")
+	}
+	api, err := blockchain.NewAPI(ctx, blockchain.WithConfig(cfg.Blockchain), blockchain.WithVersion(1))
 	if err != nil {
 		return nil, err
 	}
 
-	cc, err := xgrpc.NewClient(ctx, dwhCfg.Endpoint, credentials)
+	cc, err := xgrpc.NewClient(ctx, cfg.MigrationDWH.Endpoint, credentials)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	dwh := sonm.NewDWHClient(cc)
+	return NewMarketShredder(api, dwh), nil
 }
 
-func NewMarketShredder(api blockchain.API, dwh sonm.DWHClient) *MarketShredder {
-	return &MarketShredder{
+func NewMarketShredder(api blockchain.API, dwh sonm.DWHClient) *marketShredder {
+	return &marketShredder{
 		api: api,
 		dwh: dwh,
 	}
 }
 
-func (m *MarketShredder) WeDontNeedNoWaterLetTheMothefuckerBurn(ctx context.Context, pKey *ecdsa.PrivateKey) error {
+func (m *marketShredder) WeDontNeedNoWaterLetTheMothefuckerBurn(ctx context.Context, pKey *ecdsa.PrivateKey) error {
 	author := crypto.PubkeyToAddress(pKey.PublicKey)
 	ordersRequest := &sonm.OrdersRequest{
 		AuthorID: sonm.NewEthAddress(author),
diff --git a/insonmnia/worker/config.go b/insonmnia/worker/config.go
index 5a0d7b9bc..a62a5ce15 100644
--- a/insonmnia/worker/config.go
+++ b/insonmnia/worker/config.go
@@ -1,6 +1,8 @@
 package worker
 
 import (
+	"fmt"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/jinzhu/configor"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -9,6 +11,7 @@ import (
 	"github.com/sonm-io/core/insonmnia/dwh"
 	"github.com/sonm-io/core/insonmnia/logging"
 	"github.com/sonm-io/core/insonmnia/matcher"
+	"github.com/sonm-io/core/insonmnia/migration"
 	"github.com/sonm-io/core/insonmnia/npp"
 	"github.com/sonm-io/core/insonmnia/state"
 	"github.com/sonm-io/core/insonmnia/worker/plugin"
@@ -37,26 +40,27 @@ type DevConfig struct {
 }
 
 type Config struct {
-	Endpoint          string              `yaml:"endpoint" required:"true"`
-	Logging           logging.Config      `yaml:"logging"`
-	Resources         *ResourcesConfig    `yaml:"resources" required:"false"`
-	Blockchain        *blockchain.Config  `yaml:"blockchain"`
-	NPP               npp.Config          `yaml:"npp"`
-	SSH               *SSHConfig          `yaml:"ssh" required:"false" `
-	PublicIPs         []string            `yaml:"public_ip_addrs" required:"false" `
-	Plugins           plugin.Config       `yaml:"plugins"`
-	Storage           state.StorageConfig `yaml:"store"`
-	Benchmarks        benchmarks.Config   `yaml:"benchmarks"`
-	Whitelist         WhitelistConfig     `yaml:"whitelist"`
-	MetricsListenAddr string              `yaml:"metrics_listen_addr" default:"127.0.0.1:14000"`
-	DWH               dwh.YAMLConfig      `yaml:"dwh"`
-	Matcher           *matcher.YAMLConfig `yaml:"matcher"`
-	Salesman          salesman.YAMLConfig `yaml:"salesman"`
-	Master            common.Address      `yaml:"master" required:"true"`
-	Development       DevConfig           `yaml:"development"`
-	Admin             *common.Address     `yaml:"admin"`
-	MetricsCollector  *common.Address     `yaml:"metrics_collector"`
-	Debug             *debug.Config       `yaml:"debug"`
+	Endpoint          string                     `yaml:"endpoint" required:"true"`
+	Logging           logging.Config             `yaml:"logging"`
+	Resources         *ResourcesConfig           `yaml:"resources" required:"false"`
+	Blockchain        *blockchain.Config         `yaml:"blockchain"`
+	NPP               npp.Config                 `yaml:"npp"`
+	SSH               *SSHConfig                 `yaml:"ssh" required:"false" `
+	PublicIPs         []string                   `yaml:"public_ip_addrs" required:"false" `
+	Plugins           plugin.Config              `yaml:"plugins"`
+	Storage           state.StorageConfig        `yaml:"store"`
+	Benchmarks        benchmarks.Config          `yaml:"benchmarks"`
+	Whitelist         WhitelistConfig            `yaml:"whitelist"`
+	MetricsListenAddr string                     `yaml:"metrics_listen_addr" default:"127.0.0.1:14000"`
+	DWH               dwh.YAMLConfig             `yaml:"dwh"`
+	Matcher           *matcher.YAMLConfig        `yaml:"matcher"`
+	Salesman          salesman.YAMLConfig        `yaml:"salesman"`
+	Master            common.Address             `yaml:"master" required:"true"`
+	Development       DevConfig                  `yaml:"development"`
+	Admin             *common.Address            `yaml:"admin"`
+	MetricsCollector  *common.Address            `yaml:"metrics_collector"`
+	Debug             *debug.Config              `yaml:"debug"`
+	Migration         *migration.MigrationConfig `yaml:"migration" required:"true"`
 }
 
 // NewConfig creates a new Worker config from the specified YAML file.
@@ -73,5 +77,9 @@ func NewConfig(path string) (*Config, error) {
 		cfg.Whitelist.PrivilegedIdentityLevel = sonm.IdentityLevel_ANONYMOUS
 	}
 
+	if cfg.Migration.MigrationDWH == nil && *cfg.Migration.Enabled {
+		return nil, fmt.Errorf("dwh config is required for enabled migrartion")
+	}
+
 	return cfg, nil
 }
diff --git a/insonmnia/worker/server.go b/insonmnia/worker/server.go
index 10fa10c2b..f41e08b83 100644
--- a/insonmnia/worker/server.go
+++ b/insonmnia/worker/server.go
@@ -45,6 +45,7 @@ import (
 	"github.com/sonm-io/core/insonmnia/inspect"
 	"github.com/sonm-io/core/insonmnia/logging"
 	"github.com/sonm-io/core/insonmnia/matcher"
+	"github.com/sonm-io/core/insonmnia/migration"
 	"github.com/sonm-io/core/insonmnia/npp"
 	"github.com/sonm-io/core/insonmnia/resource"
 	"github.com/sonm-io/core/insonmnia/state"
@@ -198,6 +199,8 @@ type Worker struct {
 	metrics *metrics.Handler
 	// Embedded inspection service.
 	*inspect.InspectService
+
+	shredder migration.MarketShredder
 }
 
 func NewWorker(cfg *Config, storage *state.Storage, options ...Option) (*Worker, error) {
@@ -275,6 +278,10 @@ func NewWorker(cfg *Config, storage *state.Storage, options ...Option) (*Worker,
 		return nil, err
 	}
 
+	if err := m.setupMarketShredder(); err != nil {
+		return nil, err
+	}
+
 	dg.CancelExec()
 
 	return m, nil
@@ -571,6 +578,15 @@ func (m *Worker) setupInspectService(cfg *Config, authWatcher *auth.AnyOfTranspo
 	return nil
 }
 
+func (m *Worker) setupMarketShredder() error {
+	shredder, err := migration.NewV1MarketShredder(m.ctx, m.cfg.Migration, m.credentials)
+	if err != nil {
+		return err
+	}
+	m.shredder = shredder
+	return nil
+}
+
 func (m *Worker) loadOrGenerateSSHSigner() (ssh.Signer, error) {
 	var privateKeyData []byte
 	ok, err := m.storage.Load(sshPrivateKeyKey, &privateKeyData)
@@ -632,6 +648,15 @@ func (m *Worker) Serve() error {
 
 		return m.externalGrpc.Serve(m.listener)
 	})
+	wg.Go(func() error {
+		log.S(ctx).Infof("shredding old market")
+		if err := m.shredder.WeDontNeedNoWaterLetTheMothefuckerBurn(ctx, m.key); err != nil {
+			log.S(ctx).Warnf("failed to shred old market")
+			return err
+		}
+		log.S(ctx).Infof("successfully shredded old market")
+		return nil
+	})
 
 	<-ctx.Done()
 	m.Close()

From 7150d6a35fa5dbd4421a7bff13db0e2dc82456b5 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Fri, 25 Jan 2019 16:48:00 +0300
Subject: [PATCH 20/23] fix: rebase fix

---
 blockchain/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockchain/api.go b/blockchain/api.go
index cd2283c7d..d527fef62 100644
--- a/blockchain/api.go
+++ b/blockchain/api.go
@@ -391,7 +391,7 @@ func (api *BasicAPI) ContractRegistry() ContractRegistry {
 	return api.contractRegistry
 }
 
-func NewRegistry(ctx context.Context, address common.Address, opts *chainOpts) (*BasicContractRegistry, error) {
+func NewRegistry(ctx context.Context, version uint, address common.Address, opts *chainOpts) (*BasicContractRegistry, error) {
 	client, err := opts.getClient()
 	if err != nil {
 		return nil, err

From 6cdf03dededb6126bb1bd2e7daa5f7aea676fc51 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Tue, 29 Jan 2019 15:12:36 +0300
Subject: [PATCH 21/23] fix: proper yaml tag for market version cfg

---
 blockchain/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockchain/config.go b/blockchain/config.go
index 2838fefe3..92a945130 100644
--- a/blockchain/config.go
+++ b/blockchain/config.go
@@ -44,7 +44,7 @@ func (m *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		ContractRegistryAddr common.Address `yaml:"contract_registry"`
 		BlocksBatchSize      uint64         `yaml:"blocks_batch_size"`
 		MasterchainGasPrice  GasPrice       `yaml:"masterchain_gas_price"`
-		Version              uint
+		Version              uint           `yaml:"version"`
 	}
 
 	if err := unmarshal(&cfg); err != nil {

From 2e42a0e57dfb23c003a4ea7cff7ffe2fa3255827 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 31 Jan 2019 13:48:41 +0300
Subject: [PATCH 22/23] wip

---
 insonmnia/node/server.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/insonmnia/node/server.go b/insonmnia/node/server.go
index 5959d527c..6125e6df3 100644
--- a/insonmnia/node/server.go
+++ b/insonmnia/node/server.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/lucas-clemente/quic-go"
+	"github.com/sonm-io/core/insonmnia/migration"
 	"github.com/sonm-io/core/util/defergroup"
 	"github.com/sonm-io/core/util/rest"
 	"github.com/sonm-io/core/util/xgrpc"
@@ -111,6 +112,8 @@ type Server struct {
 	tlsConfig *tls.Config
 
 	log *zap.SugaredLogger
+
+	shredder
 }
 
 // NewServer creates new Local Node server instance.
@@ -206,6 +209,15 @@ func newServer(cfg nodeConfig, services Services, options ...ServerOption) (*Ser
 	return m, nil
 }
 
+func (m *Server) setupMarketShredder() error {
+	shredder, err := migration.NewV1MarketShredder(m.ctx, m.cfg.Migration, m.credentials)
+	if err != nil {
+		return err
+	}
+	m.shredder = shredder
+	return nil
+}
+
 func (m *Server) LocalEndpoints() LocalEndpoints {
 	return m.endpoints
 }
@@ -236,6 +248,9 @@ func (m *Server) Serve(ctx context.Context) error {
 	wg.Go(func() error {
 		return m.serverSSH.Serve(ctx)
 	})
+	wg.Go(func() error {
+		return m.shredder
+	})
 
 	<-ctx.Done()
 

From 2ccfce074abef6d2da7e41b5f8d3e8fda1f7a2a7 Mon Sep 17 00:00:00 2001
From: Anton Matveenko <antmat@me.com>
Date: Thu, 14 Feb 2019 14:03:21 +0300
Subject: [PATCH 23/23] wip

---
 insonmnia/node/server.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/insonmnia/node/server.go b/insonmnia/node/server.go
index 6125e6df3..aa9ca5314 100644
--- a/insonmnia/node/server.go
+++ b/insonmnia/node/server.go
@@ -113,7 +113,7 @@ type Server struct {
 
 	log *zap.SugaredLogger
 
-	shredder
+	shredder migration.MarketShredder
 }
 
 // NewServer creates new Local Node server instance.
@@ -209,8 +209,8 @@ func newServer(cfg nodeConfig, services Services, options ...ServerOption) (*Ser
 	return m, nil
 }
 
-func (m *Server) setupMarketShredder() error {
-	shredder, err := migration.NewV1MarketShredder(m.ctx, m.cfg.Migration, m.credentials)
+func (m *Server) setupMarketShredder(ctx context.Context) error {
+	shredder, err := migration.NewV1MarketShredder(ctx, m.cfg.Migration, m.credentials)
 	if err != nil {
 		return err
 	}
@@ -232,7 +232,12 @@ func (m *Server) Serve(ctx context.Context) error {
 		return nil
 	}
 
+	if err := m.setupMarketShredder(); err != nil {
+		return err
+	}
+
 	wg, ctx := errgroup.WithContext(ctx)
+
 	wg.Go(func() error {
 		return m.serveGRPC(ctx, network.ListenersGRPC...)
 	})